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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/include/asm/Kbuild
Simple merge

diff --cc arch/xtensa/include/asm/Kbuild
Simple merge

diff --cc drivers/net/can/mscan/mpc5xxx_can.c
Simple merge

diff --cc drivers/net/ethernet/8390/hydra.c
Simple merge

diff --cc drivers/net/ethernet/8390/zorro8390.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmveth.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
Simple merge

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

diff --cc include/uapi/linux/pci_regs.h
Simple merge

diff --cc net/ipv6/ip6_vti.c
index 7b42d5ef868deaa193094a85a00b502aeaba0bdd,b50acd5e75d25349001ea0eb475ba5bce7e628bb..ac7449df7640250ce01dd46c4b954e512793df30
--- 1/net/ipv6/ip6_vti.c
--- 2/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@@ -736,14 -734,9 +735,14 @@@ static inline int vti6_dev_init_gen(str
  
        t->dev = dev;
        t->net = dev_net(dev);
-       dev->tstats = alloc_percpu(struct pcpu_tstats);
+       dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
        if (!dev->tstats)
                return -ENOMEM;
 +      for_each_possible_cpu(i) {
 +              struct pcpu_tstats *stats;
 +              stats = per_cpu_ptr(dev->tstats, i);
 +              u64_stats_init(&stats->syncp);
 +      }
        return 0;
  }
  

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

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

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