Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor SPDX change conflict.

Signed-off-by: David S. Miller <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/global1_vtu.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
Simple merge

diff --cc drivers/net/vxlan.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/target/iscsi/cxgbit/cxgbit_ddp.c
Simple merge

diff --cc drivers/vhost/net.c
Simple merge

diff --cc include/linux/ieee80211.h
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

diff --cc include/net/mac80211.h
Simple merge

diff --cc kernel/bpf/cgroup.c
Simple merge

diff --cc kernel/bpf/lpm_trie.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/inet_connection_sock.c
Simple merge

diff --cc net/ipv4/netfilter/ipt_ECN.c
Simple merge

diff --cc net/ipv4/netfilter/nf_nat_h323.c
Simple merge

diff --cc net/ipv4/netfilter/nf_tproxy_ipv4.c
Simple merge

diff --cc net/ipv4/tcp_fastopen.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/ipv4/udp_offload.c
Simple merge

diff --cc net/ipv6/netfilter/nf_conntrack_reasm.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/mac80211/debugfs.c
Simple merge

diff --cc net/mac80211/debugfs_key.c
Simple merge

diff --cc net/mac80211/debugfs_netdev.c
Simple merge

diff --cc net/mac80211/debugfs_sta.c
Simple merge

diff --cc net/mac80211/key.c
Simple merge

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/offchannel.c
Simple merge

diff --cc net/mac80211/rate.c
Simple merge

diff --cc net/mac80211/rc80211_minstrel_ht.c
Simple merge

diff --cc net/mac80211/sta_info.c
index 315adb473e2c7da47b65ffa044d8493e3ef217e2,187f62a48b2b2307933b1950b18ec3e459e6f0d9..95eb8220e2e47def69ad381539330ec1d47bd599
--- 1/net/mac80211/sta_info.c
--- 2/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@@ -3,11 -4,7 +4,7 @@@
   * Copyright 2006-2007        Jiri Benc <[email protected]>
   * Copyright 2013-2014  Intel Mobile Communications GmbH
   * Copyright (C) 2015 - 2017 Intel Deutschland GmbH
 - * Copyright (C) 2018 Intel Corporation
 + * Copyright (C) 2018-2019 Intel Corporation
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License version 2 as
-  * published by the Free Software Foundation.
   */
  
  #include <linux/module.h>

diff --cc net/netfilter/nf_conntrack_proto_sctp.c
Simple merge

diff --cc net/netfilter/nf_nat_helper.c
Simple merge

diff --cc net/netfilter/nf_nat_proto.c
Simple merge

diff --cc net/netfilter/nf_nat_redirect.c
Simple merge

diff --cc net/netfilter/nf_nat_sip.c
Simple merge

diff --cc net/netfilter/nf_synproxy_core.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/netfilter/nfnetlink_queue.c
Simple merge

diff --cc net/netfilter/nft_exthdr.c
Simple merge

diff --cc net/netfilter/nft_payload.c
Simple merge

diff --cc net/netfilter/xt_DSCP.c
Simple merge

diff --cc net/netfilter/xt_HL.c
Simple merge

diff --cc net/netfilter/xt_TCPMSS.c
Simple merge

diff --cc net/netfilter/xt_TCPOPTSTRIP.c
Simple merge

diff --cc net/netfilter/xt_owner.c
Simple merge

diff --cc net/strparser/strparser.c
Simple merge

diff --cc net/tipc/link.c
Simple merge

diff --cc net/vmw_vsock/hyperv_transport.c
Simple merge

diff --cc samples/bpf/xdp_redirect_cpu_user.c
Simple merge

diff --cc security/selinux/nlmsgtab.c
Simple merge