# git rev-parse -q --verify e6b92572808467f35fd159d47c45b650de29e722^{commit} e6b92572808467f35fd159d47c45b650de29e722 already have revision, skipping fetch # git checkout -q -f -B kisskb e6b92572808467f35fd159d47c45b650de29e722 # git clean -qxdf # < git log -1 # commit e6b92572808467f35fd159d47c45b650de29e722 # Merge: e45428a43676 260f71eff493 # Author: Linus Torvalds # Date: Wed Jan 2 16:35:23 2019 -0800 # # Merge tag 'nfs-for-4.21-1' of git://git.linux-nfs.org/projects/anna/linux-nfs # # Pull NFS client updates from Anna Schumaker: # "Stable bugfixes: # - xprtrdma: Yet another double DMA-unmap # v4.20 # # Features: # - Allow some /proc/sys/sunrpc entries without CONFIG_SUNRPC_DEBUG # - Per-xprt rdma receive workqueues # - Drop support for FMR memory registration # - Make port= mount option optional for RDMA mounts # # Other bugfixes and cleanups: # - Remove unused nfs4_xdev_fs_type declaration # - Fix comments for behavior that has changed # - Remove generic RPC credentials by switching to 'struct cred' # - Fix crossing mountpoints with different auth flavors # - Various xprtrdma fixes from testing and auditing the close code # - Fixes for disconnect issues when using xprtrdma with krb5 # - Clean up and improve xprtrdma trace points # - Fix NFS v4.2 async copy reboot recovery" # # * tag 'nfs-for-4.21-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (63 commits) # sunrpc: convert to DEFINE_SHOW_ATTRIBUTE # sunrpc: Add xprt after nfs4_test_session_trunk() # sunrpc: convert unnecessary GFP_ATOMIC to GFP_NOFS # sunrpc: handle ENOMEM in rpcb_getport_async # NFS: remove unnecessary test for IS_ERR(cred) # xprtrdma: Prevent leak of rpcrdma_rep objects # NFSv4.2 fix async copy reboot recovery # xprtrdma: Don't leak freed MRs # xprtrdma: Add documenting comment for rpcrdma_buffer_destroy # xprtrdma: Replace outdated comment for rpcrdma_ep_post # xprtrdma: Update comments in frwr_op_send # SUNRPC: Fix some kernel doc complaints # SUNRPC: Simplify defining common RPC trace events # NFS: Fix NFSv4 symbolic trace point output # xprtrdma: Trace mapping, alloc, and dereg failures # xprtrdma: Add trace points for calls to transport switch methods # xprtrdma: Relocate the xprtrdma_mr_map trace points # xprtrdma: Clean up of xprtrdma chunk trace points # xprtrdma: Remove unused fields from rpcrdma_ia # xprtrdma: Cull dprintk() call sites # ... # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-ld --version # < git log --format=%s --max-count=1 e6b92572808467f35fd159d47c45b650de29e722 # < make -s -j 8 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- defconfig # make -s -j 8 ARCH=mips O=/kisskb/build/linus_mips-defconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- /kisskb/src/arch/mips/boot/dts/xilfpga/nexys4ddr.dts:109.16-112.8: Warning (i2c_bus_reg): /i2c@10A00000/ad7420@4B: I2C bus unit address format error, expected "4b" FIT description: Linux 4.20.0-ge6b925728084 Created: Thu Jan 3 15:53:06 2019 Image 0 (kernel@0) Description: Linux 4.20.0-ge6b925728084 Created: Thu Jan 3 15:53:06 2019 Type: Kernel Image Compression: gzip compressed Data Size: 4496484 Bytes = 4391.10 KiB = 4.29 MiB Architecture: MIPS OS: Linux Load Address: 0x80100000 Entry Point: 0x80852ef0 Hash algo: sha1 Hash value: eb3d30b45cf9bd3be0124c19760c93fe6dad7b4e Image 1 (fdt@boston) Description: img,boston Device Tree Created: Thu Jan 3 15:53:06 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Thu Jan 3 15:53:06 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Thu Jan 3 15:53:06 2019 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 509ce58e44c561d54539e64e9d4b47054e696fc6 Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/linus_mips-defconfig_mipsel # Build took: 0:02:09.028490