# 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 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc44x_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc44x_defconfig # < make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc44x_defconfig_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_ppc44x_defconfig_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_ppc44x_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- INFO: Uncompressed kernel (size 0x5f39b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5f39b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5f39b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5f39b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5f39b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5f39b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5f39b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5f39b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5f39b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5f39b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5f39b8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 01:03:37 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3025889 Bytes = 2954.97 KiB = 2.89 MiB Load Address: 00600000 Entry Point: 00601544 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 01:03:37 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3025926 Bytes = 2955.01 KiB = 2.89 MiB Load Address: 00600000 Entry Point: 00601534 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 01:03:37 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3026427 Bytes = 2955.50 KiB = 2.89 MiB Load Address: 00600000 Entry Point: 006000c4 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 01:03:37 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3026036 Bytes = 2955.11 KiB = 2.89 MiB Load Address: 00600000 Entry Point: 0060152c Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 01:03:37 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3025854 Bytes = 2954.94 KiB = 2.89 MiB Load Address: 00600000 Entry Point: 00601524 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 01:03:37 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3026626 Bytes = 2955.69 KiB = 2.89 MiB Load Address: 00600000 Entry Point: 00601534 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 01:03:37 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3026562 Bytes = 2955.63 KiB = 2.89 MiB Load Address: 00600000 Entry Point: 00601534 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 01:03:37 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3026602 Bytes = 2955.67 KiB = 2.89 MiB Load Address: 00600000 Entry Point: 00601514 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 01:03:37 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3025798 Bytes = 2954.88 KiB = 2.89 MiB Load Address: 00600000 Entry Point: 006001b8 Completed OK # rm -rf /kisskb/build/powerpc-merge_ppc44x_defconfig_powerpc-gcc5 # Build took: 0:01:13.982977