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

Conflicts:
	include/linux/netdevice.h
	net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

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

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

diff --cc drivers/net/ethernet/marvell/mv643xx_eth.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/nic.c
Simple merge

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

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

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

diff --cc include/linux/netdevice.h
index 6d77e0f3cc102c3ef7f3d5fa0bec1f9c59f6b598,25f5d2d11e7c4c5b6053c4ba5c7ac17a601f4f2b..2e53b44454ad808332ffc67b2af9b9426ab3cff6
--- 1/include/linux/netdevice.h
--- 2/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -2273,11 -2264,12 +2273,11 @@@ static inline void netif_wake_subqueue(
  }
  
  #ifdef CONFIG_XPS
- int netif_set_xps_queue(struct net_device *dev, struct cpumask *mask,
 -extern int netif_set_xps_queue(struct net_device *dev,
 -                             const struct cpumask *mask,
 -                             u16 index);
++int netif_set_xps_queue(struct net_device *dev, const struct cpumask *mask,
 +                      u16 index);
  #else
  static inline int netif_set_xps_queue(struct net_device *dev,
-                                     struct cpumask *mask,
+                                     const struct cpumask *mask,
                                      u16 index)
  {
        return 0;

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

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

diff --cc net/core/sock.c
index 2bd9b3faa0d0ee1c970c1dcfbf4549e424f0078e,0b39e7ae43837e602ff473b641675fbf22b83b5c..fd6afa267475c660b546b4de5e6212e1d834ee8e
--- 1/net/core/sock.c
--- 2/net/core/sock.c
+++ b/net/core/sock.c
@@@ -2330,7 -2319,7 +2330,8 @@@ void sock_init_data(struct socket *sock
        sk->sk_ll_usec          =       sysctl_net_busy_read;
  #endif
  
 +      sk->sk_max_pacing_rate = ~0U;
+       sk->sk_pacing_rate = ~0U;
        /*
         * Before updating sk_refcnt, we must commit prior changes to memory
         * (Documentation/RCU/rculist_nulls.txt for details)

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

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