# 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_ppc64_defconfig+NO_TM_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc64_defconfig # Added to kconfig CONFIG_PPC_TRANSACTIONAL_MEM=n # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_ppc64_defconfig+NO_TM_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_ppc64_defconfig+NO_TM_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_ppc64_defconfig+NO_TM_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/fs/btrfs/tree-checker.c: In function 'check_root_item': /kisskb/src/fs/btrfs/tree-checker.c:1056:9: warning: missing braces around initializer [-Wmissing-braces] struct btrfs_root_item ri = { 0 }; ^ /kisskb/src/fs/btrfs/tree-checker.c:1056:9: warning: (near initialization for 'ri.inode') [-Wmissing-braces] Completed OK # rm -rf /kisskb/build/powerpc-merge_ppc64_defconfig+NO_TM_powerpc-gcc4.9 # Build took: 0:03:26.856484