# 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/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 7d900724913cb293620a05c5a3134710db95d0d9 # < make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/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 # < make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:4556:warning: override: reassigning to symbol GCC_PLUGIN_CYC_COMPLEXITY .config:4558:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:4562:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:4564:warning: override: reassigning to symbol UML_NET_SLIP .config:4567:warning: override: reassigning to symbol UML_NET_MCAST .config:4569:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] cc1: warning: /kisskb/src/arch/um/include/uapi: No such file or directory [-Wmissing-include-dirs] drivers/net/ethernet/xilinx/ll_temac_main.o: In function `temac_probe': /kisskb/src/drivers/net/ethernet/xilinx/ll_temac_main.c:1409: undefined reference to `devm_platform_ioremap_resource_byname' /kisskb/src/drivers/net/ethernet/xilinx/ll_temac_main.c:1476: undefined reference to `devm_of_iomap' /kisskb/src/drivers/net/ethernet/xilinx/ll_temac_main.c:1502: undefined reference to `devm_platform_ioremap_resource' drivers/net/ethernet/xilinx/xilinx_emaclite.o: In function `xemaclite_of_probe': /kisskb/src/drivers/net/ethernet/xilinx/xilinx_emaclite.c:1146: undefined reference to `devm_ioremap_resource' drivers/net/ethernet/xilinx/xilinx_axienet_main.o: In function `axienet_probe': /kisskb/src/drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1879: undefined reference to `devm_ioremap_resource' /kisskb/src/drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1987: undefined reference to `devm_ioremap_resource' /kisskb/src/drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1997: undefined reference to `devm_ioremap_resource' collect2: error: ld returned 1 exit status make[2]: *** [/kisskb/src/Makefile:1199: vmlinux] Error 1 make[1]: *** [/kisskb/src/Makefile:1178: autoksyms_recursive] Error 2 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:05:26.544236