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

# Conflicts:
#	drivers/net/virtio_net.c
#	net/core/devlink.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c
Simple merge

diff --cc drivers/net/ethernet/neterion/vxge/vxge-config.c
Simple merge

diff --cc drivers/net/ethernet/smsc/smc91x.c
Simple merge

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

diff --cc drivers/net/virtio_net.c
index fa407eb8b457a6c33000e4e142edc263928feede,ed969b65126ea57f60ae4ec7f3b7553fe73114f2..f8f5b8646a4312a62646d7c0a0e841fec0408d8c
--- 1/drivers/net/virtio_net.c
--- 2/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -398,16 -398,25 +398,28 @@@ static struct sk_buff *page_to_skb(stru
        else
                hdr_padded_len = sizeof(struct padded_vnet_hdr);
  
-       /* If headroom is not 0, there is an offset between the beginning of the
+       /* If whole_page, there is an offset between the beginning of the
         * data and the allocated space, otherwise the data and the allocated
         * space are aligned.
 +       *
 +       * Buffers with headroom use PAGE_SIZE as alloc size, see
 +       * add_recvbuf_mergeable() + get_mergeable_buf_len()
         */
-       truesize = headroom ? PAGE_SIZE : truesize;
-       tailroom = truesize - len - headroom;
-       buf = p - headroom;
+       if (whole_page) {
+               /* Buffers with whole_page use PAGE_SIZE as alloc size,
+                * see add_recvbuf_mergeable() + get_mergeable_buf_len()
+                */
+               truesize = PAGE_SIZE;
+ 
+               /* page maybe head page, so we should get the buf by p, not the
+                * page
+                */
+               tailroom = truesize - len - offset_in_page(p);
+               buf = (char *)((unsigned long)p & PAGE_MASK);
+       } else {
+               tailroom = truesize - len;
+               buf = p;
+       }
  
        len -= hdr_len;
        offset += hdr_padded_len;

diff --cc include/net/netfilter/nf_tables.h
Simple merge

diff --cc net/9p/trans_virtio.c
Simple merge

diff --cc net/core/devlink.c
index 051432ea4f69ed1e84f08f50feb62e0ff80f3af5,464f564082475b266411e5ea0309f24a83b4d100..1e953b77a77a99956139dd1d65a18fe0e4766b3d
--- 1/net/core/devlink.c
--- 2/net/core/devlink.c
+++ b/net/core/devlink.c
@@@ -8630,12 -9289,11 +9288,10 @@@ static int __devlink_port_phys_port_nam
  
        switch (attrs->flavour) {
        case DEVLINK_PORT_FLAVOUR_PHYSICAL:
-               if (!attrs->split)
-                       n = snprintf(name, len, "p%u", attrs->phys.port_number);
-               else
-                       n = snprintf(name, len, "p%us%u",
-                                    attrs->phys.port_number,
-                                    attrs->phys.split_subport_number);
 -      case DEVLINK_PORT_FLAVOUR_VIRTUAL:
+               n = snprintf(name, len, "p%u", attrs->phys.port_number);
+               if (n < len && attrs->split)
+                       n += snprintf(name + n, len - n, "s%u",
+                                     attrs->phys.split_subport_number);
                break;
        case DEVLINK_PORT_FLAVOUR_CPU:
        case DEVLINK_PORT_FLAVOUR_DSA:

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

diff --cc net/mptcp/subflow.c
Simple merge

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

diff --cc net/packet/af_packet.c
Simple merge