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

Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/can/at91_can.c
Simple merge

diff --cc drivers/net/can/flexcan.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 5fb18cd,c5e375d..4e01c57
--- 1/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
--- 2/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@@ -2494,5 -2492,15 +2495,9 @@@ enum 
  
  #define NUM_MACS      8
  
 -enum bnx2x_pci_bus_speed {
 -      BNX2X_PCI_LINK_SPEED_2500 = 2500,
 -      BNX2X_PCI_LINK_SPEED_5000 = 5000,
 -      BNX2X_PCI_LINK_SPEED_8000 = 8000
 -};
 -
  void bnx2x_set_local_cmng(struct bnx2x *bp);
+ 
+ #define MCPR_SCRATCH_BASE(bp) \
+       (CHIP_IS_E1x(bp) ? MCP_REG_MCPR_SCRATCH : MCP_A_REG_MCPR_SCRATCH)
+ 
  #endif /* bnx2x.h */

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

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

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

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

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
index 58dc89a,28757df..9199adf
--- 1/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
--- 2/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
@@@ -1020,14 -980,17 +1020,14 @@@ static int bnx2x_copy32_vf_dmae(struct 
        dmae.len = len32;
  
        /* issue the command and wait for completion */
-       return bnx2x_issue_dmae_with_comp(bp, &dmae);
+       return bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp));
  }
  
 -static void bnx2x_vf_mbx_resp(struct bnx2x *bp, struct bnx2x_virtf *vf)
 +static void bnx2x_vf_mbx_resp_single_tlv(struct bnx2x *bp,
 +                                       struct bnx2x_virtf *vf)
  {
        struct bnx2x_vf_mbx *mbx = BP_VF_MBX(bp, vf->index);
 -      u64 vf_addr;
 -      dma_addr_t pf_addr;
        u16 length, type;
 -      int rc;
 -      struct pfvf_general_resp_tlv *resp = &mbx->msg->resp.general_resp;
  
        /* prepare response */
        type = mbx->first_tlv.tl.type;

diff --cc drivers/net/ethernet/davicom/dm9000.c
Simple merge

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

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
Simple merge

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

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

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

diff --cc drivers/net/hamradio/yam.c
Simple merge

diff --cc drivers/net/usb/qmi_wwan.c
index d03b6b6,818ce90..e0a4a2b
--- 1/drivers/net/usb/qmi_wwan.c
--- 2/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@@ -729,7 -714,7 +729,8 @@@ static const struct usb_device_id produ
        {QMI_FIXED_INTF(0x2357, 0x0201, 4)},    /* TP-LINK HSUPA Modem MA180 */
        {QMI_FIXED_INTF(0x2357, 0x9000, 4)},    /* TP-LINK MA260 */
        {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)},    /* Telit LE920 */
 +      {QMI_FIXED_INTF(0x1bc7, 0x1201, 2)},    /* Telit LE920 */
+       {QMI_FIXED_INTF(0x0b3c, 0xc005, 6)},    /* Olivetti Olicard 200 */
        {QMI_FIXED_INTF(0x1e2d, 0x0060, 4)},    /* Cinterion PLxx */
  
        /* 4. Gobi 1000 devices */

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

diff --cc drivers/net/wireless/cw1200/cw1200_spi.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/join.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
Simple merge

diff --cc include/net/dst.h
index 211dcf1,3c4c944..44995c1
--- 1/include/net/dst.h
--- 2/include/net/dst.h
+++ b/include/net/dst.h
@@@ -478,10 -479,22 +478,22 @@@ static inline struct dst_entry *xfrm_lo
  {
        return dst_orig;
  } 
+ 
+ static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst)
+ {
+       return NULL;
+ }
+ 
  #else
 -extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig,
 -                                   const struct flowi *fl, struct sock *sk,
 -                                   int flags);
 +struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig,
 +                            const struct flowi *fl, struct sock *sk,
 +                            int flags);
+ 
+ /* skb attached with this dst needs transformation if dst->xfrm is valid */
+ static inline struct xfrm_state *dst_xfrm(const struct dst_entry *dst)
+ {
+       return dst->xfrm;
+ }
  #endif
  
  #endif /* _NET_DST_H */

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

diff --cc init/main.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

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

diff --cc net/bridge/br_private.h
Simple merge

diff --cc net/core/secure_seq.c
index 90e8a82,8d9d05e..897da56
--- 1/net/core/secure_seq.c
--- 2/net/core/secure_seq.c
+++ b/net/core/secure_seq.c
@@@ -15,10 -15,22 +16,11 @@@
  
  static u32 net_secret[NET_SECRET_SIZE] ____cacheline_aligned;
  
 -static void net_secret_init(void)
 +static __always_inline void net_secret_init(void)
  {
 -      u32 tmp;
 -      int i;
 -
 -      if (likely(net_secret[0]))
 -              return;
 -
 -      for (i = NET_SECRET_SIZE; i > 0;) {
 -              do {
 -                      get_random_bytes(&tmp, sizeof(tmp));
 -              } while (!tmp);
 -              cmpxchg(&net_secret[--i], 0, tmp);
 -      }
 +      net_get_random_once(net_secret, sizeof(net_secret));
  }
+ #endif
  
  #ifdef CONFIG_INET
  static u32 seq_scale(u32 seq)

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

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

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

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

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

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

diff --cc net/l2tp/l2tp_ppp.c
Simple merge

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

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

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

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

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

diff --cc net/wireless/core.h
Simple merge

diff --cc security/selinux/hooks.c
Simple merge