Linus,
Please pull below to receive modules updates for the 4.15 merge window.
Details can be found in the signed tag.
NOTE: There is a small context conflict between the modules and ipmi
tree. Namely, some pieces from drivers/char/ipmi/ipmi_si_intf.c got
split into a new file, ipmi_si_hotmod.c, and a treewide fix from the
modules-next tree modified the former file. The merge conflict is
fixed in the ipmi tree, so things should go smoothly if you merge
modules-next before ipmi.
Thanks,
Jessica
---
The following changes since commit 33d930e59a98fa10a0db9f56c7fa2f21a4aef9b9:
Linux 4.14-rc5 (2017-10-15 21:01:12 -0400)
are available in the git repository at:
ssh://g...@gitolite.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git
tags/modules-for-v4.15
for you to fetch changes up to ece1996a21eeb344b49200e627c6660111009c10:
module: Do not paper over type mismatches in module_param_call() (2017-10-31
15:30:47 +0100)
----------------------------------------------------------------
Modules updates for v4.15
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
Signed-off-by: Jessica Yu <j...@kernel.org>
----------------------------------------------------------------
Kees Cook (3):
module: Prepare to convert all module_param_call() prototypes
treewide: Fix function prototypes for module_param_call()
module: Do not paper over type mismatches in module_param_call()
Markus Elfring (1):
kernel/module: Delete an error message for a failed memory allocation in
add_module_usage()
arch/powerpc/platforms/pseries/cmm.c | 2 +-
arch/x86/oprofile/nmi_int.c | 2 +-
drivers/acpi/button.c | 6 ++++--
drivers/acpi/ec.c | 6 ++++--
drivers/acpi/sysfs.c | 8 +++++---
drivers/android/binder.c | 2 +-
drivers/char/ipmi/ipmi_poweroff.c | 2 +-
drivers/char/ipmi/ipmi_si_intf.c | 4 ++--
drivers/edac/edac_mc_sysfs.c | 2 +-
drivers/edac/edac_module.c | 3 ++-
drivers/hid/hid-magicmouse.c | 3 ++-
drivers/ide/ide.c | 4 ++--
drivers/infiniband/hw/qib/qib_iba7322.c | 4 ++--
drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +-
drivers/isdn/hardware/mISDN/avmfritz.c | 2 +-
drivers/isdn/hardware/mISDN/mISDNinfineon.c | 2 +-
drivers/isdn/hardware/mISDN/netjet.c | 2 +-
drivers/isdn/hardware/mISDN/speedfax.c | 2 +-
drivers/isdn/hardware/mISDN/w6692.c | 2 +-
drivers/md/md.c | 6 +++---
drivers/media/pci/tw686x/tw686x-core.c | 4 ++--
drivers/media/usb/uvc/uvc_driver.c | 4 ++--
drivers/message/fusion/mptbase.c | 4 ++--
drivers/misc/kgdbts.c | 3 ++-
drivers/mtd/devices/block2mtd.c | 2 +-
drivers/mtd/devices/phram.c | 2 +-
drivers/mtd/ubi/build.c | 2 +-
drivers/pci/pcie/aspm.c | 5 +++--
drivers/platform/x86/thinkpad_acpi.c | 2 +-
drivers/scsi/fcoe/fcoe_transport.c | 20 ++++++++++++--------
drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +-
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +-
drivers/tty/serial/kgdboc.c | 3 ++-
fs/fuse/inode.c | 4 ++--
fs/lockd/svc.c | 2 +-
fs/ocfs2/dlmfs/dlmfs.c | 4 ++--
include/linux/moduleparam.h | 16 ++++------------
include/net/netfilter/nf_conntrack.h | 2 +-
kernel/module.c | 4 +---
net/netfilter/nf_conntrack_core.c | 2 +-
net/netfilter/nf_nat_ftp.c | 2 +-
net/netfilter/nf_nat_irc.c | 2 +-
net/sunrpc/svc.c | 4 ++--
security/apparmor/lsm.c | 16 ++++++++--------
44 files changed, 92 insertions(+), 87 deletions(-)
