Merge remote-tracking branch 'net/master' into afs-next

2026-10-14 05:55:17 +00:00 · 2019-09-02 11:43:44 +01:00 · 2019-09-02 11:43:44 +01:00 · f16180739c
commit f16180739c
parent 9f159ae07f e1e54ec7fb
89 changed files with 761 additions and 487 deletions
--- a/Documentation/devicetree/bindings/net/dsa/ksz.txt
+++ b/Documentation/devicetree/bindings/net/dsa/ksz.txt
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
--- a/drivers/net/dsa/microchip/ksz9477_spi.c
+++ b/drivers/net/dsa/microchip/ksz9477_spi.c
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
--- a/drivers/net/ethernet/aquantia/atlantic/aq_filters.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_filters.c
--- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
--- a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
--- a/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_ptp.c
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
--- a/drivers/net/ethernet/netronome/nfp/bpf/jit.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/jit.c
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
--- a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
--- a/drivers/net/ethernet/seeq/sgiseeq.c
+++ b/drivers/net/ethernet/seeq/sgiseeq.c
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
--- a/include/net/psample.h
+++ b/include/net/psample.h
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
--- a/net/batman-adv/bat_v_ogm.c
+++ b/net/batman-adv/bat_v_ogm.c
--- a/net/bridge/netfilter/nft_meta_bridge.c
+++ b/net/bridge/netfilter/nft_meta_bridge.c
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
--- a/net/dsa/tag_8021q.c
+++ b/net/dsa/tag_8021q.c
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
--- a/net/netfilter/nf_flow_table_ip.c
+++ b/net/netfilter/nf_flow_table_ip.c
--- a/net/netfilter/xt_physdev.c
+++ b/net/netfilter/xt_physdev.c
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
--- a/net/psample/psample.c
+++ b/net/psample/psample.c
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
--- a/net/rxrpc/call_event.c
+++ b/net/rxrpc/call_event.c
--- a/net/rxrpc/call_object.c
+++ b/net/rxrpc/call_object.c
--- a/net/rxrpc/conn_client.c
+++ b/net/rxrpc/conn_client.c
--- a/net/rxrpc/conn_event.c
+++ b/net/rxrpc/conn_event.c
--- a/net/rxrpc/conn_object.c
+++ b/net/rxrpc/conn_object.c
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
--- a/net/rxrpc/local_event.c
+++ b/net/rxrpc/local_event.c
--- a/net/rxrpc/local_object.c
+++ b/net/rxrpc/local_object.c
--- a/net/rxrpc/output.c
+++ b/net/rxrpc/output.c
--- a/net/rxrpc/peer_event.c
+++ b/net/rxrpc/peer_event.c
--- a/net/rxrpc/protocol.h
+++ b/net/rxrpc/protocol.h
--- a/net/rxrpc/recvmsg.c
+++ b/net/rxrpc/recvmsg.c
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
--- a/net/rxrpc/sendmsg.c
+++ b/net/rxrpc/sendmsg.c
--- a/net/rxrpc/skbuff.c
+++ b/net/rxrpc/skbuff.c
--- a/net/sched/act_bpf.c
+++ b/net/sched/act_bpf.c
--- a/net/sched/act_connmark.c
+++ b/net/sched/act_connmark.c
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
--- a/net/sched/act_ct.c
+++ b/net/sched/act_ct.c
--- a/net/sched/act_ctinfo.c
+++ b/net/sched/act_ctinfo.c
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
--- a/net/sched/act_mpls.c
+++ b/net/sched/act_mpls.c
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
--- a/net/sched/act_sample.c
+++ b/net/sched/act_sample.c
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
--- a/net/sched/act_skbmod.c
+++ b/net/sched/act_skbmod.c
--- a/net/sched/act_tunnel_key.c
+++ b/net/sched/act_tunnel_key.c
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c
--- a/net/sched/sch_cbs.c
+++ b/net/sched/sch_cbs.c
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
--- a/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
+++ b/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py