# 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/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 6d69b6c12fce479fde7bc06f686212451688a102 # make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # Added to kconfig CONFIG_SPI_STM32_QSPI=n # < make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:14189:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:14193:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:14195:warning: override: reassigning to symbol UML_NET_SLIP .config:14200:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/x86/um/user-offsets.c:17:6: warning: no previous prototype for ‘foo’ [-Wmissing-prototypes] 17 | void foo(void) | ^~~ In file included from /kisskb/src/arch/um/kernel/asm-offsets.c:1: /kisskb/src/arch/x86/um/shared/sysdep/kernel-offsets.h:9:6: error: no previous prototype for ‘foo’ [-Werror=missing-prototypes] 9 | void foo(void) | ^~~ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:117: arch/um/kernel/asm-offsets.s] Error 1 make[2]: *** [/kisskb/src/Makefile:1208: prepare0] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_um-x86_64-gcc12 # Build took: 0:00:13.090005