# git rev-parse -q --verify 8291eaafed36f575f23951f3ce18407f480e9ecf^{commit} 8291eaafed36f575f23951f3ce18407f480e9ecf already have revision, skipping fetch # git checkout -q -f -B kisskb 8291eaafed36f575f23951f3ce18407f480e9ecf # git clean -qxdf # < git log -1 # commit 8291eaafed36f575f23951f3ce18407f480e9ecf # Merge: 77fb622de139 fa020a2b87d2 # Author: Linus Torvalds # Date: Fri May 27 11:40:49 2022 -0700 # # Merge tag 'mm-stable-2022-05-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm # # Pull more MM updates from Andrew Morton: # # - Two follow-on fixes for the post-5.19 series "Use pageblock_order for # cma and alloc_contig_range alignment", from Zi Yan. # # - A series of z3fold cleanups and fixes from Miaohe Lin. # # - Some memcg selftests work from Michal Koutný # # - Some swap fixes and cleanups from Miaohe Lin # # - Several individual minor fixups # # * tag 'mm-stable-2022-05-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (25 commits) # mm/shmem.c: suppress shift warning # mm: Kconfig: reorganize misplaced mm options # mm: kasan: fix input of vmalloc_to_page() # mm: fix is_pinnable_page against a cma page # mm: filter out swapin error entry in shmem mapping # mm/shmem: fix infinite loop when swap in shmem error at swapoff time # mm/madvise: free hwpoison and swapin error entry in madvise_free_pte_range # mm/swapfile: fix lost swap bits in unuse_pte() # mm/swapfile: unuse_pte can map random data if swap read fails # selftests: memcg: factor out common parts of memory.{low,min} tests # selftests: memcg: remove protection from top level memcg # selftests: memcg: adjust expected reclaim values of protected cgroups # selftests: memcg: expect no low events in unprotected sibling # selftests: memcg: fix compilation # mm/z3fold: fix z3fold_page_migrate races with z3fold_map # mm/z3fold: fix z3fold_reclaim_page races with z3fold_free # mm/z3fold: always clear PAGE_CLAIMED under z3fold page lock # mm/z3fold: put z3fold page back into unbuddied list when reclaim or migration fails # revert "mm/z3fold.c: allow __GFP_HIGHMEM in z3fold_alloc" # mm/z3fold: throw warning on failure of trylock_page in z3fold_alloc # ... # < /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 8291eaafed36f575f23951f3ce18407f480e9ecf # < 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/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 make[2]: *** Waiting for unfinished jobs.... 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/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 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/hfs/hfs.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:435: fs/isofs/isofs.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: fs/hfs] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: fs/isofs] 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 make[1]: *** [/kisskb/src/Makefile:1839: fs] Error 2 make[1]: *** Waiting for unfinished jobs.... 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[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 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 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:00.068871