# 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_ppc44x_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc44x_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc44x_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_ppc44x_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_ppc44x_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=] } ^ /kisskb/src/lib/zstd/compress.c: In function 'ZSTD_compressBlock_doubleFast': /kisskb/src/lib/zstd/compress.c:1393:1: warning: the frame size of 1584 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ INFO: Uncompressed kernel (size 0x5fba00) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5fba00) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5fba00) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5fba00) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5fba00) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5fba00) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5fba00) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5fba00) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5fba00) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5fba00) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5fba00) 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 02:19:25 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3066758 Bytes = 2994.88 KiB = 2.92 MiB Load Address: 00600000 Entry Point: 006014a0 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 02:19:25 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3066331 Bytes = 2994.46 KiB = 2.92 MiB Load Address: 00600000 Entry Point: 006001b8 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 02:19:25 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3066973 Bytes = 2995.09 KiB = 2.92 MiB Load Address: 00600000 Entry Point: 00601488 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 02:19:25 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3066347 Bytes = 2994.48 KiB = 2.92 MiB Load Address: 00600000 Entry Point: 006014b8 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 02:19:25 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3066888 Bytes = 2995.01 KiB = 2.92 MiB Load Address: 00600000 Entry Point: 006000c4 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 02:19:25 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3066915 Bytes = 2995.03 KiB = 2.92 MiB Load Address: 00600000 Entry Point: 006014a8 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 02:19:25 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3066357 Bytes = 2994.49 KiB = 2.92 MiB Load Address: 00600000 Entry Point: 006014a8 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 02:19:25 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3066483 Bytes = 2994.61 KiB = 2.92 MiB Load Address: 00600000 Entry Point: 006014a8 Image Name: Linux-5.10.0-rc2-g09a0972ac14f Created: Tue Nov 3 02:19:25 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3066311 Bytes = 2994.44 KiB = 2.92 MiB Load Address: 00600000 Entry Point: 00601498 Completed OK # rm -rf /kisskb/build/powerpc-merge_ppc44x_defconfig_powerpc-gcc4.9 # Build took: 0:00:59.278644