Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Author: Ralf Baechle <[email protected]> Tue Oct 10 10:44:53 2017 +0200
Commit: f73e171fcaf36fa39f77dc4b00d7a5b03df60189
Gitweb: https://git.linux-mips.org/g/ralf/linux/f73e171fcaf3
Branch: master

---

 Documentation/networking/bonding.txt               |    2 +
 arch/Kconfig                                       |    3 --
 arch/powerpc/kernel/exceptions-64s.S               |   24 ++++++++++++++++-
 arch/powerpc/kernel/signal_64.c                    |   13 ++++++++-
 arch/sparc/Kconfig                                 |    1 -
 drivers/net/ethernet/cavium/thunder/nicvf_main.c   |    2 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c     |   22 ---------------
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c    |   19 -------------
 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |   16 ++++++-----
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |    6 +++-
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  |   14 ----------
 drivers/net/ppp/ppp_generic.c                      |   20 ++++++++++++++
 drivers/net/usb/cdc_ether.c                        |   13 +++++++++
 fs/nfs/client.c                                    |    2 +
 fs/nfs/filelayout/filelayout.c                     |    3 +-
 fs/nfs/nfs4idmap.c                                 |    2 +
 fs/nfs/nfs4proc.c                                  |    3 +-
 fs/nfs/nfs4xdr.c                                   |    4 +--
 include/linux/bpf.h                                |    5 +++
 include/linux/netfilter_bridge/ebtables.h          |    7 +++--
 include/uapi/linux/netfilter/xt_bpf.h              |    1 +
 kernel/bpf/inode.c                                 |    1 +
 kernel/bpf/verifier.c                              |    5 +++
 net/bridge/netfilter/ebtable_broute.c              |    4 +--
 net/bridge/netfilter/ebtable_filter.c              |    4 +--
 net/bridge/netfilter/ebtable_nat.c                 |    4 +--
 net/bridge/netfilter/ebtables.c                    |   17 ++++++------
 net/ipv4/gre_offload.c                             |    2 +
 net/ipv4/netfilter/ipt_SYNPROXY.c                  |    3 +-
 net/ipv4/route.c                                   |    2 +
 net/ipv4/udp.c                                     |   14 +++-------
 net/ipv4/udp_offload.c                             |    2 +
 net/ipv6/addrconf.c                                |    4 +--
 net/ipv6/ip6_offload.c                             |    2 +
 net/ipv6/netfilter/ip6t_SYNPROXY.c                 |    2 +
 net/ipv6/route.c                                   |    2 +
 net/netfilter/ipset/ip_set_core.c                  |   29 ++++++++++++--------
 net/netfilter/ipset/ip_set_hash_ip.c               |   22 ++++++++-------
 net/netfilter/ipset/ip_set_hash_ipmark.c           |    2 +
 net/netfilter/ipset/ip_set_hash_ipport.c           |    2 +
 net/netfilter/ipset/ip_set_hash_ipportip.c         |    2 +
 net/netfilter/ipset/ip_set_hash_ipportnet.c        |    4 +--
 net/netfilter/ipset/ip_set_hash_net.c              |    2 +
 net/netfilter/ipset/ip_set_hash_netiface.c         |    2 +
 net/netfilter/ipset/ip_set_hash_netnet.c           |    4 +--
 net/netfilter/ipset/ip_set_hash_netport.c          |    2 +
 net/netfilter/ipset/ip_set_hash_netportnet.c       |    4 +--
 net/netfilter/ipvs/ip_vs_xmit.c                    |    8 ++++--
 net/netfilter/nf_tables_api.c                      |   10 ++++---
 net/netfilter/x_tables.c                           |    4 +--
 net/netfilter/xt_bpf.c                             |   22 ++++++++++++++-
 net/netfilter/xt_socket.c                          |    4 +--
 net/netlink/af_netlink.c                           |   13 +++++----
 net/sunrpc/xprtsock.c                              |    2 +
 net/tipc/bcast.c                                   |    4 +--
 net/tipc/msg.c                                     |    8 ++++++
 net/wireless/nl80211.c                             |   14 ++++++++--
 net/xfrm/xfrm_device.c                             |    1 +
 net/xfrm/xfrm_input.c                              |    6 +++-
 net/xfrm/xfrm_state.c                              |    4 +--
 net/xfrm/xfrm_user.c                               |    1 +
 .../networking/timestamping/rxtimestamp.c          |    2 +
 62 files changed, 254 insertions(+), 174 deletions(-)