# git rev-parse -q --verify 09a0972ac14f67d600aa3c80035367a8074e90eb^{commit} 09a0972ac14f67d600aa3c80035367a8074e90eb already have revision, skipping fetch # git checkout -q -f -B kisskb 09a0972ac14f67d600aa3c80035367a8074e90eb # git clean -qxdf # < git log -1 # commit 09a0972ac14f67d600aa3c80035367a8074e90eb # Author: Michael Ellerman # Date: Mon Nov 2 12:56:29 2020 +1100 # # powerpc/mm: Reorder variables to match master # # The conflict resolution in this code was done slightly differently # between merge and master, fix up merge to match what is in master now. # # Signed-off-by: Michael Ellerman # < /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 09a0972ac14f67d600aa3c80035367a8074e90eb # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc6xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc6xx_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc6xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc6xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc6xx_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- INFO: Uncompressed kernel (size 0xc4dfa4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4dfa4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4dfa4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4dfa4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4dfa4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4dfa4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4dfa4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4dfa4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc3d8bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4dfa4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc3d8bc) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4dfa4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 01:07:30 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5338458 Bytes = 5213.34 KiB = 5.09 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 01:07:31 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5368907 Bytes = 5243.07 KiB = 5.12 MiB Load Address: 00d00000 Entry Point: 00d00894 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 01:07:31 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5368773 Bytes = 5242.94 KiB = 5.12 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 01:07:31 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5368324 Bytes = 5242.50 KiB = 5.12 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 01:07:31 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5370169 Bytes = 5244.31 KiB = 5.12 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 01:07:31 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5368042 Bytes = 5242.23 KiB = 5.12 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 01:07:31 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5368314 Bytes = 5242.49 KiB = 5.12 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 01:07:32 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5369975 Bytes = 5244.12 KiB = 5.12 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 01:07:32 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5368917 Bytes = 5243.08 KiB = 5.12 MiB Load Address: 00d00000 Entry Point: 00d00894 Completed OK # rm -rf /kisskb/build/powerpc-merge_ppc6xx_defconfig_powerpc-gcc5 # Build took: 0:03:47.992981