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

Three conflicts, one of which, for marvell10g.c is non-trivial and
requires some follow-up from Heiner or someone else.

The issue is that Heiner converted the marvell10g driver over to
use the generic c45 code as much as possible.

However, in 'net' a bug fix appeared which makes sure that a new
local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0
is cleared.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc Documentation/networking/dsa/dsa.txt
Simple merge

diff --cc Documentation/networking/switchdev.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/atheros/atlx/atl2.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_xsk.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvneta.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/bpf/jit.c
Simple merge

diff --cc drivers/net/ipvlan/ipvlan_main.c
Simple merge

diff --cc drivers/net/phy/mdio_bus.c
Simple merge

diff --cc drivers/net/phy/realtek.c
Simple merge

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

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

diff --cc include/linux/virtio_net.h
index 6728bf581e981f25db28b2443e725916774f7320,e0348cb0a1dd7d2f3320e58a7ec1cc76e4a8799b..0d1fe9297ac67ad1043e6f3094aad9610a893d75
--- 1/include/linux/virtio_net.h
--- 2/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h
@@@ -61,10 -61,20 +61,20 @@@ static inline int virtio_net_hdr_to_skb
                /* gso packets without NEEDS_CSUM do not set transport_offset.
                 * probe and drop if does not match one of the above types.
                 */
-               if (gso_type) {
+               if (gso_type && skb->network_header) {
+                       if (!skb->protocol)
+                               virtio_net_hdr_set_proto(skb, hdr);
+ retry:
 -                      skb_probe_transport_header(skb, -1);
 +                      skb_probe_transport_header(skb);
-                       if (!skb_transport_header_was_set(skb))
+                       if (!skb_transport_header_was_set(skb)) {
+                               /* UFO does not specify ipv4 or 6: try both */
+                               if (gso_type & SKB_GSO_UDP &&
+                                   skb->protocol == htons(ETH_P_IP)) {
+                                       skb->protocol = htons(ETH_P_IPV6);
+                                       goto retry;
+                               }
                                return -EINVAL;
+                       }
                }
        }
  

diff --cc net/bpf/test_run.c
Simple merge

diff --cc net/bridge/br_multicast.c
Simple merge

diff --cc net/compat.c
Simple merge

diff --cc net/dsa/port.c
Simple merge

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

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

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

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

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

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

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

diff --cc net/xdp/xsk.c
Simple merge