# git rev-parse -q --verify 6d69b6c12fce479fde7bc06f686212451688a102^{commit} 6d69b6c12fce479fde7bc06f686212451688a102 already have revision, skipping fetch # git checkout -q -f -B kisskb 6d69b6c12fce479fde7bc06f686212451688a102 # git clean -qxdf # < git log -1 # commit 6d69b6c12fce479fde7bc06f686212451688a102 # Merge: b4d88a60fe0e 3c0a2e0b0ae6 # Author: Linus Torvalds # Date: Thu May 23 13:51:09 2024 -0700 # # Merge tag 'nfs-for-6.10-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs # # Pull NFS client updates from Trond Myklebust: # "Stable fixes: # - nfs: fix undefined behavior in nfs_block_bits() # - NFSv4.2: Fix READ_PLUS when server doesn't support OP_READ_PLUS # # Bugfixes: # - Fix mixing of the lock/nolock and local_lock mount options # - NFSv4: Fixup smatch warning for ambiguous return # - NFSv3: Fix remount when using the legacy binary mount api # - SUNRPC: Fix the handling of expired RPCSEC_GSS contexts # - SUNRPC: fix the NFSACL RPC retries when soft mounts are enabled # - rpcrdma: fix handling for RDMA_CM_EVENT_DEVICE_REMOVAL # # Features and cleanups: # - NFSv3: Use the atomic_open API to fix open(O_CREAT|O_TRUNC) # - pNFS/filelayout: S layout segment range in LAYOUTGET # - pNFS: rework pnfs_generic_pg_check_layout to check IO range # - NFSv2: Turn off enabling of NFS v2 by default" # # * tag 'nfs-for-6.10-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: # nfs: fix undefined behavior in nfs_block_bits() # pNFS: rework pnfs_generic_pg_check_layout to check IO range # pNFS/filelayout: check layout segment range # pNFS/filelayout: fixup pNfs allocation modes # rpcrdma: fix handling for RDMA_CM_EVENT_DEVICE_REMOVAL # NFS: Don't enable NFS v2 by default # NFS: Fix READ_PLUS when server doesn't support OP_READ_PLUS # sunrpc: fix NFSACL RPC retry on soft mount # SUNRPC: fix handling expired GSS context # nfs: keep server info for remounts # NFSv4: Fixup smatch warning for ambiguous return # NFS: make sure lock/nolock overriding local_lock mount option # NFS: add atomic_open for NFSv3 to handle O_TRUNC correctly. # pNFS/filelayout: Specify the layout segment range in LAYOUTGET # pNFS/filelayout: Remove the whole file layout requirement # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux-ld --version # < git log --format=%s --max-count=1 6d69b6c12fce479fde7bc06f686212451688a102 # make -s -j 160 ARCH=riscv O=/kisskb/build/linus_defconfig_riscv-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux- defconfig # < make -s -j 160 ARCH=riscv O=/kisskb/build/linus_defconfig_riscv-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux- help # make -s -j 160 ARCH=riscv O=/kisskb/build/linus_defconfig_riscv-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux- olddefconfig # make -s -j 160 ARCH=riscv O=/kisskb/build/linus_defconfig_riscv-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux- /kisskb/src/drivers/irqchip/irq-riscv-imsic-early.c: In function 'imsic_ipi_domain_init': /kisskb/src/drivers/irqchip/irq-riscv-imsic-early.c:52:9: error: too many arguments to function 'riscv_ipi_set_virq_range' 52 | riscv_ipi_set_virq_range(virq, IMSIC_NR_IPI, true); | ^~~~~~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/include/linux/smp.h:119, from /kisskb/src/include/linux/lockdep.h:14, from /kisskb/src/include/linux/spinlock.h:63, from /kisskb/src/include/linux/sched.h:2142, from /kisskb/src/include/linux/ratelimit.h:6, from /kisskb/src/include/linux/dev_printk.h:16, from /kisskb/src/include/linux/device.h:15, from /kisskb/src/include/linux/node.h:18, from /kisskb/src/include/linux/cpu.h:17, from /kisskb/src/drivers/irqchip/irq-riscv-imsic-early.c:8: /kisskb/src/arch/riscv/include/asm/smp.h:52:6: note: declared here 52 | void riscv_ipi_set_virq_range(int virq, int nr); | ^~~~~~~~~~~~~~~~~~~~~~~~ make[5]: *** [/kisskb/src/scripts/Makefile.build:244: drivers/irqchip/irq-riscv-imsic-early.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/irqchip] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:485: drivers] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/Makefile:1934: .] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 160 ARCH=riscv O=/kisskb/build/linus_defconfig_riscv-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/riscv64-linux/bin/riscv64-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_defconfig_riscv-gcc13 # Build took: 0:00:52.141348