# git rev-parse -q --verify 7d900724913cb293620a05c5a3134710db95d0d9^{commit} 7d900724913cb293620a05c5a3134710db95d0d9 already have revision, skipping fetch # git checkout -q -f -B kisskb 7d900724913cb293620a05c5a3134710db95d0d9 # git clean -qxdf # < git log -1 # commit 7d900724913cb293620a05c5a3134710db95d0d9 # Merge: add6b92660b3 53b74fa990bf # Author: Linus Torvalds # Date: Sun Apr 11 11:53:36 2021 -0700 # # Merge tag 'for-5.12-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux # # Pull btrfs fix from David Sterba: # "One more patch that we'd like to get to 5.12 before release. # # It's changing where and how the superblock is stored in the zoned # mode. It is an on-disk format change but so far there are no # implications for users as the proper mkfs support hasn't been merged # and is waiting for the kernel side to settle. # # Until now, the superblocks were derived from the zone index, but zone # size can differ per device. This is changed to be based on fixed # offset values, to make it independent of the device zone size. # # The work on that got a bit delayed, we discussed the exact locations # to support potential device sizes and usecases. (Partially delayed # also due to my vacation.) Having that in the same release where the # zoned mode is declared usable is highly desired, there are userspace # projects that need to be updated to recognize the feature. Pushing # that to the next release would make things harder to test" # # * tag 'for-5.12-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: # btrfs: zoned: move superblock logging zone location # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 7d900724913cb293620a05c5a3134710db95d0d9 # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- sh7710voipgw_defconfig # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/traps.c: In function 'nmi_trap_handler': /kisskb/src/arch/sh/kernel/traps.c:183:15: warning: unused variable 'cpu' [-Wunused-variable] unsigned int cpu = smp_processor_id(); ^ /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld: kernel/sched/core.o: uses dsp instructions while previous modules use floating point instructions /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld: kernel/sched/core.o: uses instructions which are incompatible with instructions used in previous modules /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld: failed to merge target specific data of file kernel/sched/core.o make[1]: *** [/kisskb/src/Makefile:1199: vmlinux] Error 1 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 32 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 # Build took: 0:00:38.520852