# 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/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ld --version # < git log --format=%s --max-count=1 7d900724913cb293620a05c5a3134710db95d0d9 # < make -s -j 24 ARCH=arm O=/kisskb/build/linus_shmobile_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- shmobile_defconfig # < make -s -j 24 ARCH=arm O=/kisskb/build/linus_shmobile_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- help # make -s -j 24 ARCH=arm O=/kisskb/build/linus_shmobile_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- olddefconfig # make -s -j 24 ARCH=arm O=/kisskb/build/linus_shmobile_defconfig_arm-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi- In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/tm.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/arm_ssp_per_task_plugin.c:3: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/config/elfos.h:102:21: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), "%s"HOST_WIDE_INT_PRINT_UNSIGNED"\n",\ ^ /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/config/elfos.h:170:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ In file included from /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/tm.h:44, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:15, from /kisskb/src/scripts/gcc-plugins/arm_ssp_per_task_plugin.c:3: /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/arm-linux-gnueabi/bin/../lib/gcc/arm-linux-gnueabi/4.9.4/plugin/include/defaults.h:126:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ cc1plus: warning: unrecognized command line option '-Wno-format-diag' Completed OK # rm -rf /kisskb/build/linus_shmobile_defconfig_arm-gcc4.9 # Build took: 0:01:31.916861