# git rev-parse -q --verify 7e284070abe53d448517b80493863595af4ab5f0^{commit} 7e284070abe53d448517b80493863595af4ab5f0 already have revision, skipping fetch # git checkout -q -f -B kisskb 7e284070abe53d448517b80493863595af4ab5f0 # git clean -qxdf # < git log -1 # commit 7e284070abe53d448517b80493863595af4ab5f0 # Merge: 780d8ce71628 ca522482e3ea # Author: Linus Torvalds # Date: Thu May 26 21:13:45 2022 -0700 # # Merge tag 'for-5.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm # # Pull device mapper updates from Mike Snitzer: # # - Enable DM core bioset's per-cpu bio cache if QUEUE_FLAG_POLL set. # This change improves DM's hipri bio polling (REQ_POLLED) performance # by 7 - 20% depending on the system. # # - Update DM core to use jump_labels to further reduce cost of unlikely # branches for zoned block devices, dm-stats and swap_bios throttling. # # - Various DM core changes to reduce bio-based DM overhead and simplify # IO accounting. # # - Fundamental DM core improvements to dm_io reference counting and the # elimination of using bio_split()+bio_chain() -- instead DM's # bio-based IO accounting is updated to account that a split occurred. # # - Improve DM core's abnormal bio processing to do less work. # # - Improve DM core's hipri polling support to use a single list rather # than an hlist. # # - Update DM core to pass NULL bdev to bio_alloc_clone() so that # initialization that isn't useful for DM can be elided. # # - Add cond_resched to DM stats' various loops that loop over all # entries. # # - Fix incorrect error code return from DM integrity's constructor. # # - Make DM crypt's printing of the key constant-time. # # - Update bio-based DM multipath to provide high-resolution timer to the # Historical Service Time (HST) path selector. # # * tag 'for-5.19/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (26 commits) # dm: pass NULL bdev to bio_alloc_clone # dm cache metadata: remove unnecessary variable in __dump_mapping # dm mpath: provide high-resolution timer to HST for bio-based # dm crypt: make printing of the key constant-time # dm integrity: fix error code in dm_integrity_ctr() # dm stats: add cond_resched when looping over entries # dm: improve abnormal bio processing # dm: simplify bio-based IO accounting further # dm: put all polled dm_io instances into a single list # dm: improve dm_io reference counting # dm: don't grab target io reference in dm_zone_map_bio # dm: improve bio splitting and associated IO accounting # dm: switch to bdev based IO accounting interfaces # dm: pass dm_io instance to dm_io_acct directly # dm: don't pass bio to __dm_start_io_acct and dm_end_io_acct # dm: use bio_sectors in dm_aceept_partial_bio # dm: simplify basic targets # dm: conditionally enable branching for less used features # dm: introduce dm_{get,put}_live_table_bio called from dm_submit_bio # dm: move hot dm_io members to same cacheline as dm_target_io # ... # < /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 7e284070abe53d448517b80493863595af4ab5f0 # < make -s -j 120 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 120 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 120 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 120 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/qnx4/namei.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/qnx4/dir.o:(.bss+0x0): first defined here fs/qnx4/bitmap.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/qnx4/dir.o:(.bss+0x0): first defined here make[3]: *** [/kisskb/src/scripts/Makefile.build:435: fs/qnx4/qnx4.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: fs/qnx4] Error 2 fs/sysv/balloc.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/sysv/ialloc.o:(.bss+0x0): first defined here fs/sysv/inode.o:(.bss+0x40): multiple definition of `____cacheline_aligned' fs/sysv/ialloc.o:(.bss+0x0): first defined here fs/sysv/itree.o:(.bss+0x40): multiple definition of `____cacheline_aligned' fs/sysv/ialloc.o:(.bss+0x0): first defined here fs/sysv/file.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/sysv/ialloc.o:(.bss+0x0): first defined here fs/sysv/dir.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/sysv/ialloc.o:(.bss+0x0): first defined here fs/sysv/namei.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/sysv/ialloc.o:(.bss+0x0): first defined here make[3]: *** [/kisskb/src/scripts/Makefile.build:435: fs/sysv/sysv.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: fs/sysv] Error 2 fs/freevxfs/vxfs_fshead.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/freevxfs/vxfs_bmap.o:(.bss+0x0): first defined here fs/freevxfs/vxfs_immed.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/freevxfs/vxfs_bmap.o:(.bss+0x0): first defined here fs/freevxfs/vxfs_inode.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/freevxfs/vxfs_bmap.o:(.bss+0x0): first defined here fs/freevxfs/vxfs_lookup.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/freevxfs/vxfs_bmap.o:(.bss+0x0): first defined here fs/freevxfs/vxfs_olt.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/freevxfs/vxfs_bmap.o:(.bss+0x0): first defined here fs/freevxfs/vxfs_subr.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/freevxfs/vxfs_bmap.o:(.bss+0x0): first defined here make[3]: *** [/kisskb/src/scripts/Makefile.build:435: fs/freevxfs/freevxfs.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: fs/freevxfs] Error 2 fs/efs/namei.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/efs/inode.o:(.bss+0x0): first defined here fs/efs/dir.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/efs/inode.o:(.bss+0x0): first defined here fs/efs/file.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/efs/inode.o:(.bss+0x0): first defined here fs/efs/symlink.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/efs/inode.o:(.bss+0x0): first defined here make[3]: *** [/kisskb/src/scripts/Makefile.build:435: fs/efs/efs.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: fs/efs] Error 2 fs/affs/inode.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/affs/namei.o:(.bss+0x0): first defined here fs/affs/file.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/affs/namei.o:(.bss+0x0): first defined here fs/affs/dir.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/affs/namei.o:(.bss+0x0): first defined here fs/affs/amigaffs.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/affs/namei.o:(.bss+0x0): first defined here fs/affs/bitmap.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/affs/namei.o:(.bss+0x0): first defined here fs/affs/symlink.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/affs/namei.o:(.bss+0x0): first defined here make[3]: *** [/kisskb/src/scripts/Makefile.build:435: fs/affs/affs.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: fs/affs] Error 2 fs/ufs/cylinder.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/ufs/balloc.o:(.bss+0x0): first defined here fs/ufs/file.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/ufs/balloc.o:(.bss+0x0): first defined here fs/ufs/ialloc.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/ufs/balloc.o:(.bss+0x0): first defined here fs/ufs/inode.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/ufs/balloc.o:(.bss+0x0): first defined here fs/ufs/util.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/ufs/balloc.o:(.bss+0x0): first defined here make[3]: *** [/kisskb/src/scripts/Makefile.build:435: fs/ufs/ufs.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: fs/ufs] Error 2 fs/adfs/dir_f.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/adfs/dir.o:(.bss+0x0): first defined here fs/adfs/dir_fplus.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/adfs/dir.o:(.bss+0x0): first defined here fs/adfs/file.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/adfs/dir.o:(.bss+0x0): first defined here fs/adfs/inode.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/adfs/dir.o:(.bss+0x0): first defined here fs/adfs/map.o:(.bss+0x40): multiple definition of `____cacheline_aligned' fs/adfs/dir.o:(.bss+0x0): first defined here make[3]: *** [/kisskb/src/scripts/Makefile.build:435: fs/adfs/adfs.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: fs/adfs] 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 fs/hpfs/anode.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hpfs/alloc.o:(.bss+0x0): first defined here fs/hpfs/buffer.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hpfs/alloc.o:(.bss+0x0): first defined here fs/hpfs/dentry.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hpfs/alloc.o:(.bss+0x0): first defined here fs/hpfs/dir.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hpfs/alloc.o:(.bss+0x0): first defined here fs/hpfs/dnode.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hpfs/alloc.o:(.bss+0x0): first defined here fs/hpfs/ea.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hpfs/alloc.o:(.bss+0x0): first defined here fs/hpfs/file.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hpfs/alloc.o:(.bss+0x0): first defined here fs/hpfs/inode.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hpfs/alloc.o:(.bss+0x0): first defined here fs/hpfs/map.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hpfs/alloc.o:(.bss+0x0): first defined here fs/hpfs/name.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hpfs/alloc.o:(.bss+0x0): first defined here fs/hpfs/namei.o:(.bss+0x0): multiple definition of `____cacheline_aligned' fs/hpfs/alloc.o:(.bss+0x0): first defined here fs/hpfs/super.o:(.bss+0x40): multiple definition of `____cacheline_aligned' fs/hpfs/alloc.o:(.bss+0x0): first defined here make[3]: *** [/kisskb/src/scripts/Makefile.build:435: fs/hpfs/hpfs.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: fs/hpfs] Error 2 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 make[1]: *** [/kisskb/src/Makefile:1839: fs] Error 2 make[1]: *** Waiting for unfinished jobs.... 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: net] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 120 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:00:38.094560