# 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/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 a2c63a3f3d687ac4f63bf4ffa04d7458a2db350b # make -s -j 160 ARCH=sh O=/kisskb/build/linus_allnoconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- allnoconfig # < make -s -j 160 ARCH=sh O=/kisskb/build/linus_allnoconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 160 ARCH=sh O=/kisskb/build/linus_allnoconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 160 ARCH=sh O=/kisskb/build/linus_allnoconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/mm/cache-sh2.c:85:13: warning: no previous prototype for 'sh2_cache_init' [-Wmissing-prototypes] 85 | void __init sh2_cache_init(void) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/nommu.c:76:13: warning: no previous prototype for 'kmap_coherent_init' [-Wmissing-prototypes] 76 | void __init kmap_coherent_init(void) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/nommu.c:80:7: warning: no previous prototype for 'kmap_coherent' [-Wmissing-prototypes] 80 | void *kmap_coherent(struct page *page, unsigned long addr) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/nommu.c:86:6: warning: no previous prototype for 'kunmap_coherent' [-Wmissing-prototypes] 86 | void kunmap_coherent(void *kvaddr) | ^~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/init.c:99:29: warning: no previous prototype for 'l2_cache_init' [-Wmissing-prototypes] 99 | void __attribute__ ((weak)) l2_cache_init(void) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/return_address.c:49:7: warning: no previous prototype for 'return_address' [-Wmissing-prototypes] 49 | void *return_address(unsigned int depth) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/sys_sh.c:58:16: warning: no previous prototype for 'sys_cacheflush' [-Wmissing-prototypes] 58 | asmlinkage int sys_cacheflush(unsigned long addr, unsigned long len, int op) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/traps_32.c:735:6: warning: no previous prototype for 'per_cpu_trap_init' [-Wmissing-prototypes] 735 | void per_cpu_trap_init(void) | ^~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/hw_breakpoint.c:135:5: warning: no previous prototype for 'arch_bp_generic_fields' [-Wmissing-prototypes] 135 | int arch_bp_generic_fields(int sh_len, int sh_type, | ^~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/cache.c:2:5: warning: no previous prototype for 'cache_control' [-Wmissing-prototypes] 2 | int cache_control(unsigned int command) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/misc.c:115:6: warning: no previous prototype for 'ftrace_stub' [-Wmissing-prototypes] 115 | void ftrace_stub(void) | ^~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/misc.c:118:6: warning: no previous prototype for 'arch_ftrace_ops_list_func' [-Wmissing-prototypes] 118 | void arch_ftrace_ops_list_func(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/misc.c:128:6: warning: no previous prototype for 'decompress_kernel' [-Wmissing-prototypes] 128 | void decompress_kernel(void) | ^~~~~~~~~~~~~~~~~ Kernel: arch/sh/boot/zImage is ready Completed OK # rm -rf /kisskb/build/linus_allnoconfig_sh4-gcc13 # Build took: 0:00:43.857851