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

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

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

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

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

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

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

diff --cc net/sctp/socket.c
Simple merge