Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Tue, 09 Jan 2018 13:52:17 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992404AbeAIMwT03paT/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue Jan 9 13:51:22 2018 +0100 Commit: 32922974ad355d9bf7db977ea9a0fd38689f6a78 Gitweb: https://git.linux-mips.org/g/ralf/linux/32922974ad35 Branch: master --- MAINTAINERS | 2 drivers/infiniband/core/core_priv.h | 2 drivers/infiniband/core/device.c | 18 ++++ drivers/infiniband/core/nldev.c | 54 ++++++++---- drivers/infiniband/hw/mlx4/mr.c | 2 drivers/infiniband/ulp/ipoib/ipoib_main.c | 25 ++++-- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 5 + drivers/infiniband/ulp/srpt/ib_srpt.c | 5 - drivers/net/can/flexcan.c | 2 drivers/net/can/usb/ems_usb.c | 1 drivers/net/can/usb/gs_usb.c | 2 drivers/net/can/vxcan.c | 2 drivers/net/dsa/b53/b53_common.c | 9 +- drivers/net/ethernet/3com/3c59x.c | 90 ++++++++------------ drivers/net/ethernet/amazon/ena/ena_netdev.c | 45 +++++++--- drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 2 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 1 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 17 ++-- drivers/net/ethernet/freescale/fec_main.c | 7 +- drivers/net/ethernet/intel/e1000/e1000.h | 3 - drivers/net/ethernet/intel/e1000/e1000_main.c | 27 +++++- drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 ++ drivers/net/ethernet/intel/i40e/i40e_main.c | 37 ++++++-- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 26 +++++- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 26 +++++- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 11 ++ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 2 .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 6 + drivers/net/ethernet/renesas/sh_eth.c | 33 ++++++- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 + drivers/net/geneve.c | 14 +++ drivers/net/macvlan.c | 7 +- drivers/net/phy/mdio-sun4i.c | 6 + drivers/net/phy/phylink.c | 5 + drivers/net/phy/sfp-bus.c | 6 + drivers/net/usb/qmi_wwan.c | 1 drivers/net/xen-netfront.c | 1 drivers/platform/x86/wmi.c | 2 include/linux/sh_eth.h | 1 include/net/sctp/structs.h | 2 include/net/vxlan.h | 2 include/uapi/linux/if_ether.h | 3 + include/uapi/linux/libc-compat.h | 61 +++++++++++++- include/uapi/linux/netfilter/nf_conntrack_common.h | 2 kernel/cgroup/cgroup-v1.c | 6 + kernel/cgroup/cgroup.c | 20 ++-- net/core/dev.c | 14 +++ net/core/ethtool.c | 15 --- net/core/rtnetlink.c | 10 +- net/ipv6/ip6_fib.c | 35 ++++---- net/ipv6/ip6_tunnel.c | 15 ++- net/mac80211/rx.c | 2 net/netfilter/nf_tables_api.c | 8 +- net/rds/rdma.c | 4 + net/sched/act_gact.c | 2 net/sched/act_mirred.c | 2 net/sctp/input.c | 28 ++++-- net/sctp/stream.c | 22 ++--- net/sctp/transport.c | 29 ++++-- net/tipc/group.c | 22 ++++- net/wireless/nl80211.c | 3 - 63 files changed, 568 insertions(+), 265 deletions(-)