# git rev-parse -q --verify a2c63a3f3d687ac4f63bf4ffa04d7458a2db350b^{commit} a2c63a3f3d687ac4f63bf4ffa04d7458a2db350b already have revision, skipping fetch # git checkout -q -f -B kisskb a2c63a3f3d687ac4f63bf4ffa04d7458a2db350b # git clean -qxdf # < git log -1 # commit a2c63a3f3d687ac4f63bf4ffa04d7458a2db350b # Merge: 1c582ec1428a e858beeddfa3 # Author: Linus Torvalds # Date: Mon Apr 22 13:53:50 2024 -0700 # # Merge tag 'bcachefs-2024-04-22' of https://evilpiepirate.org/git/bcachefs # # Pull bcachefs fixes from Kent Overstreet: # "Nothing too crazy in this one, and it looks like (fingers crossed) the # recovery and repair issues are settling down - although there's going # to be a long tail there, as we've still yet to really ramp up on error # injection or syzbot. # # - fix a few more deadlocks in recovery # # - fix u32/u64 issues in mi_btree_bitmap # # - btree key cache shrinker now actually frees, with more # instrumentation coming so we can verify that it's working # correctly more easily in the future" # # * tag 'bcachefs-2024-04-22' of https://evilpiepirate.org/git/bcachefs: # bcachefs: If we run merges at a lower watermark, they must be nonblocking # bcachefs: Fix inode early destruction path # bcachefs: Fix deadlock in journal write path # bcachefs: Tweak btree key cache shrinker so it actually frees # bcachefs: bkey_cached.btree_trans_barrier_seq needs to be a ulong # bcachefs: Fix missing call to bch2_fs_allocator_background_exit() # bcachefs: Check for journal entries overruning end of sb clean section # bcachefs: Fix bio alloc in check_extent_checksum() # bcachefs: fix leak in bch2_gc_write_reflink_key # bcachefs: KEY_TYPE_error is allowed for reflink # bcachefs: Fix bch2_dev_btree_bitmap_marked_sectors() shift # bcachefs: make sure to release last journal pin in replay # bcachefs: node scan: ignore multiple nodes with same seq if interior # bcachefs: Fix format specifier in validate_bset_keys() # bcachefs: Fix null ptr deref in twf from BCH_IOCTL_FSCK_OFFLINE # < /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 a2c63a3f3d687ac4f63bf4ffa04d7458a2db350b # make -s -j 40 ARCH=um O=/kisskb/build/linus_allyesconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # 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_allyesconfig_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_allyesconfig_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:14471:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:14475:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:14477:warning: override: reassigning to symbol UML_NET_SLIP .config:14482:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 40 ARCH=um O=/kisskb/build/linus_allyesconfig_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:117: arch/um/kernel/asm-offsets.s] Error 1 make[2]: *** [/kisskb/src/Makefile:1197: 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_allyesconfig_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_allyesconfig_um-x86_64-gcc12 # Build took: 0:00:13.074933