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

Minor comment merge conflict in mlx5.

Staging driver has a fixup due to the skb->xmit_more changes
in 'net-next', but was removed in 'net'.

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

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/net/ethernet/intel/fm10k/fm10k_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
index b0ce68feb0f33eafe746ab5993e4d62362a7f06f,4ab0d030b54486f67096a190471a747b1ac18c56..633b117eb13e81437c402d4ed05efd892bf68eb1
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
@@@ -165,25 -167,25 +167,25 @@@ static int update_xoff_threshold(struc
  }
  
  /**
 - * update_buffer_lossy()
 - *   max_mtu: netdev's max_mtu
 - *   pfc_en: <input> current pfc configuration
 - *   buffer: <input> current prio to buffer mapping
 - *   xoff:   <input> xoff value
 - *   port_buffer: <output> port receive buffer configuration
 - *   change: <output>
 + *    update_buffer_lossy     - Update buffer configuration based on pfc
-  *    @mtu: device's MTU
++ *    @max_mtu: netdev's max_mtu
 + *    @pfc_en: <input> current pfc configuration
 + *    @buffer: <input> current prio to buffer mapping
 + *    @xoff:   <input> xoff value
 + *    @port_buffer: <output> port receive buffer configuration
 + *    @change: <output>
   *
 - *   Update buffer configuration based on pfc configuraiton and priority
 - *   to buffer mapping.
 - *   Buffer's lossy bit is changed to:
 - *     lossless if there is at least one PFC enabled priority mapped to this buffer
 - *     lossy if all priorities mapped to this buffer are PFC disabled
 + *    Update buffer configuration based on pfc configuraiton and
 + *    priority to buffer mapping.
 + *    Buffer's lossy bit is changed to:
 + *            lossless if there is at least one PFC enabled priority
 + *            mapped to this buffer lossy if all priorities mapped to
 + *            this buffer are PFC disabled
   *
 - *   Return:
 - *     Return 0 if no error.
 - *     Set change to true if buffer configuration is modified.
 + *    @return: 0 if no error,
 + *    sets change to true if buffer configuration was modified.
   */
- static int update_buffer_lossy(unsigned int mtu,
+ static int update_buffer_lossy(unsigned int max_mtu,
                               u8 pfc_en, u8 *buffer, u32 xoff,
                               struct mlx5e_port_buffer *port_buffer,
                               bool *change)

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

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

diff --cc drivers/net/ethernet/netronome/nfp/flower/action.c
Simple merge

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

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

diff --cc drivers/net/hyperv/netvsc.c
Simple merge

diff --cc drivers/net/hyperv/netvsc_drv.c
Simple merge

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

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

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

diff --cc net/batman-adv/bat_v_elp.c
Simple merge

diff --cc net/batman-adv/bridge_loop_avoidance.c
Simple merge

diff --cc net/batman-adv/sysfs.c
Simple merge

diff --cc net/batman-adv/translation-table.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc net/openvswitch/flow_netlink.c
Simple merge

diff --cc net/tls/tls_sw.c
Simple merge