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

Pull networking updates from David Miller:
 "Highlights:

   - Gustavo A. R. Silva keeps working on the implicit switch fallthru
     changes.

   - Support 802.11ax High-Efficiency wireless in cfg80211 et al, From
     Luca Coelho.

   - Re-enable ASPM in r8169, from Kai-Heng Feng.

   - Add virtual XFRM interfaces, which avoids all of the limitations of
     existing IPSEC tunnels. From Steffen Klassert.

   - Convert GRO over to use a hash table, so that when we have many
     flows active we don't traverse a long list during accumluation.

   - Many new self tests for routing, TC, tunnels, etc. Too many
     contributors to mention them all, but I'm really happy to keep
     seeing this stuff.

   - Hardware timestamping support for dpaa_eth/fsl-fman from Yangbo Lu.

   - Lots of cleanups and fixes in L2TP code from Guillaume Nault.

   - Add IPSEC offload support to netdevsim, from Shannon Nelson.

   - Add support for slotting with non-uniform distribution to netem
     packet scheduler, from Yousuk Seung.

   - Add UDP GSO support to mlx5e, from Boris Pismenny.

   - Support offloading of Team LAG in NFP, from John Hurley.

   - Allow to configure TX queue selection based upon RX queue, from
     Amritha Nambiar.

   - Support ethtool ring size configuration in aquantia, from Anton
     Mikaev.

   - Support DSCP and flowlabel per-transport in SCTP, from Xin Long.

   - Support list based batching and stack traversal of SKBs, this is
     very exciting work. From Edward Cree.

   - Busyloop optimizations in vhost_net, from Toshiaki Makita.

   - Introduce the ETF qdisc, which allows time based transmissions. IGB
     can offload this in hardware. From Vinicius Costa Gomes.

   - Add parameter support to devlink, from Moshe Shemesh.

   - Several multiplication and division optimizations for BPF JIT in
     nfp driver, from Jiong Wang.

   - Lots of prepatory work to make more of the packet scheduler layer
     lockless, when possible, from Vlad Buslov.

   - Add ACK filter and NAT awareness to sch_cake packet scheduler, from
     Toke Høiland-Jørgensen.

   - Support regions and region snapshots in devlink, from Alex Vesker.

   - Allow to attach XDP programs to both HW and SW at the same time on
     a given device, with initial support in nfp. From Jakub Kicinski.

   - Add TLS RX offload and support in mlx5, from Ilya Lesokhin.

   - Use PHYLIB in r8169 driver, from Heiner Kallweit.

   - All sorts of changes to support Spectrum 2 in mlxsw driver, from
     Ido Schimmel.

   - PTP support in mv88e6xxx DSA driver, from Andrew Lunn.

   - Make TCP_USER_TIMEOUT socket option more accurate, from Jon
     Maxwell.

   - Support for templates in packet scheduler classifier, from Jiri
     Pirko.

   - IPV6 support in RDS, from Ka-Cheong Poon.

   - Native tproxy support in nf_tables, from Máté Eckl.

   - Maintain IP fragment queue in an rbtree, but optimize properly for
     in-order frags. From Peter Oskolkov.

   - Improvde handling of ACKs on hole repairs, from Yuchung Cheng"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1996 commits)
  bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT"
  hv/netvsc: Fix NULL dereference at single queue mode fallback
  net: filter: mark expected switch fall-through
  xen-netfront: fix warn message as irq device name has '/'
  cxgb4: Add new T5 PCI device ids 0x50af and 0x50b0
  net: dsa: mv88e6xxx: missing unlock on error path
  rds: fix building with IPV6=m
  inet/connection_sock: prefer _THIS_IP_ to current_text_addr
  net: dsa: mv88e6xxx: bitwise vs logical bug
  net: sock_diag: Fix spectre v1 gadget in __sock_diag_cmd()
  ieee802154: hwsim: using right kind of iteration
  net: hns3: Add vlan filter setting by ethtool command -K
  net: hns3: Set tx ring' tc info when netdev is up
  net: hns3: Remove tx ring BD len register in hns3_enet
  net: hns3: Fix desc num set to default when setting channel
  net: hns3: Fix for phy link issue when using marvell phy driver
  net: hns3: Fix for information of phydev lost problem when down/up
  net: hns3: Fix for command format parsing error in hclge_is_all_function_id_zero
  net: hns3: Add support for serdes loopback selftest
  bnxt_en: take coredump_record structure off stack
  ...

