# git rev-parse -q --verify 39a77db53cca8200b8bc99fc0993e127b59f08fb^{commit} 39a77db53cca8200b8bc99fc0993e127b59f08fb already have revision, skipping fetch # git checkout -q -f -B kisskb 39a77db53cca8200b8bc99fc0993e127b59f08fb # git clean -qxdf # < git log -1 # commit 39a77db53cca8200b8bc99fc0993e127b59f08fb # Merge: c219e8e62770 3ce47d95b734 # Author: Michael Ellerman # Date: Thu Jan 7 17:44:20 2021 +1100 # # Automatic merge of 'fixes' into merge (2021-01-07 17:43) # # Conflicts: # arch/powerpc/kernel/head_book3s_32.S # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 39a77db53cca8200b8bc99fc0993e127b59f08fb # < make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_mpc885_ads_defconfig+HUGETLB_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc885_ads_defconfig # Added to kconfig CONFIG_HUGETLBFS=y # < make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_mpc885_ads_defconfig+HUGETLB_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_mpc885_ads_defconfig+HUGETLB_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_mpc885_ads_defconfig+HUGETLB_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- INFO: Uncompressed kernel (size 0x41237c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x500000) Image Name: Linux-5.11.0-rc2-g39a77db53cca Created: Thu Jan 7 19:02:25 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2054541 Bytes = 2006.39 KiB = 1.96 MiB Load Address: 00500000 Entry Point: 00500204 Completed OK # rm -rf /kisskb/build/powerpc-merge_mpc885_ads_defconfig+HUGETLB_powerpc-gcc5 # Build took: 0:00:58.871232