Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...

Pull module updates from Jessica Yu:
 "Summary of modules changes for the 4.15 merge window:

   - treewide module_param_call() cleanup, fix up set/get function
     prototype mismatches, from Kees Cook

   - minor code cleanups"

* tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
  module: Do not paper over type mismatches in module_param_call()
  treewide: Fix function prototypes for module_param_call()
  module: Prepare to convert all module_param_call() prototypes
  kernel/module: Delete an error message for a failed memory allocation in add_module_usage()

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

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

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

diff --cc drivers/android/binder.c
Simple merge

diff --cc drivers/isdn/hardware/mISDN/w6692.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/pci/pcie/aspm.c
Simple merge

diff --cc drivers/scsi/fcoe/fcoe_transport.c
Simple merge

diff --cc drivers/scsi/mpt3sas/mpt3sas_base.c
Simple merge

diff --cc drivers/scsi/mpt3sas/mpt3sas_scsih.c
Simple merge

diff --cc drivers/tty/serial/kgdboc.c
Simple merge

diff --cc fs/fuse/inode.c
Simple merge

diff --cc include/linux/moduleparam.h
Simple merge

diff --cc include/net/netfilter/nf_conntrack.h
Simple merge

diff --cc kernel/module.c
Simple merge

diff --cc net/netfilter/nf_conntrack_core.c
Simple merge

diff --cc net/sunrpc/svc.c
Simple merge

diff --cc security/apparmor/lsm.c
Simple merge