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

Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/net/bpf_jit_32.c
Simple merge

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

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

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

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

diff --cc drivers/net/ethernet/intel/i40evf/i40e_adminq.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/port.c
index ae302614e74be279d028feaffc4982153bc9e266,3b9480fa3403dee018931c16b678f5ec6c98e913..a87e773e93f3439dbd4cf93bc08a9a7563f4977b
--- 1/drivers/net/ethernet/mellanox/mlx5/core/port.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/port.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c
@@@ -300,12 -308,15 +300,12 @@@ static int mlx5_query_port_pvlc(struct 
                                int pvlc_size,  u8 local_port)
  {
        u32 in[MLX5_ST_SZ_DW(pvlc_reg)];
 -      int err;
  
        memset(in, 0, sizeof(in));
-       MLX5_SET(ptys_reg, in, local_port, local_port);
+       MLX5_SET(pvlc_reg, in, local_port, local_port);
  
 -      err = mlx5_core_access_reg(dev, in, sizeof(in), pvlc,
 -                                 pvlc_size, MLX5_REG_PVLC, 0, 0);
 -
 -      return err;
 +      return mlx5_core_access_reg(dev, in, sizeof(in), pvlc,
 +                                  pvlc_size, MLX5_REG_PVLC, 0, 0);
  }
  
  int mlx5_query_port_vl_hw_cap(struct mlx5_core_dev *dev,

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

diff --cc drivers/net/ethernet/mellanox/mlxsw/item.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/pci.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/switchx2.c
Simple merge

diff --cc drivers/net/phy/Kconfig
Simple merge

diff --cc drivers/net/usb/Kconfig
Simple merge

diff --cc drivers/net/vxlan.c
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/hw.h
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/init.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-7000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/d3.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/fw.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mvm.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/ops.c
Simple merge

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

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

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

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

diff --cc net/bluetooth/hci_core.c
Simple merge

diff --cc net/bluetooth/hci_event.c
Simple merge

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

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

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

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

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

diff --cc net/ipv6/route.c
index 5fc1149fe91d85bb26c18ac5a74d1728146d8b78,968f31c01f89e8ccc6a4a13c056f8be3dcc0b7c6..d0619632723a298cf2374874b2f4fb03fa18640f
--- 1/net/ipv6/route.c
--- 2/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -1198,18 -1213,14 +1198,14 @@@ struct dst_entry *ip6_blackhole_route(s
  
        rt = dst_alloc(&ip6_dst_blackhole_ops, ort->dst.dev, 1, DST_OBSOLETE_NONE, 0);
        if (rt) {
-               new = &rt->dst;
- 
-               memset(new + 1, 0, sizeof(*rt) - sizeof(*new));
+               rt6_info_init(rt);
  
+               new = &rt->dst;
                new->__use = 1;
                new->input = dst_discard;
 -              new->output = dst_discard_sk;
 +              new->output = dst_discard_out;
  
-               if (dst_metrics_read_only(&ort->dst))
-                       new->_metrics = ort->dst._metrics;
-               else
-                       dst_copy_metrics(new, &ort->dst);
+               dst_copy_metrics(new, &ort->dst);
                rt->rt6i_idev = ort->rt6i_idev;
                if (rt->rt6i_idev)
                        in6_dev_hold(rt->rt6i_idev);

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

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

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

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

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

diff --cc net/openvswitch/flow.h
Simple merge

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

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

diff --cc net/switchdev/switchdev.c
index 73e3895175cf7e1951a5a168ba4eff5ef69349d2,77f5d17e261230a6db4f261445311eafb37c7b06..1eb76956b4390fef09825f38bda1f1b29a1ab352
--- 1/net/switchdev/switchdev.c
--- 2/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@@ -15,10 -15,8 +15,11 @@@
  #include <linux/mutex.h>
  #include <linux/notifier.h>
  #include <linux/netdevice.h>
 +#include <linux/etherdevice.h>
  #include <linux/if_bridge.h>
 +#include <linux/list.h>
 +#include <linux/workqueue.h>
+ #include <linux/if_vlan.h>
  #include <net/ip_fib.h>
  #include <net/switchdev.h>
  
@@@ -846,33 -635,32 +847,35 @@@ static int switchdev_port_br_afspec(str
                if (nla_len(attr) != sizeof(struct bridge_vlan_info))
                        return -EINVAL;
                vinfo = nla_data(attr);
 -              vlan->flags = vinfo->flags;
+               if (!vinfo->vid || vinfo->vid >= VLAN_VID_MASK)
+                       return -EINVAL;
 +              vlan.flags = vinfo->flags;
                if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) {
 -                      if (vlan->vid_begin)
 +                      if (vlan.vid_begin)
 +                              return -EINVAL;
 +                      vlan.vid_begin = vinfo->vid;
 +                      /* don't allow range of pvids */
 +                      if (vlan.flags & BRIDGE_VLAN_INFO_PVID)
                                return -EINVAL;
 -                      vlan->vid_begin = vinfo->vid;
                } else if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_END) {
 -                      if (!vlan->vid_begin)
 +                      if (!vlan.vid_begin)
                                return -EINVAL;
 -                      vlan->vid_end = vinfo->vid;
 -                      if (vlan->vid_end <= vlan->vid_begin)
 +                      vlan.vid_end = vinfo->vid;
 +                      if (vlan.vid_end <= vlan.vid_begin)
                                return -EINVAL;
 -                      err = f(dev, &obj);
 +                      err = f(dev, &vlan.obj);
                        if (err)
                                return err;
 -                      memset(vlan, 0, sizeof(*vlan));
 +                      memset(&vlan, 0, sizeof(vlan));
                } else {
 -                      if (vlan->vid_begin)
 +                      if (vlan.vid_begin)
                                return -EINVAL;
 -                      vlan->vid_begin = vinfo->vid;
 -                      vlan->vid_end = vinfo->vid;
 -                      err = f(dev, &obj);
 +                      vlan.vid_begin = vinfo->vid;
 +                      vlan.vid_end = vinfo->vid;
 +                      err = f(dev, &vlan.obj);
                        if (err)
                                return err;
 -                      memset(vlan, 0, sizeof(*vlan));
 +                      memset(&vlan, 0, sizeof(vlan));
                }
        }
  

diff --cc net/tipc/msg.h
Simple merge

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