diff --cc Documentation/devicetree/bindings/net/can/xilinx_can.txt
index 9264d2f6a89d698aa28f90dd116266b5fc864800,ae5c07e96ad50b3d6e4829b9b5abd07cce701ab1..060e2d46bad961d870467f6e86482a1714b58e45
--- 1/Documentation/devicetree/bindings/net/can/xilinx_can.txt
--- 2/Documentation/devicetree/bindings/net/can/xilinx_can.txt
+++ b/Documentation/devicetree/bindings/net/can/xilinx_can.txt
@@@ -2,19 -2,26 +2,25 @@@ Xilinx Axi CAN/Zynq CANPS controller De
  ---------------------------------------------------------
  
  Required properties:
- - compatible          : Should be "xlnx,zynq-can-1.0" for Zynq CAN
-                         controllers and "xlnx,axi-can-1.00.a" for Axi CAN
-                         controllers.
- - reg                 : Physical base address and size of the Axi CAN/Zynq
-                         CANPS registers map.
+ - compatible          : Should be:
+                         - "xlnx,zynq-can-1.0" for Zynq CAN controllers
+                         - "xlnx,axi-can-1.00.a" for Axi CAN controllers
+                         - "xlnx,canfd-1.0" for CAN FD controllers
+ - reg                 : Physical base address and size of the controller
+                         registers map.
  - interrupts          : Property with a value describing the interrupt
                          number.
- - clock-names         : List of input clock names - "can_clk", "pclk"
-                         (For CANPS), "can_clk" , "s_axi_aclk"(For AXI CAN)
 -- interrupt-parent    : Must be core interrupt controller
+ - clock-names         : List of input clock names
+                         - "can_clk", "pclk" (For CANPS),
+                         - "can_clk", "s_axi_aclk" (For AXI CAN and CAN FD).
                          (See clock bindings for details).
  - clocks              : Clock phandles (see clock bindings for details).
- - tx-fifo-depth               : Can Tx fifo depth.
- - rx-fifo-depth               : Can Rx fifo depth.
+ - tx-fifo-depth               : Can Tx fifo depth (Zynq, Axi CAN).
+ - rx-fifo-depth               : Can Rx fifo depth (Zynq, Axi CAN, CAN FD in
+                           sequential Rx mode).
+ - tx-mailbox-count    : Can Tx mailbox buffer count (CAN FD).
+ - rx-mailbox-count    : Can Rx mailbox buffer count (CAN FD in mailbox Rx
+                         mode).
  
  
  Example:

diff --cc Documentation/devicetree/bindings/net/stmmac.txt
index 8bdb1c231d08b33d1c11395e239bdb9368321d05,7f1385c4643dcc1d5c9a8ef232c15e5a809d1765..cb694062afff0896ed6e67c2ee12c7a9826f91a9
--- 1/Documentation/devicetree/bindings/net/stmmac.txt
--- 2/Documentation/devicetree/bindings/net/stmmac.txt
+++ b/Documentation/devicetree/bindings/net/stmmac.txt
@@@ -1,9 -1,12 +1,10 @@@
- * STMicroelectronics 10/100/1000 Ethernet driver (GMAC)
+ * STMicroelectronics 10/100/1000/2500/10000 Ethernet (GMAC/XGMAC)
  
  Required properties:
