# git rev-parse -q --verify 26aff849438cebcd05f1a647390c4aa700d5c0f1^{commit} 26aff849438cebcd05f1a647390c4aa700d5c0f1 already have revision, skipping fetch # git checkout -q -f -B kisskb 26aff849438cebcd05f1a647390c4aa700d5c0f1 # git clean -qxdf # < git log -1 # commit 26aff849438cebcd05f1a647390c4aa700d5c0f1 # Merge: 52bf9f6c09fc a66ff26b0f31 # Author: Linus Torvalds # Date: Mon Dec 11 16:13:51 2023 -0800 # # Merge tag 'bcachefs-2023-12-10' of https://evilpiepirate.org/git/bcachefs # # Pull more bcachefs bugfixes from Kent Overstreet: # # - Fix a rare emergency shutdown path bug: dropping journal pins after # the filesystem has mostly been torn down is not what we want. # # - Fix some concurrency issues with the btree write buffer and journal # replay by not using the btree write buffer until journal replay is # finished # # - A fixup from the prior patch to kill journal pre-reservations: at the # start of the btree update path, where previously we took a # pre-reservation, we do at least want to check the journal watermark. # # - Fix a race between dropping device metadata and btree node writes, # which would re-add a pointer to a device that had just been dropped # # - Fix one of the SCRU lock warnings, in # bch2_compression_stats_to_text(). # # - Partial fix for a rare transaction paths overflow, when indirect # extents had been split by background tasks, by not running certain # triggers when they're not needed. # # - Fix for creating a snapshot with implicit source in a subdirectory of # the containing subvolume # # - Don't unfreeze when we're emergency read-only # # - Fix for rebalance spinning trying to compress unwritten extentns # # - Another deleted_inodes fix, for directories # # - Fix a rare deadlock (usually just an unecessary wait) when flushing # the journal with an open journal entry. # # * tag 'bcachefs-2023-12-10' of https://evilpiepirate.org/git/bcachefs: # bcachefs: Close journal entry if necessary when flushing all pins # bcachefs: Fix uninitialized var in bch2_journal_replay() # bcachefs: Fix deleted inode check for dirs # bcachefs: rebalance shouldn't attempt to compress unwritten extents # bcachefs: don't attempt rw on unfreeze when shutdown # bcachefs: Fix creating snapshot with implict source # bcachefs: Don't run indirect extent trigger unless inserting/deleting # bcachefs: Convert compression_stats to for_each_btree_key2 # bcachefs: Fix bch2_extent_drop_ptrs() call # bcachefs: Fix a journal deadlock in replay # bcachefs; Don't use btree write buffer until journal replay is finished # bcachefs: Don't drop journal pins in exit path # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 26aff849438cebcd05f1a647390c4aa700d5c0f1 # make -s -j 24 ARCH=mips O=/kisskb/build/linus_micro32r2el_defconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- micro32r2el_defconfig Using /kisskb/src/arch/mips/configs/generic_defconfig as base Merging /kisskb/src/arch/mips/configs/generic/micro32r2.config Merging /kisskb/src/arch/mips/configs/generic/el.config Merging /kisskb/src/arch/mips/configs/generic/board-boston.config Merging /kisskb/src/arch/mips/configs/generic/board-marduk.config Merging /kisskb/src/arch/mips/configs/generic/board-ni169445.config Merging /kisskb/src/arch/mips/configs/generic/board-ocelot.config Merging /kisskb/src/arch/mips/configs/generic/board-ranchu.config Merging /kisskb/src/arch/mips/configs/generic/board-sead-3.config Merging /kisskb/src/arch/mips/configs/generic/board-virt.config Merging /kisskb/src/arch/mips/configs/generic/board-xilfpga.config # < make -s -j 24 ARCH=mips O=/kisskb/build/linus_micro32r2el_defconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 24 ARCH=mips O=/kisskb/build/linus_micro32r2el_defconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- olddefconfig # make -s -j 24 ARCH=mips O=/kisskb/build/linus_micro32r2el_defconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- {standard input}: Assembler messages: {standard input}:5011: Error: branch to a symbol in another ISA mode make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/mips/kernel/smp-cps.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:480: arch/mips/kernel] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:480: arch/mips] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/Makefile:1911: .] Error 2 make[1]: *** [/kisskb/src/Makefile:234: __sub-make] Error 2 make: *** [Makefile:234: __sub-make] Error 2 Command 'make -s -j 24 ARCH=mips O=/kisskb/build/linus_micro32r2el_defconfig_mips-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_micro32r2el_defconfig_mips-gcc13 # Build took: 0:03:18.497752