# git rev-parse -q --verify 26aff849438cebcd05f1a647390c4aa700d5c0f1^{commit} 26aff849438cebcd05f1a647390c4aa700d5c0f1 already have revision, skipping fetch # git checkout -q -f -B kisskb 26aff849438cebcd05f1a647390c4aa700d5c0f1 # git clean -qxdf # < git log -1 # commit 26aff849438cebcd05f1a647390c4aa700d5c0f1 # Merge: 52bf9f6c09fc a66ff26b0f31 # Author: Linus Torvalds # Date: Mon Dec 11 16:13:51 2023 -0800 # # Merge tag 'bcachefs-2023-12-10' of https://evilpiepirate.org/git/bcachefs # # Pull more bcachefs bugfixes from Kent Overstreet: # # - Fix a rare emergency shutdown path bug: dropping journal pins after # the filesystem has mostly been torn down is not what we want. # # - Fix some concurrency issues with the btree write buffer and journal # replay by not using the btree write buffer until journal replay is # finished # # - A fixup from the prior patch to kill journal pre-reservations: at the # start of the btree update path, where previously we took a # pre-reservation, we do at least want to check the journal watermark. # # - Fix a race between dropping device metadata and btree node writes, # which would re-add a pointer to a device that had just been dropped # # - Fix one of the SCRU lock warnings, in # bch2_compression_stats_to_text(). # # - Partial fix for a rare transaction paths overflow, when indirect # extents had been split by background tasks, by not running certain # triggers when they're not needed. # # - Fix for creating a snapshot with implicit source in a subdirectory of # the containing subvolume # # - Don't unfreeze when we're emergency read-only # # - Fix for rebalance spinning trying to compress unwritten extentns # # - Another deleted_inodes fix, for directories # # - Fix a rare deadlock (usually just an unecessary wait) when flushing # the journal with an open journal entry. # # * tag 'bcachefs-2023-12-10' of https://evilpiepirate.org/git/bcachefs: # bcachefs: Close journal entry if necessary when flushing all pins # bcachefs: Fix uninitialized var in bch2_journal_replay() # bcachefs: Fix deleted inode check for dirs # bcachefs: rebalance shouldn't attempt to compress unwritten extents # bcachefs: don't attempt rw on unfreeze when shutdown # bcachefs: Fix creating snapshot with implict source # bcachefs: Don't run indirect extent trigger unless inserting/deleting # bcachefs: Convert compression_stats to for_each_btree_key2 # bcachefs: Fix bch2_extent_drop_ptrs() call # bcachefs: Fix a journal deadlock in replay # bcachefs; Don't use btree write buffer until journal replay is finished # bcachefs: Don't drop journal pins in exit path # < /opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 26aff849438cebcd05f1a647390c4aa700d5c0f1 # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.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-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_pseries_le_defconfig_powerpc-gcc12 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-12.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/linus_pseries_le_defconfig_powerpc-gcc12 # Build took: 0:03:42.498801