Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993423AbdFGMSDnh650/[email protected]> |
Author: Ralf Baechle <[email protected]> Wed Jun 7 12:27:45 2017 +0200 Commit: 8b03e4ebf05bd8550bda4385519d8625cb07b8e2 Gitweb: https://git.linux-mips.org/g/ralf/linux/8b03e4ebf05b Branch: master --- .../devicetree/bindings/net/dsa/marvell.txt | 4 Documentation/networking/dpaa.txt | 194 ++++++++++++++++++++ Documentation/networking/tcp.txt | 31 +-- MAINTAINERS | 6 - arch/arm/boot/dts/imx6ul-14x14-evk.dts | 6 + arch/sparc/Kconfig | 12 + arch/sparc/include/asm/mmu_64.h | 2 arch/sparc/include/asm/mmu_context_64.h | 32 --- arch/sparc/include/asm/pil.h | 1 arch/sparc/include/asm/vio.h | 1 arch/sparc/kernel/ds.c | 2 arch/sparc/kernel/irq_64.c | 17 +- arch/sparc/kernel/kernel.h | 1 arch/sparc/kernel/smp_64.c | 31 --- arch/sparc/kernel/tsb.S | 11 + arch/sparc/kernel/ttable_64.S | 2 arch/sparc/kernel/vio.c | 68 +++++++ arch/sparc/lib/Makefile | 1 arch/sparc/lib/multi3.S | 35 ++++ arch/sparc/mm/init_64.c | 89 ++++++--- arch/sparc/mm/tsb.c | 7 + arch/sparc/mm/ultra.S | 5 - drivers/isdn/i4l/isdn_ppp.c | 2 drivers/isdn/mISDN/stack.c | 2 drivers/media/Kconfig | 6 + drivers/media/Makefile | 4 drivers/media/cec/Kconfig | 14 - drivers/media/cec/Makefile | 2 drivers/media/cec/cec-adap.c | 2 drivers/media/cec/cec-core.c | 8 - drivers/media/i2c/Kconfig | 9 + drivers/media/platform/Kconfig | 10 + drivers/media/platform/vivid/Kconfig | 3 drivers/media/rc/rc-ir-raw.c | 13 + drivers/media/usb/pulse8-cec/Kconfig | 3 drivers/media/usb/rainshadow-cec/Kconfig | 3 drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 2 drivers/net/dsa/mv88e6xxx/global2.h | 6 - drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 5 - drivers/net/ethernet/broadcom/bcmsysport.c | 7 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 25 ++- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 9 + drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h | 6 - drivers/net/ethernet/ethoc.c | 3 drivers/net/ethernet/freescale/fsl_pq_mdio.c | 9 + drivers/net/ethernet/ibm/ibmvnic.c | 2 drivers/net/ethernet/intel/i40e/i40e_main.c | 36 ++-- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 3 drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 3 drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 5 - drivers/net/ethernet/mellanox/mlx4/mcg.c | 15 +- drivers/net/ethernet/mellanox/mlx4/qp.c | 19 ++ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 16 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 - drivers/net/ethernet/qlogic/qed/qed_main.c | 3 drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 26 ++- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2 drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 2 drivers/net/ethernet/qualcomm/emac/emac-mac.c | 2 drivers/net/ethernet/qualcomm/emac/emac-phy.c | 75 -------- drivers/net/ethernet/qualcomm/emac/emac.c | 22 -- drivers/net/ethernet/renesas/ravb_main.c | 24 +- drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c | 6 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 - drivers/net/geneve.c | 2 drivers/net/hamradio/hdlcdrv.c | 2 drivers/net/phy/marvell.c | 2 drivers/net/phy/mdio_bus.c | 13 + drivers/net/phy/micrel.c | 42 +++- drivers/net/phy/phy.c | 2 drivers/net/virtio_net.c | 5 - drivers/net/vxlan.c | 39 +++- drivers/net/wireless/ath/wcn36xx/main.c | 2 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 4 drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 4 drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 1 drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rs.h | 5 + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h | 3 drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 12 - drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 6 + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 32 ++- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 46 +---- drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 15 ++ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 26 ++- drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 2 drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 8 + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 12 + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 6 - drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 9 + drivers/staging/media/atomisp/i2c/Makefile | 2 drivers/staging/media/atomisp/i2c/imx/Makefile | 2 drivers/staging/media/atomisp/i2c/ov5693/Makefile | 2 .../staging/media/atomisp/pci/atomisp2/Makefile | 2 include/linux/compiler-clang.h | 7 + include/linux/mlx4/qp.h | 1 include/media/cec-notifier.h | 2 include/media/cec.h | 4 include/net/ipv6.h | 1 include/net/tcp.h | 2 net/bridge/br_netlink.c | 2 net/bridge/br_stp_if.c | 3 net/core/devlink.c | 8 + net/core/skbuff.c | 5 - net/dsa/dsa.c | 47 +++++ net/dsa/dsa2.c | 4 net/dsa/legacy.c | 47 ----- net/ipv4/af_inet.c | 2 net/ipv4/tcp.c | 6 - net/ipv4/tcp_cong.c | 1 net/ipv6/calipso.c | 6 + net/ipv6/ip6_offload.c | 4 net/ipv6/ip6_tunnel.c | 3 net/ipv6/ping.c | 2 net/ipv6/raw.c | 2 net/ipv6/xfrm6_mode_ro.c | 2 net/ipv6/xfrm6_mode_transport.c | 2 net/mac80211/agg-tx.c | 128 +++++-------- net/mac80211/ht.c | 16 +- net/mac80211/ieee80211_i.h | 14 - net/mac80211/iface.c | 11 - net/mac80211/sta_info.c | 2 net/mac80211/sta_info.h | 2 net/mpls/af_mpls.c | 2 net/netfilter/nf_conntrack_netlink.c | 7 + net/netfilter/nf_conntrack_proto_sctp.c | 9 + net/netfilter/nf_nat_core.c | 2 net/netfilter/nft_set_rbtree.c | 22 +- net/netlink/af_netlink.c | 4 133 files changed, 1034 insertions(+), 650 deletions(-)