- - compatible: Should be "snps,dwmac-<ip_version>", "snps,dwmac"
+ - compatible: Should be "snps,dwmac-<ip_version>", "snps,dwmac" or
+       "snps,dwxgmac-<ip_version>", "snps,dwxgmac".
        For backwards compatibility: "st,spear600-gmac" is also supported.
  - reg: Address and length of the register set for the device
 -- interrupt-parent: Should be the phandle for the interrupt controller
 -  that services interrupts for this device
  - interrupts: Should contain the STMMAC interrupts
  - interrupt-names: Should contain a list of interrupt names corresponding to
        the interrupts in the interrupts property, if available.

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc Documentation/index.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
Simple merge

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns/hns_enet.c
Simple merge

diff --cc fs/afs/rxrpc.c
Simple merge

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

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

diff --cc ipc/shm.c
Simple merge

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

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc net/socket.c
Simple merge

diff --cc samples/bpf/Makefile
index bd9f6c2a808e0c21f94863555a6b0ee54c8a569c,f88d5683d6ee611e16aa5b8d6cb23b3e4701ac15..36f9f41d094b2ac939cf68d0ef0ee65830f08dc6
--- 1/samples/bpf/Makefile
--- 2/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@@ -163,12 -165,13 +165,13 @@@ always += xdp_adjust_tail_kern.
  always += xdpsock_kern.o
  always += xdp_fwd_kern.o
  always += task_fd_query_kern.o
+ always += xdp_sample_pkts_kern.o
  
 -HOSTCFLAGS += -I$(objtree)/usr/include
 -HOSTCFLAGS += -I$(srctree)/tools/lib/
 -HOSTCFLAGS += -I$(srctree)/tools/testing/selftests/bpf/
 -HOSTCFLAGS += -I$(srctree)/tools/lib/ -I$(srctree)/tools/include
 -HOSTCFLAGS += -I$(srctree)/tools/perf
 +KBUILD_HOSTCFLAGS += -I$(objtree)/usr/include
 +KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/
 +KBUILD_HOSTCFLAGS += -I$(srctree)/tools/testing/selftests/bpf/
 +KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/ -I$(srctree)/tools/include
 +KBUILD_HOSTCFLAGS += -I$(srctree)/tools/perf
  
  HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable
  HOSTCFLAGS_trace_helpers.o += -I$(srctree)/tools/lib/bpf/
@@@ -179,13 -182,14 +182,14 @@@ HOSTCFLAGS_spintest_user.o += -I$(srctr
  HOSTCFLAGS_trace_event_user.o += -I$(srctree)/tools/lib/bpf/
  HOSTCFLAGS_sampleip_user.o += -I$(srctree)/tools/lib/bpf/
  HOSTCFLAGS_task_fd_query_user.o += -I$(srctree)/tools/lib/bpf/
+ HOSTCFLAGS_xdp_sample_pkts_user.o += -I$(srctree)/tools/lib/bpf/
  
 -HOST_LOADLIBES                += $(LIBBPF) -lelf
 -HOSTLOADLIBES_tracex4         += -lrt
 -HOSTLOADLIBES_trace_output    += -lrt
 -HOSTLOADLIBES_map_perf_test   += -lrt
 -HOSTLOADLIBES_test_overhead   += -lrt
 -HOSTLOADLIBES_xdpsock         += -pthread
 +KBUILD_HOSTLDLIBS             += $(LIBBPF) -lelf
 +HOSTLDLIBS_tracex4            += -lrt
 +HOSTLDLIBS_trace_output       += -lrt
 +HOSTLDLIBS_map_perf_test      += -lrt
 +HOSTLDLIBS_test_overhead      += -lrt
 +HOSTLDLIBS_xdpsock            += -pthread
  
  # Allows pointing LLC/CLANG to a LLVM backend with bpf support, redefine on cmdline:
  #  make samples/bpf/ LLC=~/git/llvm/build/bin/llc CLANG=~/git/llvm/build/bin/clang