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

Minor overlapping changes in net/ipv4/ipmr.c, in 'net' we were
fixing the "BH-ness" of the counter bumps whilst in 'net-next'
the functions were modified to take an explicit 'net' parameter.

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

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

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

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

diff --cc drivers/net/ethernet/sfc/ef10.c
Simple merge

diff --cc drivers/net/ethernet/sfc/net_driver.h
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

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

diff --cc include/net/ip_fib.h
index ac5c6e80586a446946e20b27ab1e0f78d5b94fc3,965fa5b1a274e539bd998aeaf9df160a82c876b4..9f4df68105ab28eecdeb9d799a83910b73142a06
--- 1/include/net/ip_fib.h
--- 2/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@@ -317,20 -317,10 +317,20 @@@ void fib_flush_external(struct net *net
  
  /* Exported by fib_semantics.c */
  int ip_fib_check_default(__be32 gw, struct net_device *dev);
- int fib_sync_down_dev(struct net_device *dev, unsigned long event);
+ int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force);
  int fib_sync_down_addr(struct net *net, __be32 local);
  int fib_sync_up(struct net_device *dev, unsigned int nh_flags);
 -void fib_select_multipath(struct fib_result *res);
 +
 +extern u32 fib_multipath_secret __read_mostly;
 +
 +static inline int fib_multipath_hash(__be32 saddr, __be32 daddr)
 +{
 +      return jhash_2words(saddr, daddr, fib_multipath_secret) >> 1;
 +}
 +
 +void fib_select_multipath(struct fib_result *res, int hash);
 +void fib_select_path(struct net *net, struct fib_result *res,
 +                   struct flowi4 *fl4, int mp_hash);
  
  /* Exported by fib_trie.c */
  void fib_trie_init(void);

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

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

diff --cc net/ipv4/ipmr.c
index fc42525d86943a384d1f8d052d7649b69ba401b4,8e8203d5c520aa01814cd41219019df076632767..92dd4b74d513ab40ba4f6f3f2f5ce7a73085f379
--- 1/net/ipv4/ipmr.c
--- 2/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@@ -1683,8 -1682,8 +1683,8 @@@ static inline int ipmr_forward_finish(s
  {
        struct ip_options *opt = &(IPCB(skb)->opt);
  
-       IP_INC_STATS_BH(net, IPSTATS_MIB_OUTFORWDATAGRAMS);
-       IP_ADD_STATS_BH(net, IPSTATS_MIB_OUTOCTETS, skb->len);
 -      IP_INC_STATS(dev_net(skb_dst(skb)->dev), IPSTATS_MIB_OUTFORWDATAGRAMS);
 -      IP_ADD_STATS(dev_net(skb_dst(skb)->dev), IPSTATS_MIB_OUTOCTETS, skb->len);
++      IP_INC_STATS(net, IPSTATS_MIB_OUTFORWDATAGRAMS);
++      IP_ADD_STATS(net, IPSTATS_MIB_OUTOCTETS, skb->len);
  
        if (unlikely(opt->optlen))
                ip_forward_options(skb);
@@@ -1746,7 -1745,7 +1746,7 @@@ static void ipmr_queue_xmit(struct net 
                 * to blackhole.
                 */
  
-               IP_INC_STATS_BH(net, IPSTATS_MIB_FRAGFAILS);
 -              IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGFAILS);
++              IP_INC_STATS(net, IPSTATS_MIB_FRAGFAILS);
                ip_rt_put(rt);
                goto out_free;
        }

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

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