Merge tag 'v4.13.14' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.13-stable

Author: Ralf Baechle <[email protected]> Thu Dec 21 14:09:51 2017 +0100
Commit: 2b46a0dad78bb1d84c9e9868444338892036f293
Gitweb: https://git.linux-mips.org/g/ralf/linux/2b46a0dad78b
Branch: linux-4.13-stable

---

 Makefile                                         |    2 
 drivers/dma/dmatest.c                            |    1 
 drivers/edac/sb_edac.c                           |    9 ++
 drivers/input/misc/ims-pcu.c                     |   16 +++-
 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c  |   89 +++++++++++++---------
 drivers/net/ethernet/mellanox/mlx5/core/health.c |    5 +
 drivers/net/geneve.c                             |    6 -
 drivers/net/ipvlan/ipvtap.c                      |    4 -
 drivers/net/macsec.c                             |    2 
 drivers/net/macvtap.c                            |    4 -
 drivers/net/ppp/ppp_generic.c                    |   20 +++++
 drivers/net/tap.c                                |   25 +++---
 drivers/net/tun.c                                |    7 ++
 drivers/usb/misc/usbtest.c                       |    5 +
 include/linux/if_tap.h                           |    4 -
 include/linux/netdevice.h                        |    3 +
 include/net/inet_sock.h                          |    8 ++
 include/net/tcp.h                                |    6 +
 net/bridge/br_netlink.c                          |    2 
 net/core/dev.c                                   |    6 +
 net/core/sock.c                                  |    3 -
 net/core/sock_reuseport.c                        |   12 ++-
 net/dccp/ipv4.c                                  |   13 ++-
 net/dsa/dsa2.c                                   |    7 +-
 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/route.c                                 |    2 
 net/ipv4/syncookies.c                            |    2 
 net/ipv4/tcp_input.c                             |    2 
 net/ipv4/tcp_ipv4.c                              |   21 +++--
 net/ipv4/tcp_output.c                            |    5 +
 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/ipv6/route.c                                 |    2 
 net/l2tp/l2tp_ppp.c                              |   10 ++
 net/mac80211/key.c                               |   54 ++++++++++++-
 net/netlink/af_netlink.c                         |   21 +++--
 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 
 51 files changed, 394 insertions(+), 186 deletions(-)