# 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-8.5.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 a4145ce1e7bc247fd6f2846e8699473448717b37 # make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig # < make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:14984:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- /kisskb/src/arch/mips/boot/dts/img/boston.dts:128.17-178.5: Warning (interrupt_provider): /pci@14000000/pci2_root@0,0: '#interrupt-cells' found, but node is not an interrupt provider /kisskb/src/arch/mips/boot/dts/img/boston.dts:136.23-177.6: Warning (interrupt_provider): /pci@14000000/pci2_root@0,0/eg20t_bridge@1,0,0: '#interrupt-cells' found, but node is not an interrupt provider arch/mips/boot/dts/img/boston.dtb: Warning (interrupt_map): Failed prerequisite 'interrupt_provider' /kisskb/src/drivers/gpu/drm/xe/xe_lrc.c:100: error: "END" redefined [-Werror] #define END 0 In file included from /kisskb/src/arch/mips/include/asm/bitops.h:19, from /kisskb/src/include/linux/bitops.h:68, from /kisskb/src/include/linux/thread_info.h:27, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:79, from /kisskb/src/include/linux/spinlock.h:56, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/dma-fence.h:17, from /kisskb/src/drivers/gpu/drm/xe/xe_hw_fence_types.h:9, from /kisskb/src/drivers/gpu/drm/xe/xe_lrc_types.h:9, from /kisskb/src/drivers/gpu/drm/xe/xe_lrc.h:8, from /kisskb/src/drivers/gpu/drm/xe/xe_lrc.c:6: /kisskb/src/arch/mips/include/asm/asm.h:69: note: this is the location of the previous definition #define END(function) \ cc1: all warnings being treated as errors make[7]: *** [/kisskb/src/scripts/Makefile.build:243: drivers/gpu/drm/xe/xe_lrc.o] Error 1 make[6]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/gpu/drm/xe] Error 2 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/gpu/drm] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/gpu] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:481: drivers] Error 2 make[2]: *** [/kisskb/src/Makefile:1912: .] 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=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_mips-gcc8 # Build took: 0:10:13.820495