# git rev-parse -q --verify c7a2c49ea6c9eebbe44ff2c08b663b2905ee2c13^{commit} c7a2c49ea6c9eebbe44ff2c08b663b2905ee2c13 already have revision, skipping fetch # git checkout -q -f -B kisskb c7a2c49ea6c9eebbe44ff2c08b663b2905ee2c13 # git clean -qxdf # < git log -1 # commit c7a2c49ea6c9eebbe44ff2c08b663b2905ee2c13 # Merge: 033078a9afe5 331bc71cb175 # Author: Linus Torvalds # Date: Fri Oct 26 13:05:26 2018 -0700 # # Merge tag 'nfs-for-4.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs # # Pull NFS client updates from Trond Myklebust: # "Highlights include: # # Stable fixes: # - Fix the NFSv4.1 r/wsize sanity checking # - Reset the RPC/RDMA credit grant properly after a disconnect # - Fix a missed page unlock after pg_doio() # # Features and optimisations: # - Overhaul of the RPC client socket code to eliminate a locking # bottleneck and reduce the latency when transmitting lots of # requests in parallel. # - Allow parallelisation of the RPCSEC_GSS encoding of an RPC request. # - Convert the RPC client socket receive code to use iovec_iter() for # improved efficiency. # - Convert several NFS and RPC lookup operations to use RCU instead of # taking global locks. # - Avoid the need for BH-safe locks in the RPC/RDMA back channel. # # Bugfixes and cleanups: # - Fix lock recovery during NFSv4 delegation recalls # - Fix the NFSv4 + NFSv4.1 "lookup revalidate + open file" case. # - Fixes for the RPC connection metrics # - Various RPC client layer cleanups to consolidate stream based # sockets # - RPC/RDMA connection cleanups # - Simplify the RPC/RDMA cleanup after memory operation failures # - Clean ups for NFS v4.2 copy completion and NFSv4 open state # reclaim" # # * tag 'nfs-for-4.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (97 commits) # SUNRPC: Convert the auth cred cache to use refcount_t # SUNRPC: Convert auth creds to use refcount_t # SUNRPC: Simplify lookup code # SUNRPC: Clean up the AUTH cache code # NFS: change sign of nfs_fh length # sunrpc: safely reallow resvport min/max inversion # nfs: remove redundant call to nfs_context_set_write_error() # nfs: Fix a missed page unlock after pg_doio() # SUNRPC: Fix a compile warning for cmpxchg64() # NFSv4.x: fix lock recovery during delegation recall # SUNRPC: use cmpxchg64() in gss_seq_send64_fetch_and_inc() # xprtrdma: Squelch a sparse warning # xprtrdma: Clean up xprt_rdma_disconnect_inject # xprtrdma: Add documenting comments # xprtrdma: Report when there were zero posted Receives # xprtrdma: Move rb_flags initialization # xprtrdma: Don't disable BH's in backchannel server # xprtrdma: Remove memory address of "ep" from an error message # xprtrdma: Rename rpcrdma_qp_async_error_upcall # xprtrdma: Simplify RPC wake-ups on connect # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < git log --format=%s --max-count=1 c7a2c49ea6c9eebbe44ff2c08b663b2905ee2c13 # < make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # yes \n | make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- oldconfig yes: standard output: Broken pipe # make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- arch/mips/boot/dts/xilfpga/nexys4ddr.dtb: Warning (i2c_bus_reg): /i2c@10A00000/ad7420@4B: I2C bus unit address format error, expected "4b" In file included from /kisskb/src/drivers/infiniband/hw/bnxt_re/main.c:66: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/umh.h:4, from /kisskb/src/include/linux/kmod.h:22, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/drivers/infiniband/hw/bnxt_re/main.c:39: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq /kisskb/src/drivers/input/joystick/analog.c:172:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^~~~~~~ /kisskb/src/net/sunrpc/auth_gss/gss_krb5_seal.c: In function 'gss_seq_send64_fetch_and_inc': /kisskb/src/net/sunrpc/auth_gss/gss_krb5_seal.c:145:14: error: implicit declaration of function 'cmpxchg64'; did you mean 'cmpxchg'? [-Werror=implicit-function-declaration] seq_send = cmpxchg64(&ctx->seq_send64, old, old + 1); ^~~~~~~~~ cmpxchg cc1: some warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:305: net/sunrpc/auth_gss/gss_krb5_seal.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:546: net/sunrpc/auth_gss] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:546: net/sunrpc] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.c:58: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/umh.h:4, from /kisskb/src/include/linux/kmod.h:22, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.c:11: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:18: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/umh.h:4, from /kisskb/src/include/linux/kmod.h:22, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c:11: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:22: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:25, from /kisskb/src/arch/mips/include/asm/mips-cps.h:14, from /kisskb/src/arch/mips/include/asm/smp-ops.h:16, from /kisskb/src/arch/mips/include/asm/smp.h:21, from /kisskb/src/include/linux/smp.h:68, from /kisskb/src/arch/mips/include/asm/cpu-type.h:12, from /kisskb/src/arch/mips/include/asm/timex.h:19, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/jiffies.h:10, from /kisskb/src/include/linux/ktime.h:25, from /kisskb/src/include/linux/timer.h:6, from /kisskb/src/include/linux/workqueue.h:9, from /kisskb/src/include/linux/rhashtable-types.h:15, from /kisskb/src/include/linux/ipc.h:7, from /kisskb/src/include/uapi/linux/sem.h:5, from /kisskb/src/include/linux/sem.h:5, from /kisskb/src/include/linux/compat.h:14, from /kisskb/src/include/linux/ethtool.h:17, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c:13: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:20: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:25, from /kisskb/src/arch/mips/include/asm/mips-cps.h:14, from /kisskb/src/arch/mips/include/asm/smp-ops.h:16, from /kisskb/src/arch/mips/include/asm/smp.h:21, from /kisskb/src/include/linux/smp.h:68, from /kisskb/src/arch/mips/include/asm/cpu-type.h:12, from /kisskb/src/arch/mips/include/asm/timex.h:19, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/jiffies.h:10, from /kisskb/src/include/linux/ktime.h:25, from /kisskb/src/include/linux/timer.h:6, from /kisskb/src/include/linux/netdevice.h:28, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:11: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c:24: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/umh.h:4, from /kisskb/src/include/linux/kmod.h:22, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c:10: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c:19: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/idr.h:16, from /kisskb/src/include/linux/kernfs.h:14, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:29, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c:11: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c:17: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/idr.h:16, from /kisskb/src/include/linux/kernfs.h:14, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:29, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c:9: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c:13: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/idr.h:16, from /kisskb/src/include/linux/kernfs.h:14, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:29, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c:10: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c:12: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mmzone.h:21, from /kisskb/src/include/linux/gfp.h:6, from /kisskb/src/include/linux/umh.h:4, from /kisskb/src/include/linux/kmod.h:22, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/include/linux/net_dim.h:37, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c:10: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c:22: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/include/linux/io.h:25, from /kisskb/src/arch/mips/include/asm/mips-cps.h:14, from /kisskb/src/arch/mips/include/asm/smp-ops.h:16, from /kisskb/src/arch/mips/include/asm/smp.h:21, from /kisskb/src/include/linux/smp.h:68, from /kisskb/src/arch/mips/include/asm/cpu-type.h:12, from /kisskb/src/arch/mips/include/asm/timex.h:19, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/jiffies.h:10, from /kisskb/src/include/linux/ktime.h:25, from /kisskb/src/include/linux/timer.h:6, from /kisskb/src/include/linux/netdevice.h:28, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c:10: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq In file included from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c:15: /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt.h:1626: warning: "writeq" redefined #define writeq(val64, db) \ In file included from /kisskb/src/arch/mips/include/asm/page.h:199, from /kisskb/src/include/linux/mm_types_task.h:16, from /kisskb/src/include/linux/mm_types.h:5, from /kisskb/src/include/linux/fs.h:23, from /kisskb/src/include/linux/debugfs.h:15, from /kisskb/src/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c:10: /kisskb/src/arch/mips/include/asm/io.h:502: note: this is the location of the previous definition #define writeq writeq make[1]: *** [/kisskb/src/Makefile:1052: net] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c: In function 'mlx5e_grp_sw_update_stats': /kisskb/src/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c:216:1: warning: the frame size of 1240 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/spi/spi-sh-msiof.c:74: warning: "STR" redefined #define STR 0x40 /* Status Register */ In file included from /kisskb/src/arch/mips/include/asm/mach-generic/spaces.h:15, from /kisskb/src/arch/mips/include/asm/addrspace.h:13, from /kisskb/src/arch/mips/include/asm/barrier.h:11, from /kisskb/src/include/linux/compiler.h:236, from /kisskb/src/arch/mips/include/asm/bitops.h:16, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/include/linux/bitmap.h:8, from /kisskb/src/drivers/spi/spi-sh-msiof.c:10: /kisskb/src/arch/mips/include/asm/mipsregs.h:30: note: this is the location of the previous definition #define STR(x) __STR(x) In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:41, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:274: warning: "M_SPC_CFG_CLEAR" redefined #define M_SPC_CFG_CLEAR M_BCM1480_SPC_CFG_CLEAR In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:40, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:405: note: this is the location of the previous definition #define M_SPC_CFG_CLEAR _SB_MAKEMASK1(32) In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:41, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:275: warning: "M_SPC_CFG_ENABLE" redefined #define M_SPC_CFG_ENABLE M_BCM1480_SPC_CFG_ENABLE In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:40, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:406: note: this is the location of the previous definition #define M_SPC_CFG_ENABLE _SB_MAKEMASK1(33) make: *** [Makefile:146: sub-make] Error 2 Command 'make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:15:31.477423