Merge tag 'v4.4.50' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.4-stable
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994874AbdEMWijl0x2F/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue Mar 7 10:11:02 2017 +0100 Commit: 814832a31d636b9d1f7132057f98968d26fbdaaa Gitweb: https://git.linux-mips.org/g/ralf/linux/814832a31d63 Branch: linux-4.4-stable --- Makefile | 2 + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 5 +++ drivers/net/loopback.c | 1 + drivers/net/macvtap.c | 4 +-- drivers/net/tun.c | 10 ++++--- include/linux/can/core.h | 7 ++--- include/linux/netdevice.h | 4 +++ include/net/cipso_ipv4.h | 4 +++ net/can/af_can.c | 12 +++++++- net/can/af_can.h | 3 +- net/can/bcm.c | 4 +-- net/can/gw.c | 2 + net/can/raw.c | 4 +-- net/core/dev.c | 31 +++++++++------------ net/ethernet/eth.c | 1 + net/ipv4/cipso_ipv4.c | 4 +++ net/ipv4/ip_sockglue.c | 9 +++++- net/ipv4/ping.c | 2 + net/ipv4/tcp.c | 6 ++++ net/ipv4/tcp_output.c | 6 +++- net/ipv6/ip6_gre.c | 41 +++++++++++++++------------- net/ipv6/ip6_tunnel.c | 34 +++++++++++++++-------- net/ipv6/sit.c | 1 + net/ipv6/tcp_ipv6.c | 24 +++++++++------- net/l2tp/l2tp_core.h | 1 + net/l2tp/l2tp_ip.c | 27 ++++++++++++++++++ net/l2tp/l2tp_ip6.c | 2 + net/packet/af_packet.c | 7 +++-- net/sctp/socket.c | 3 +- 29 files changed, 172 insertions(+), 89 deletions(-)