# 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/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 a4145ce1e7bc247fd6f2846e8699473448717b37 # make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # Added to kconfig CONFIG_SPI_STM32_QSPI=n # < make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:14232:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:14236:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:14238:warning: override: reassigning to symbol UML_NET_SLIP .config:14243:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/x86/um/user-offsets.c:17:6: warning: no previous prototype for ‘foo’ [-Wmissing-prototypes] 17 | void foo(void) | ^~~ In file included from /kisskb/src/arch/um/kernel/asm-offsets.c:1: /kisskb/src/arch/x86/um/shared/sysdep/kernel-offsets.h:9:6: error: no previous prototype for ‘foo’ [-Werror=missing-prototypes] 9 | void foo(void) | ^~~ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:116: arch/um/kernel/asm-offsets.s] Error 1 make[2]: *** [/kisskb/src/Makefile:1190: prepare0] 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=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_um-x86_64-gcc12 # Build took: 0:00:17.951768