# git rev-parse -q --verify 512b7931ad0561ffe14265f9ff554a3c081b476b^{commit} 512b7931ad0561ffe14265f9ff554a3c081b476b already have revision, skipping fetch # git checkout -q -f -B kisskb 512b7931ad0561ffe14265f9ff554a3c081b476b # git clean -qxdf # < git log -1 # commit 512b7931ad0561ffe14265f9ff554a3c081b476b # Merge: fe91c4725aee 658f9ae761b5 # Author: Linus Torvalds # Date: Sat Nov 6 14:08:17 2021 -0700 # # Merge branch 'akpm' (patches from Andrew) # # Merge misc updates from Andrew Morton: # "257 patches. # # Subsystems affected by this patch series: scripts, ocfs2, vfs, and # mm (slab-generic, slab, slub, kconfig, dax, kasan, debug, pagecache, # gup, swap, memcg, pagemap, mprotect, mremap, iomap, tracing, vmalloc, # pagealloc, memory-failure, hugetlb, userfaultfd, vmscan, tools, # memblock, oom-kill, hugetlbfs, migration, thp, readahead, nommu, ksm, # vmstat, madvise, memory-hotplug, rmap, zsmalloc, highmem, zram, # cleanups, kfence, and damon)" # # * emailed patches from Andrew Morton : (257 commits) # mm/damon: remove return value from before_terminate callback # mm/damon: fix a few spelling mistakes in comments and a pr_debug message # mm/damon: simplify stop mechanism # Docs/admin-guide/mm/pagemap: wordsmith page flags descriptions # Docs/admin-guide/mm/damon/start: simplify the content # Docs/admin-guide/mm/damon/start: fix a wrong link # Docs/admin-guide/mm/damon/start: fix wrong example commands # mm/damon/dbgfs: add adaptive_targets list check before enable monitor_on # mm/damon: remove unnecessary variable initialization # Documentation/admin-guide/mm/damon: add a document for DAMON_RECLAIM # mm/damon: introduce DAMON-based Reclamation (DAMON_RECLAIM) # selftests/damon: support watermarks # mm/damon/dbgfs: support watermarks # mm/damon/schemes: activate schemes based on a watermarks mechanism # tools/selftests/damon: update for regions prioritization of schemes # mm/damon/dbgfs: support prioritization weights # mm/damon/vaddr,paddr: support pageout prioritization # mm/damon/schemes: prioritize regions within the quotas # mm/damon/selftests: support schemes quotas # mm/damon/dbgfs: support quotas of schemes # ... # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 512b7931ad0561ffe14265f9ff554a3c081b476b # < make -s -j 80 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 80 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 80 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 80 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- :1559:2: warning: #warning syscall futex_waitv not implemented [-Wcpp] In file included from : In function 'prestera_hw_build_tests', inlined from 'prestera_hw_switch_init' at /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:788:2: /kisskb/src/include/linux/compiler_types.h:329:45: error: call to '__compiletime_assert_352' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_switch_attr_req) != 16 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:310:25: note: in definition of macro '__compiletime_assert' 310 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:329:9: note: in expansion of macro '_compiletime_assert' 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:501:9: note: in expansion of macro 'BUILD_BUG_ON' 501 | BUILD_BUG_ON(sizeof(struct prestera_msg_switch_attr_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:329:45: error: call to '__compiletime_assert_357' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_bridge_req) != 16 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:310:25: note: in definition of macro '__compiletime_assert' 310 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:329:9: note: in expansion of macro '_compiletime_assert' 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:506:9: note: in expansion of macro 'BUILD_BUG_ON' 506 | BUILD_BUG_ON(sizeof(struct prestera_msg_bridge_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:329:45: error: call to '__compiletime_assert_359' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_acl_ruleset_bind_req) != 16 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:310:25: note: in definition of macro '__compiletime_assert' 310 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:329:9: note: in expansion of macro '_compiletime_assert' 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:508:9: note: in expansion of macro 'BUILD_BUG_ON' 508 | BUILD_BUG_ON(sizeof(struct prestera_msg_acl_ruleset_bind_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:329:45: error: call to '__compiletime_assert_360' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_acl_ruleset_req) != 8 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:310:25: note: in definition of macro '__compiletime_assert' 310 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:329:9: note: in expansion of macro '_compiletime_assert' 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:509:9: note: in expansion of macro 'BUILD_BUG_ON' 509 | BUILD_BUG_ON(sizeof(struct prestera_msg_acl_ruleset_req) != 8); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:329:45: error: call to '__compiletime_assert_361' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_span_req) != 16 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:310:25: note: in definition of macro '__compiletime_assert' 310 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:329:9: note: in expansion of macro '_compiletime_assert' 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:510:9: note: in expansion of macro 'BUILD_BUG_ON' 510 | BUILD_BUG_ON(sizeof(struct prestera_msg_span_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:329:45: error: call to '__compiletime_assert_363' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_rxtx_req) != 8 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:310:25: note: in definition of macro '__compiletime_assert' 310 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:329:9: note: in expansion of macro '_compiletime_assert' 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:512:9: note: in expansion of macro 'BUILD_BUG_ON' 512 | BUILD_BUG_ON(sizeof(struct prestera_msg_rxtx_req) != 8); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:329:45: error: call to '__compiletime_assert_364' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_lag_req) != 16 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:310:25: note: in definition of macro '__compiletime_assert' 310 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:329:9: note: in expansion of macro '_compiletime_assert' 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:513:9: note: in expansion of macro 'BUILD_BUG_ON' 513 | BUILD_BUG_ON(sizeof(struct prestera_msg_lag_req) != 16); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:329:45: error: call to '__compiletime_assert_365' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_cpu_code_counter_req) != 8 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:310:25: note: in definition of macro '__compiletime_assert' 310 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:329:9: note: in expansion of macro '_compiletime_assert' 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:514:9: note: in expansion of macro 'BUILD_BUG_ON' 514 | BUILD_BUG_ON(sizeof(struct prestera_msg_cpu_code_counter_req) != 8); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:329:45: error: call to '__compiletime_assert_370' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_port_info_resp) != 20 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:310:25: note: in definition of macro '__compiletime_assert' 310 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:329:9: note: in expansion of macro '_compiletime_assert' 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:521:9: note: in expansion of macro 'BUILD_BUG_ON' 521 | BUILD_BUG_ON(sizeof(struct prestera_msg_port_info_resp) != 20); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:329:45: error: call to '__compiletime_assert_371' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_bridge_resp) != 12 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:310:25: note: in definition of macro '__compiletime_assert' 310 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:329:9: note: in expansion of macro '_compiletime_assert' 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:522:9: note: in expansion of macro 'BUILD_BUG_ON' 522 | BUILD_BUG_ON(sizeof(struct prestera_msg_bridge_resp) != 12); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:329:45: error: call to '__compiletime_assert_374' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_acl_ruleset_resp) != 12 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:310:25: note: in definition of macro '__compiletime_assert' 310 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:329:9: note: in expansion of macro '_compiletime_assert' 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:525:9: note: in expansion of macro 'BUILD_BUG_ON' 525 | BUILD_BUG_ON(sizeof(struct prestera_msg_acl_ruleset_resp) != 12); | ^~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:329:45: error: call to '__compiletime_assert_375' declared with attribute error: BUILD_BUG_ON failed: sizeof(struct prestera_msg_span_resp) != 12 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ /kisskb/src/include/linux/compiler_types.h:310:25: note: in definition of macro '__compiletime_assert' 310 | prefix ## suffix(); \ | ^~~~~~ /kisskb/src/include/linux/compiler_types.h:329:9: note: in expansion of macro '_compiletime_assert' 329 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG' 50 | BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) | ^~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/marvell/prestera/prestera_hw.c:526:9: note: in expansion of macro 'BUILD_BUG_ON' 526 | BUILD_BUG_ON(sizeof(struct prestera_msg_span_resp) != 12); | ^~~~~~~~~~~~ make[6]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/net/ethernet/marvell/prestera/prestera_hw.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/net/ethernet/marvell/prestera] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/net/ethernet/marvell] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/net/ethernet] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/net] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1887: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 80 ARCH=m68k O=/kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_m68k-allmodconfig_m68k-gcc11 # Build took: 0:13:18.308637