Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 22 Jun 2019 12:59:24 +0000 (08:59 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 22 Jun 2019 12:59:24 +0000 (08:59 -0400)
commit92ad6325cb891bb455487bfe90cc47d18aa6ec37
tree433a7ef938fae69789216043f67eff9f9c6b0c68
parente0effb5fbd56a8b2b8917611cbf4fcd9aba92b8f
parentc356dc4b540edd6c02b409dd8cf3208ba2804c38
Merge git://git./linux/kernel/git/davem/net

Minor SPDX change conflict.

Signed-off-by: David S. Miller <davem@davemloft.net>
55 files changed:
MAINTAINERS
drivers/net/dsa/mv88e6xxx/global1_vtu.c
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
drivers/net/vxlan.c
drivers/net/wireless/mac80211_hwsim.c
drivers/target/iscsi/cxgbit/cxgbit_ddp.c
drivers/vhost/net.c
include/linux/ieee80211.h
include/net/cfg80211.h
include/net/mac80211.h
kernel/bpf/cgroup.c
kernel/bpf/lpm_trie.c
net/core/sock.c
net/ipv4/inet_connection_sock.c
net/ipv4/netfilter/ipt_ECN.c
net/ipv4/netfilter/nf_nat_h323.c
net/ipv4/netfilter/nf_tproxy_ipv4.c
net/ipv4/tcp_fastopen.c
net/ipv4/tcp_output.c
net/ipv4/udp_offload.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/ipv6/route.c
net/mac80211/debugfs.c
net/mac80211/debugfs_key.c
net/mac80211/debugfs_netdev.c
net/mac80211/debugfs_sta.c
net/mac80211/key.c
net/mac80211/main.c
net/mac80211/mlme.c
net/mac80211/offchannel.c
net/mac80211/rate.c
net/mac80211/rc80211_minstrel_ht.c
net/mac80211/sta_info.c
net/netfilter/nf_conntrack_proto_sctp.c
net/netfilter/nf_nat_helper.c
net/netfilter/nf_nat_proto.c
net/netfilter/nf_nat_redirect.c
net/netfilter/nf_nat_sip.c
net/netfilter/nf_synproxy_core.c
net/netfilter/nf_tables_api.c
net/netfilter/nfnetlink_queue.c
net/netfilter/nft_exthdr.c
net/netfilter/nft_payload.c
net/netfilter/xt_DSCP.c
net/netfilter/xt_HL.c
net/netfilter/xt_TCPMSS.c
net/netfilter/xt_TCPOPTSTRIP.c
net/netfilter/xt_owner.c
net/strparser/strparser.c
net/tipc/link.c
net/vmw_vsock/hyperv_transport.c
samples/bpf/xdp_redirect_cpu_user.c
security/selinux/nlmsgtab.c