Merge tag 'v4.9.63' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.9-stable
[email protected] Thu, 21 Dec 2017 17:22:47 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23991827AbdLUQWuCV3Qb/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Dec 21 14:13:35 2017 +0100 Commit: 678c234d531f5b79049264ddd540a1de86f0550b Gitweb: https://git.linux-mips.org/g/ralf/linux/678c234d531f Branch: linux-4.9-stable --- Makefile | 2 arch/arm/boot/dts/imx53-qsb-common.dtsi | 20 +-- arch/powerpc/Kconfig | 5 - arch/s390/Kconfig | 3 arch/sparc/Kconfig | 3 arch/x86/Kconfig | 4 - drivers/input/misc/ims-pcu.c | 16 ++ drivers/misc/panel.c | 23 +++ drivers/net/macvtap.c | 20 ++- drivers/net/ppp/ppp_generic.c | 20 +++ drivers/net/tun.c | 7 + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 3 drivers/scsi/qla2xxx/tcm_qla2xxx.c | 33 ----- drivers/target/iscsi/iscsi_target.c | 19 +-- drivers/usb/misc/usbtest.c | 5 - include/linux/netdevice.h | 3 include/net/inet_sock.h | 8 + include/net/netfilter/nf_conntrack.h | 3 include/net/netfilter/nf_nat.h | 1 include/net/tcp.h | 6 - include/target/target_core_base.h | 1 net/core/dev.c | 6 - net/core/sock.c | 3 net/core/sock_reuseport.c | 12 +- net/dccp/ipv4.c | 13 +- net/ipv4/cipso_ipv4.c | 24 +-- net/ipv4/gre_offload.c | 2 net/ipv4/inet_connection_sock.c | 9 + net/ipv4/inet_hashtables.c | 5 - net/ipv4/ipip.c | 59 ++++++-- net/ipv4/syncookies.c | 2 net/ipv4/tcp_input.c | 2 net/ipv4/tcp_ipv4.c | 21 ++- net/ipv4/tcp_output.c | 3 net/ipv4/udp.c | 5 - net/ipv4/udp_offload.c | 2 net/ipv6/addrconf.c | 1 net/ipv6/ip6_flowlabel.c | 1 net/ipv6/ip6_gre.c | 20 ++- net/ipv6/ip6_offload.c | 2 net/ipv6/ip6_output.c | 4 - net/l2tp/l2tp_ppp.c | 3 net/mac80211/key.c | 54 +++++++ net/netfilter/nf_conntrack_core.c | 2 net/netfilter/nf_nat_core.c | 146 ++++++++------------ net/netlink/af_netlink.c | 13 +- net/packet/af_packet.c | 24 ++- net/sched/sch_api.c | 2 net/sctp/input.c | 2 net/sctp/ipv6.c | 6 + net/sctp/socket.c | 32 ++++ net/unix/diag.c | 2 security/keys/Kconfig | 4 + sound/core/seq/seq_device.c | 3 54 files changed, 402 insertions(+), 292 deletions(-)