# git rev-parse -q --verify 7ba2090ca64ea1aa435744884124387db1fac70f^{commit} 7ba2090ca64ea1aa435744884124387db1fac70f already have revision, skipping fetch # git checkout -q -f -B kisskb 7ba2090ca64ea1aa435744884124387db1fac70f # git clean -qxdf # < git log -1 # commit 7ba2090ca64ea1aa435744884124387db1fac70f # Merge: 744a759492b5 ce0d5bd3a6c1 # Author: Linus Torvalds # Date: Wed Sep 6 12:10:15 2023 -0700 # # Merge tag 'ceph-for-6.6-rc1' of https://github.com/ceph/ceph-client # # Pull ceph updates from Ilya Dryomov: # "Mixed with some fixes and cleanups, this brings in reasonably complete # fscrypt support to CephFS! The list of things which don't work with # encryption should be fairly short, mostly around the edges: fallocate # (not supported well in CephFS to begin with), copy_file_range # (requires re-encryption), non-default striping patterns. # # This was a multi-year effort principally by Jeff Layton with # assistance from Xiubo Li, Luís Henriques and others, including several # dependant changes in the MDS, netfs helper library and fscrypt # framework itself" # # * tag 'ceph-for-6.6-rc1' of https://github.com/ceph/ceph-client: (53 commits) # ceph: make num_fwd and num_retry to __u32 # ceph: make members in struct ceph_mds_request_args_ext a union # rbd: use list_for_each_entry() helper # libceph: do not include crypto/algapi.h # ceph: switch ceph_lookup/atomic_open() to use new fscrypt helper # ceph: fix updating i_truncate_pagecache_size for fscrypt # ceph: wait for OSD requests' callbacks to finish when unmounting # ceph: drop messages from MDS when unmounting # ceph: update documentation regarding snapshot naming limitations # ceph: prevent snapshot creation in encrypted locked directories # ceph: add support for encrypted snapshot names # ceph: invalidate pages when doing direct/sync writes # ceph: plumb in decryption during reads # ceph: add encryption support to writepage and writepages # ceph: add read/modify/write to ceph_sync_write # ceph: align data in pages in ceph_sync_write # ceph: don't use special DIO path for encrypted inodes # ceph: add truncate size handling support for fscrypt # ceph: add object version support for sync read # libceph: allow ceph_osdc_new_request to accept a multi-op read # ... # < /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 7ba2090ca64ea1aa435744884124387db1fac70f # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_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) # # < make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_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_powerpc-gcc13 # Build took: 0:03:34.936382