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

Conflicts:
	drivers/net/phy/amd-xgbe-phy.c
	drivers/net/wireless/iwlwifi/Kconfig
	include/net/mac80211.h

iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.

The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/net/bpf_jit_comp.c
Simple merge

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

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
index 1c37f587426d7173eac3361219432b8761e33669,28425e5ea91f871670e84721bb865c1725472e80..2510fed3494ddda7bdad2e693e49cf878e9547aa
--- 1/drivers/net/ethernet/mellanox/mlx5/core/main.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@@ -458,77 -507,6 +458,74 @@@ static int mlx5_core_disable_hca(struc
        return 0;
  }
  
-       err = cpumask_set_cpu_local_first(i, numa_node, priv->irq_info[i].mask);
-       if (err) {
-               mlx5_core_warn(mdev, "cpumask_set_cpu_local_first failed");
-               goto err_clear_mask;
-       }
 +static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)
 +{
 +      struct mlx5_priv *priv  = &mdev->priv;
 +      struct msix_entry *msix = priv->msix_arr;
 +      int irq                 = msix[i + MLX5_EQ_VEC_COMP_BASE].vector;
 +      int numa_node           = dev_to_node(&mdev->pdev->dev);
 +      int err;
 +
 +      if (!zalloc_cpumask_var(&priv->irq_info[i].mask, GFP_KERNEL)) {
 +              mlx5_core_warn(mdev, "zalloc_cpumask_var failed");
 +              return -ENOMEM;
 +      }
 +
++      cpumask_set_cpu(cpumask_local_spread(i, numa_node),
++                      priv->irq_info[i].mask);
 +
 +      err = irq_set_affinity_hint(irq, priv->irq_info[i].mask);
 +      if (err) {
 +              mlx5_core_warn(mdev, "irq_set_affinity_hint failed,irq 0x%.4x",
 +                             irq);
 +              goto err_clear_mask;
 +      }
 +
 +      return 0;
 +
 +err_clear_mask:
 +      free_cpumask_var(priv->irq_info[i].mask);
 +      return err;
 +}
 +
 +static void mlx5_irq_clear_affinity_hint(struct mlx5_core_dev *mdev, int i)
 +{
 +      struct mlx5_priv *priv  = &mdev->priv;
 +      struct msix_entry *msix = priv->msix_arr;
 +      int irq                 = msix[i + MLX5_EQ_VEC_COMP_BASE].vector;
 +
 +      irq_set_affinity_hint(irq, NULL);
 +      free_cpumask_var(priv->irq_info[i].mask);
 +}
 +
 +static int mlx5_irq_set_affinity_hints(struct mlx5_core_dev *mdev)
 +{
 +      int err;
 +      int i;
 +
 +      for (i = 0; i < mdev->priv.eq_table.num_comp_vectors; i++) {
 +              err = mlx5_irq_set_affinity_hint(mdev, i);
 +              if (err)
 +                      goto err_out;
 +      }
 +
 +      return 0;
 +
 +err_out:
 +      for (i--; i >= 0; i--)
 +              mlx5_irq_clear_affinity_hint(mdev, i);
 +
 +      return err;
 +}
 +
 +static void mlx5_irq_clear_affinity_hints(struct mlx5_core_dev *mdev)
 +{
 +      int i;
 +
 +      for (i = 0; i < mdev->priv.eq_table.num_comp_vectors; i++)
 +              mlx5_irq_clear_affinity_hint(mdev, i);
 +}
 +
  int mlx5_vector2eqn(struct mlx5_core_dev *dev, int vector, int *eqn, int *irqn)
  {
        struct mlx5_eq_table *table = &dev->priv.eq_table;

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

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

diff --cc drivers/net/wireless/iwlwifi/Kconfig
index 99f9760fc11ea3950805f70e50525e162c3682dd,f89f446e5c8ae32b5dccc42cae6234ad75283ff8..aba095761ac669a99cc3553b1b2fb4d13f1a6574
--- 1/drivers/net/wireless/iwlwifi/Kconfig
--- 2/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@@ -21,7 -21,7 +21,8 @@@ config IWLWIF
                Intel 7260 Wi-Fi Adapter
                Intel 3160 Wi-Fi Adapter
                Intel 7265 Wi-Fi Adapter
 +              Intel 8260 Wi-Fi Adapter
+               Intel 3165 Wi-Fi Adapter
  
  
          This driver uses the kernel's mac80211 subsystem.

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

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

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

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

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

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge

diff --cc drivers/net/xen-netback/netback.c
Simple merge

diff --cc drivers/net/xen-netfront.c
Simple merge

diff --cc drivers/scsi/qla2xxx/tcm_qla2xxx.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target.c
Simple merge

diff --cc drivers/target/target_core_file.c
Simple merge

diff --cc drivers/target/target_core_pr.c
Simple merge

diff --cc drivers/target/target_core_transport.c
Simple merge

diff --cc drivers/target/target_core_user.c
Simple merge

diff --cc drivers/vhost/scsi.c
Simple merge

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

diff --cc net/bridge/netfilter/ebtables.c
Simple merge

diff --cc net/caif/caif_socket.c
Simple merge

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

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

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

diff --cc net/mac80211/ieee80211_i.h
Simple merge

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

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

diff --cc net/mac80211/key.h
Simple merge

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

diff --cc net/sched/sch_api.c
Simple merge

diff --cc net/unix/af_unix.c
index b8c44076c776c345eae2b0efd34f603ee758e0a7,06430598cf512fdaff480671620e8fa69c259bb5..f25e1675b865ac9b1823235705b7278cb914d346
--- 1/net/unix/af_unix.c
--- 2/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@@ -2055,8 -1943,11 +2059,12 @@@ static int unix_stream_read_generic(str
                struct sk_buff *skb, *last;
  
                unix_state_lock(sk);
+               if (sock_flag(sk, SOCK_DEAD)) {
+                       err = -ECONNRESET;
+                       goto unlock;
+               }
                last = skb = skb_peek(&sk->sk_receive_queue);
 +              last_len = last ? last->len : 0;
  again:
                if (skb == NULL) {
                        unix_sk(sk)->recursion_level = 0;

diff --cc net/xfrm/xfrm_input.c
Simple merge

diff --cc net/xfrm/xfrm_state.c
Simple merge