Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull module update from Rusty Russell:
 "The sweeping change is to make add_taint() explicitly indicate whether
  to disable lockdep, but it's a mechanical change."

* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  MODSIGN: Add option to not sign modules during modules_install
  MODSIGN: Add -s <signature> option to sign-file
  MODSIGN: Specify the hash algorithm on sign-file command line
  MODSIGN: Simplify Makefile with a Kconfig helper
  module: clean up load_module a little more.
  modpost: Ignore ARC specific non-alloc sections
  module: constify within_module_*
  taint: add explicit flag to show whether lock dep is still OK.
  module: printk message when module signature fail taints kernel.

diff --cc Makefile
Simple merge

diff --cc arch/powerpc/kernel/traps.c
Simple merge

diff --cc arch/x86/kernel/cpu/amd.c
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge

diff --cc drivers/acpi/custom_method.c
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/base/regmap/regmap-debugfs.c
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/page_alloc.c
index e9075fdef695fdefe440fd802311eb8c78120dad,4c99cb7e276a64b4ac404b6b28634f659015ac41..0dade3f18f7def562e141f28bc295d509830ac84
--- 1/mm/page_alloc.c
--- 2/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@@ -332,8 -319,8 +332,8 @@@ static void bad_page(struct page *page
        dump_stack();
  out:
        /* Leave bad fields for debug, except PageBuddy could make trouble */
 -      reset_page_mapcount(page); /* remove PageBuddy */
 +      page_mapcount_reset(page); /* remove PageBuddy */
-       add_taint(TAINT_BAD_PAGE);
+       add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
  }
  
  /*

diff --cc mm/slub.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge