Merge tag 'v3.18.116' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
[email protected] Fri, 31 Aug 2018 03:23:32 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994583AbeHaBXebrGcM/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Aug 31 02:36:16 2018 +0200 Commit: 019970688914d7fb51deb69825fc3afef58dd22e Gitweb: https://git.linux-mips.org/g/ralf/linux/019970688914 Branch: linux-3.18-stable --- Makefile | 2 - drivers/block/loop.c | 79 ++++++++++++++----------- drivers/block/loop.h | 1 drivers/crypto/amcc/crypto4xx_core.c | 23 +++---- drivers/infiniband/Kconfig | 12 ++++ drivers/infiniband/core/Makefile | 4 + drivers/misc/ibmasm/ibmasmfs.c | 27 +-------- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 34 ++++++++--- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 8 +-- drivers/net/ethernet/sun/sungem.c | 22 ++++--- drivers/usb/core/quirks.c | 4 + drivers/usb/host/xhci-mem.c | 2 - drivers/usb/misc/yurex.c | 23 ++----- drivers/usb/serial/keyspan_pda.c | 4 + drivers/usb/serial/mos7840.c | 3 + drivers/vhost/net.c | 3 + fs/inode.c | 6 ++ kernel/power/user.c | 5 ++ net/bridge/netfilter/ebtables.c | 15 +++++ net/dccp/ccids/ccid3.c | 16 +++-- net/dns_resolver/dns_key.c | 28 +++++---- net/ipv4/netfilter/ip_tables.c | 1 net/ipv4/sysctl_net_ipv4.c | 18 ++++-- net/ipv4/tcp_input.c | 9 +++ net/ipv6/netfilter/ip6_tables.c | 1 net/nfc/llcp_commands.c | 9 ++- net/rds/loop.c | 1 net/rds/rds.h | 5 ++ net/rds/recv.c | 5 ++ net/sched/sch_blackhole.c | 2 - 30 files changed, 227 insertions(+), 145 deletions(-)