# git rev-parse -q --verify 14f6db7ef1d167a6f8e172d24ee5f682afebd44c^{commit} 14f6db7ef1d167a6f8e172d24ee5f682afebd44c already have revision, skipping fetch # git checkout -q -f -B kisskb 14f6db7ef1d167a6f8e172d24ee5f682afebd44c # git clean -qxdf # < git log -1 # commit 14f6db7ef1d167a6f8e172d24ee5f682afebd44c # Merge: 69e854d5e8fd 1e688dd2a3d6 # Author: Michael Ellerman # Date: Wed Aug 18 23:55:37 2021 +1000 # # Automatic merge of 'next' into merge (2021-08-18 23:55) # # Conflicts: # arch/powerpc/sysdev/xive/common.c # < /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 14f6db7ef1d167a6f8e172d24ee5f682afebd44c # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_pq2fads_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- pq2fads_defconfig # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_pq2fads_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_pq2fads_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-merge_pq2fads_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:1181:1: warning: the frame size of 1120 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/net/sched/sch_frag.c: In function 'sch_fragment': /kisskb/src/net/sched/sch_frag.c:93:10: warning: missing braces around initializer [-Wmissing-braces] struct rtable sch_frag_rt = { 0 }; ^ /kisskb/src/net/sched/sch_frag.c:93:10: warning: (near initialization for 'sch_frag_rt.dst') [-Wmissing-braces] Completed OK # rm -rf /kisskb/build/powerpc-merge_pq2fads_defconfig_powerpc-gcc4.9 # Build took: 0:01:07.556956