# git rev-parse -q --verify a4145ce1e7bc247fd6f2846e8699473448717b37^{commit} a4145ce1e7bc247fd6f2846e8699473448717b37 already have revision, skipping fetch # git checkout -q -f -B kisskb a4145ce1e7bc247fd6f2846e8699473448717b37 # git clean -qxdf # < git log -1 # commit a4145ce1e7bc247fd6f2846e8699473448717b37 # Merge: 78c3925c048c 2e92d26b2543 # Author: Linus Torvalds # Date: Tue Mar 19 17:27:25 2024 -0700 # # Merge tag 'bcachefs-2024-03-19' of https://evilpiepirate.org/git/bcachefs # # Pull bcachefs fixes from Kent Overstreet: # "Assorted bugfixes. # # Most are fixes for simple assertion pops; the most significant fix is # for a deadlock in recovery when we have to rewrite large numbers of # btree nodes to fix errors. This was incorrectly running out of the # same workqueue as the core interior btree update path - we now give it # its own single threaded workqueue. # # This was visible to users as "bch2_btree_update_start(): error: # BCH_ERR_journal_reclaim_would_deadlock" - and then recovery hanging" # # * tag 'bcachefs-2024-03-19' of https://evilpiepirate.org/git/bcachefs: # bcachefs: Fix lost wakeup on journal shutdown # bcachefs; Fix deadlock in bch2_btree_update_start() # bcachefs: ratelimit errors from async_btree_node_rewrite # bcachefs: Run check_topology() first # bcachefs: Improve bch2_fatal_error() # bcachefs: Fix lost transaction restart error # bcachefs: Don't corrupt journal keys gap buffer when dropping alloc info # bcachefs: fix for building in userspace # bcachefs: bch2_snapshot_is_ancestor() now safe to call in early recovery # bcachefs: Fix nested transaction restart handling in bch2_bucket_gens_init() # bcachefs: Improve sysfs internal/btree_updates # bcachefs: Split out btree_node_rewrite_worker # bcachefs: Fix locking in bch2_alloc_write_key() # bcachefs: Avoid extent entry type assertions in .invalid() # bcachefs: Fix spurious -BCH_ERR_transaction_restart_nested # bcachefs: Fix check_key_has_snapshot() call # bcachefs: Change "accounting overran journal reservation" to a warning # < /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 a4145ce1e7bc247fd6f2846e8699473448717b37 # 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:55.520572