# git rev-parse -q --verify 12aaf214764045296c62ade32eb1ed66bc4cc2a3^{commit} # git fetch -q -n -f git://gitlab.ozlabs.ibm.com/mirror/linux-kbuild.git for-next # git rev-parse -q --verify 12aaf214764045296c62ade32eb1ed66bc4cc2a3^{commit} 12aaf214764045296c62ade32eb1ed66bc4cc2a3 # git checkout -q -f -B kisskb 12aaf214764045296c62ade32eb1ed66bc4cc2a3 # git clean -qxdf # < git log -1 # commit 12aaf214764045296c62ade32eb1ed66bc4cc2a3 # Author: Masahiro Yamada # Date: Sat Oct 2 19:02:42 2021 +0900 # # [for -next only] kconfig: generate include/generated/rustc_cfg # # This patch is not intended for the mainline. # # I created this patch for Stephen Rothwell to resolve the merge # conflicts in linux-next more easily. # # The Rust tree is touching scripts/kconfig/confdata.c to generate # include/generated/rustc_cfg, which would cause complicated conflicts # with the changes from the kbuild tree. # # I re-implemented it to produce the equaivalent rustc_cfg. # # I also fixed the memory leak; the original code from the Rust tree # did not free the malloc'ed pointer. # # Stephen: # When you resolve the conflicts in confdata.c, please take this one. # # Signed-off-by: Masahiro Yamada # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 12aaf214764045296c62ade32eb1ed66bc4cc2a3 # < make -s -j 24 ARCH=m68k O=/kisskb/build/kbuild_m68k-defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- defconfig # < make -s -j 24 ARCH=m68k O=/kisskb/build/kbuild_m68k-defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 24 ARCH=m68k O=/kisskb/build/kbuild_m68k-defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 24 ARCH=m68k O=/kisskb/build/kbuild_m68k-defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- Completed OK # rm -rf /kisskb/build/kbuild_m68k-defconfig_m68k-gcc11 # Build took: 0:03:03.540619