# git rev-parse -q --verify a9f94826e4bb6402e67f3eb849dee0811f1de6da^{commit} a9f94826e4bb6402e67f3eb849dee0811f1de6da already have revision, skipping fetch # git checkout -q -f -B kisskb a9f94826e4bb6402e67f3eb849dee0811f1de6da # git clean -qxdf # < git log -1 # commit a9f94826e4bb6402e67f3eb849dee0811f1de6da # Merge: d075c0c1be27 781121a7f6d1 # Author: Linus Torvalds # Date: Fri May 27 18:17:03 2022 -0700 # # Merge tag 'clang-format-for-linus-v5.19-rc1' of https://github.com/ojeda/linux # # Pull clang-format updates from Miguel Ojeda: # "clang-format modernization and cleanups. # # A few changes from Brian Norris and Mickaël Salaün to start taking # advantage of some clang-format 11 features, plus a few cleanups and # the usual update of the macro list" # # * tag 'clang-format-for-linus-v5.19-rc1' of https://github.com/ojeda/linux: # clang-format: Fix space after for_each macros # clang-format: Fix goto labels indentation # clang-format: Update to clang-format >= 6 # clang-format: Extend the for_each list with tools/ # clang-format: Simplify command with `sort -u` # clang-format: Use POSIX locale for `sort` # clang-format: Update with v5.18-rc7's `for_each` macro list # < /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 a9f94826e4bb6402e67f3eb849dee0811f1de6da # < make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_corenet64_smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- corenet64_smp_defconfig # < make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_corenet64_smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_corenet64_smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_corenet64_smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- fs/isofs/dir.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/isofs/namei.o:(.bss+0x0): first defined here fs/isofs/rock.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/isofs/namei.o:(.bss+0x0): first defined here fs/isofs/export.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/isofs/namei.o:(.bss+0x0): first defined here fs/isofs/joliet.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/isofs/namei.o:(.bss+0x0): first defined here make[3]: *** [/kisskb/src/scripts/Makefile.build:435: fs/isofs/isofs.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: fs/isofs] Error 2 make[2]: *** Waiting for unfinished jobs.... fs/hfs/bfind.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here fs/hfs/bnode.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here fs/hfs/brec.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here fs/hfs/btree.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here fs/hfs/catalog.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here fs/hfs/dir.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here fs/hfs/extent.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here fs/hfs/inode.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here fs/hfs/attr.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here fs/hfs/mdb.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here fs/hfs/part_tbl.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here fs/hfs/string.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here fs/hfs/sysdep.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here fs/hfs/trans.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfs/bitmap.o:(.bss+0x0): first defined here make[3]: *** [/kisskb/src/scripts/Makefile.build:435: fs/hfs/hfs.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: fs/hfs] Error 2 fs/hfsplus/inode.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/ioctl.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/extents.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/catalog.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/dir.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/btree.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/bnode.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/brec.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/bfind.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/tables.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/unicode.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/wrapper.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/bitmap.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/part_tbl.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/attributes.o:(.bss+0x40): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/xattr.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/xattr_user.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/xattr_security.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here fs/hfsplus/xattr_trusted.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hfsplus/options.o:(.bss+0x0): first defined here make[3]: *** [/kisskb/src/scripts/Makefile.build:435: fs/hfsplus/hfsplus.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: fs/hfsplus] Error 2 net/sctp/transport.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/chunk.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/sm_make_chunk.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/ulpevent.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/inqueue.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/outqueue.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/ulpqueue.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/tsnmap.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/bind_addr.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/socket.o:(.bss+0x40): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/primitive.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/output.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/input.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/debug.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/stream.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/auth.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/offload.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/stream_sched.o:(.bss+0x40): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/stream_sched_prio.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/stream_sched_rr.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here net/sctp/proc.o:(.bss+0x0): multiple definition of `____cacheline_aligned' net/sctp/endpointola.o:(.bss+0x0): first defined here make[3]: *** [/kisskb/src/scripts/Makefile.build:435: net/sctp/sctp.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: net/sctp] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1839: fs] Error 2 make[1]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1839: net] Error 2 In file included from /kisskb/src/drivers/crypto/caam/compat.h:41:0, from /kisskb/src/drivers/crypto/caam/error.c:8: /kisskb/src/include/crypto/poly1305.h:56:32: error: 'CONFIG_CRYPTO_LIB_POLY1305_RSIZE' undeclared here (not in a function) struct poly1305_key opaque_r[CONFIG_CRYPTO_LIB_POLY1305_RSIZE]; ^ make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/crypto/caam/error.o] Error 1 make[4]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/drivers/crypto/caam/compat.h:41:0, from /kisskb/src/drivers/crypto/caam/ctrl.c:15: /kisskb/src/include/crypto/poly1305.h:56:32: error: 'CONFIG_CRYPTO_LIB_POLY1305_RSIZE' undeclared here (not in a function) struct poly1305_key opaque_r[CONFIG_CRYPTO_LIB_POLY1305_RSIZE]; ^ In file included from /kisskb/src/drivers/crypto/caam/compat.h:41:0, from /kisskb/src/drivers/crypto/caam/qi.h:13, from /kisskb/src/drivers/crypto/caam/qi.c:16: /kisskb/src/include/crypto/poly1305.h:56:32: error: 'CONFIG_CRYPTO_LIB_POLY1305_RSIZE' undeclared here (not in a function) struct poly1305_key opaque_r[CONFIG_CRYPTO_LIB_POLY1305_RSIZE]; ^ make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/crypto/caam/ctrl.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/crypto/caam/qi.o] Error 1 In file included from /kisskb/src/drivers/crypto/caam/compat.h:41:0, from /kisskb/src/drivers/crypto/caam/debugfs.c:5: /kisskb/src/include/crypto/poly1305.h:56:32: error: 'CONFIG_CRYPTO_LIB_POLY1305_RSIZE' undeclared here (not in a function) struct poly1305_key opaque_r[CONFIG_CRYPTO_LIB_POLY1305_RSIZE]; ^ In file included from /kisskb/src/drivers/crypto/caam/compat.h:41:0, from /kisskb/src/drivers/crypto/caam/jr.c:13: /kisskb/src/include/crypto/poly1305.h:56:32: error: 'CONFIG_CRYPTO_LIB_POLY1305_RSIZE' undeclared here (not in a function) struct poly1305_key opaque_r[CONFIG_CRYPTO_LIB_POLY1305_RSIZE]; ^ make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/crypto/caam/debugfs.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/crypto/caam/jr.o] Error 1 In file included from /kisskb/src/drivers/crypto/caam/compat.h:41:0, from /kisskb/src/drivers/crypto/caam/key_gen.c:8: /kisskb/src/include/crypto/poly1305.h:56:32: error: 'CONFIG_CRYPTO_LIB_POLY1305_RSIZE' undeclared here (not in a function) struct poly1305_key opaque_r[CONFIG_CRYPTO_LIB_POLY1305_RSIZE]; ^ make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/crypto/caam/key_gen.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/crypto/caam] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/crypto] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1839: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=powerpc O=/kisskb/build/linus_corenet64_smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_corenet64_smp_defconfig_powerpc-gcc5 # Build took: 0:02:02.020681