# 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-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-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-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc6xx_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc6xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc6xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc6xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/block/genhd.c: In function 'diskstats_show': /kisskb/src/block/genhd.c:1659:1: warning: the frame size of 1160 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ INFO: Uncompressed kernel (size 0xc4e01c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4e01c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4e01c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4e01c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4e01c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4e01c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4e01c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4e01c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc3d934) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4e01c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc4e01c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xc3d934) 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 02:26:29 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5398967 Bytes = 5272.43 KiB = 5.15 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 02:26:29 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5430348 Bytes = 5303.07 KiB = 5.18 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 02:26:30 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5430069 Bytes = 5302.80 KiB = 5.18 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 02:26:31 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5429142 Bytes = 5301.90 KiB = 5.18 MiB Load Address: 00d00000 Entry Point: 00d00894 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 02:26:31 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5429871 Bytes = 5302.61 KiB = 5.18 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 02:26:31 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5429312 Bytes = 5302.06 KiB = 5.18 MiB Load Address: 00d00000 Entry Point: 00d00894 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 02:26:31 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5427940 Bytes = 5300.72 KiB = 5.18 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 02:26:31 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5428789 Bytes = 5301.55 KiB = 5.18 MiB Load Address: 00d00000 Entry Point: 00d00294 Image Name: Linux-5.10.0-rc2+ Created: Tue Nov 3 02:26:32 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5428161 Bytes = 5300.94 KiB = 5.18 MiB Load Address: 00d00000 Entry Point: 00d00294 Completed OK # rm -rf /kisskb/build/powerpc-merge_ppc6xx_defconfig_powerpc-gcc4.9 # Build took: 0:03:30.509045