# 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/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 6d69b6c12fce479fde7bc06f686212451688a102 # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_NUMA_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- pseries_le_defconfig Using /kisskb/src/arch/powerpc/configs/ppc64_defconfig as base Merging /kisskb/src/arch/powerpc/configs/le.config Merging /kisskb/src/arch/powerpc/configs/guest.config Value of CONFIG_VIRTIO_BLK is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BLK=m New value: CONFIG_VIRTIO_BLK=y Value of CONFIG_SCSI_VIRTIO is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_SCSI_VIRTIO=m New value: CONFIG_SCSI_VIRTIO=y Value of CONFIG_VIRTIO_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_NET=m New value: CONFIG_VIRTIO_NET=y Value of CONFIG_VIRTIO_CONSOLE is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_CONSOLE=m New value: CONFIG_VIRTIO_CONSOLE=y Value of CONFIG_VIRTIO_PCI is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_PCI=m New value: CONFIG_VIRTIO_PCI=y Value of CONFIG_VIRTIO_BALLOON is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BALLOON=m New value: CONFIG_VIRTIO_BALLOON=y Value of CONFIG_VHOST_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VHOST_NET=m New value: CONFIG_VHOST_NET=y Value of CONFIG_IBMVETH is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVETH=m New value: CONFIG_IBMVETH=y Value of CONFIG_IBMVNIC is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVNIC=m New value: CONFIG_IBMVNIC=y Merging /kisskb/src/arch/powerpc/configs/kvm_guest.config # # merged configuration written to .config (needs make) # # Added to kconfig CONFIG_NUMA=n # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_NUMA_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_NUMA_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig+NO_NUMA_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/linus_pseries_le_defconfig+NO_NUMA_powerpc-gcc13 # Build took: 0:08:08.125809