# 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/sparc64-linux/bin/sparc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux-ld --version # < git log --format=%s --max-count=1 a4145ce1e7bc247fd6f2846e8699473448717b37 # make -s -j 32 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MODULE_SIG=n # < make -s -j 32 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- help # make -s -j 32 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- olddefconfig # make -s -j 32 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sparc/vdso/vma.c:246:12: error: no previous prototype for 'init_vdso_image' [-Werror=missing-prototypes] 246 | int __init init_vdso_image(const struct vdso_image *image, | ^~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/power/hibernate.c:22:5: error: no previous prototype for 'pfn_is_nosave' [-Werror=missing-prototypes] 22 | int pfn_is_nosave(unsigned long pfn) | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/power/hibernate.c:30:6: error: no previous prototype for 'save_processor_state' [-Werror=missing-prototypes] 30 | void save_processor_state(void) | ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/power/hibernate.c:35:6: error: no previous prototype for 'restore_processor_state' [-Werror=missing-prototypes] 35 | void restore_processor_state(void) | ^~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/power/hibernate.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/power] Error 2 make[3]: *** Waiting for unfinished jobs.... cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/vdso/vma.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/vdso] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/arch/sparc/kernel/traps_64.c:253:6: error: no previous prototype for 'is_no_fault_exception' [-Werror=missing-prototypes] 253 | bool is_no_fault_exception(struct pt_regs *regs) | ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/traps_64.c:2035:6: error: no previous prototype for 'do_mcd_err' [-Werror=missing-prototypes] 2035 | void do_mcd_err(struct pt_regs *regs, struct sun4v_error_entry ent) | ^~~~~~~~~~ /kisskb/src/arch/sparc/kernel/traps_64.c:2153:6: error: no previous prototype for 'sun4v_nonresum_error_user_handled' [-Werror=missing-prototypes] 2153 | bool sun4v_nonresum_error_user_handled(struct pt_regs *regs, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/kernel/traps_64.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/kernel] Error 2 /kisskb/src/arch/sparc/prom/misc_64.c:165:5: error: no previous prototype for 'prom_get_mmu_ihandle' [-Werror=missing-prototypes] 165 | int prom_get_mmu_ihandle(void) | ^~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/prom/misc_64.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/prom] Error 2 /kisskb/src/arch/sparc/mm/init_64.c:2644:6: error: no previous prototype for 'vmemmap_free' [-Werror=missing-prototypes] 2644 | void vmemmap_free(unsigned long start, unsigned long end, | ^~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/mm/init_64.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/mm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc] Error 2 In file included from /kisskb/src/arch/sparc/include/asm/floppy.h:5, from /kisskb/src/drivers/block/floppy.c:250: /kisskb/src/arch/sparc/include/asm/floppy_64.h:200:13: error: no previous prototype for 'sparc_floppy_irq' [-Werror=missing-prototypes] 200 | irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie) | ^~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/include/asm/floppy_64.h:437:6: error: no previous prototype for 'sun_pci_fd_dma_callback' [-Werror=missing-prototypes] 437 | void sun_pci_fd_dma_callback(struct ebus_dma_info *p, int event, void *cookie) | ^~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: drivers/block/floppy.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/block] Error 2 make[4]: *** Waiting for unfinished jobs.... 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 32 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_sparc64-gcc13 # Build took: 0:09:08.746008