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

Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

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

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/mips/net/bpf_jit.c
Simple merge

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

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/can/flexcan.c
index 2700865efcad5d73ab7ba244abdef3fe6917c395,6586309329e6130b9663bb3d3b6287e6d09f38c8..60f86bd0434af7cd93c394677809a3e60932d768
--- 1/drivers/net/can/flexcan.c
--- 2/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@@ -858,8 -823,9 +882,8 @@@ static int flexcan_chip_start(struct ne
  {
        struct flexcan_priv *priv = netdev_priv(dev);
        struct flexcan_regs __iomem *regs = priv->base;
--      int err;
 -      u32 reg_mcr, reg_ctrl;
 -      int i;
 +      u32 reg_mcr, reg_ctrl, reg_crl2, reg_mecr;
++      int err, i;
  
        /* enable module */
        err = flexcan_chip_enable(priv);

diff --cc drivers/net/ethernet/3com/3c59x.c
Simple merge

diff --cc drivers/net/ethernet/arc/emac_main.c
index dbea8472bfb47ab6293d2cb9277b342c15ccaff6,5919394d9f585f4c635b27dc985919b25d250646..abe1eabc017177ede3d1bdc7df6bec5a8ded86da
--- 1/drivers/net/ethernet/arc/emac_main.c
--- 2/drivers/net/ethernet/arc/emac_main.c
+++ b/drivers/net/ethernet/arc/emac_main.c
@@@ -26,7 -26,20 +26,18 @@@
  
  #include "emac.h"
  
 -#define DRV_NAME      "arc_emac"
 -#define DRV_VERSION   "1.0"
  
+ /**
+  * arc_emac_tx_avail - Return the number of available slots in the tx ring.
+  * @priv: Pointer to ARC EMAC private data structure.
+  *
+  * returns: the number of slots available for transmission in tx the ring.
+  */
+ static inline int arc_emac_tx_avail(struct arc_emac_priv *priv)
+ {
+       return (priv->txbd_dirty + TX_BD_NUM - priv->txbd_curr - 1) % TX_BD_NUM;
+ }
+ 
  /**
   * arc_emac_adjust_link - Adjust the PHY link duplex.
   * @ndev:     Pointer to the net_device structure.

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

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

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

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

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

diff --cc drivers/net/ethernet/sun/sunvnet.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
Simple merge

diff --cc drivers/net/usb/r8152.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
Simple merge

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/coex.c
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc include/linux/mlx4/device.h
Simple merge

diff --cc include/net/addrconf.h
index 9b1d42e66cca35b610f6fbb61de7e9dab3900b32,ec51e673b4b67bf762cd3e606709f34069ae1a55..d13573bb879e931628eb6b4b002f32ba11386b23
--- 1/include/net/addrconf.h
--- 2/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@@ -202,8 -202,9 +202,9 @@@ int ipv6_sock_ac_drop(struct sock *sk, 
                      const struct in6_addr *addr);
  void ipv6_sock_ac_close(struct sock *sk);
  
 -int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr);
 +int __ipv6_dev_ac_inc(struct inet6_dev *idev, const struct in6_addr *addr);
  int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr);
+ void ipv6_ac_destroy_dev(struct inet6_dev *idev);
  bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
                         const struct in6_addr *addr);
  bool ipv6_chk_acast_addr_src(struct net *net, struct net_device *dev,

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

diff --cc include/uapi/linux/Kbuild
Simple merge

diff --cc lib/rhashtable.c
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc net/socket.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge