The patch titled Subject: test_sysctl-add-proc_do_large_bitmap-test-case-fix has been added to the -mm tree. Its filename is test_sysctl-add-proc_do_large_bitmap-test-case-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/test_sysctl-add-proc_do_large_bitmap-test-case-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/test_sysctl-add-proc_do_large_bitmap-test-case-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: test_sysctl-add-proc_do_large_bitmap-test-case-fix move proc_do_large_bitmap() export to EOF so it conflicts with the same change in 0bc1998544055 ("ipv6: Add rate limit mask for ICMPv6 messages"). Cc: Eric Sandeen <sandeen@xxxxxxxxxx> Cc: Eric Sandeen <sandeen@xxxxxxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Luis Chamberlain <mcgrof@xxxxxxxxxx> Cc: Stephen Suryaputra <ssuryaextr@xxxxxxxxx> Cc: David S. Miller <davem@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/sysctl.c~test_sysctl-add-proc_do_large_bitmap-test-case-fix +++ a/kernel/sysctl.c @@ -3274,7 +3274,6 @@ int proc_do_large_bitmap(struct ctl_tabl bitmap_free(tmp_bitmap); return err; } -EXPORT_SYMBOL_GPL(proc_do_large_bitmap); #else /* CONFIG_PROC_SYSCTL */ @@ -3379,3 +3378,4 @@ EXPORT_SYMBOL(proc_dointvec_ms_jiffies); EXPORT_SYMBOL(proc_dostring); EXPORT_SYMBOL(proc_doulongvec_minmax); EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax); +EXPORT_SYMBOL(proc_do_large_bitmap); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch mm.patch slab-fix-an-infinite-loop-in-leaks_show-fix.patch userfaultfd-sysctl-add-vmunprivileged_userfaultfd-fix.patch mm-compaction-fix-an-undefined-behaviour-fix.patch mm-enable-error-injection-at-add_to_page_cache-fix.patch mm-memory_hotplug-provide-a-more-generic-restrictions-for-memory-hotplug-fix.patch mm-add-probe_user_read-fix.patch mm-maintain-randomization-of-page-free-lists-checkpatch-fixes.patch byteorder-sanity-check-toolchain-vs-kernel-endianess-checkpatch-fixes.patch lib-list_sort-simplify-and-remove-max_list_length_bits-fix.patch lib-test_vmallocc-test_func-eliminate-local-ret.patch fs-binfmt_elfc-remove-unneeded-initialization-of-mm-start_stack.patch reiserfs-add-comment-to-explain-endianness-issue-in-xattr_hash-checkpatch-fixes.patch cpumask-fix-double-string-traverse-in-cpumask_parse-fix.patch test_sysctl-add-proc_do_large_bitmap-test-case-fix.patch convert-struct-pid-count-to-refcount_t-fix.patch gcov-clang-support-checkpatch-fixes.patch ipc-do-cyclic-id-allocation-for-the-ipc-object-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch mm-rename-ambiguously-named-memorystat-counters-and-functions-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch