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

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 126dec4342e663de4d0d21fd99f25745bc3fa544,00b88cbfde25c41bdad32491eb7ab24edfb8c00d..12202f81735cc944a7072f6d50a74580fce04eed
--- 1/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
--- 2/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@@ -1331,8 -1331,10 +1331,10 @@@ enum 
        BNX2X_SP_RTNL_ENABLE_SRIOV,
        BNX2X_SP_RTNL_VFPF_MCAST,
        BNX2X_SP_RTNL_VFPF_CHANNEL_DOWN,
 -      BNX2X_SP_RTNL_VFPF_STORM_RX_MODE,
 +      BNX2X_SP_RTNL_RX_MODE,
        BNX2X_SP_RTNL_HYPERVISOR_VLAN,
+       BNX2X_SP_RTNL_TX_STOP,
+       BNX2X_SP_RTNL_TX_RESUME,
  };
  
  struct bnx2x_prev_path_list {

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/emulex/benet/be_main.c
Simple merge

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

diff --cc drivers/net/macvtap.c
Simple merge

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

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

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

diff --cc include/linux/ipv6.h
Simple merge

diff --cc include/uapi/linux/ip.h
index 6cf06bfd841bc5e7c77df6cd32456309ff460d46,2fee45bdec0ab5dbaf50503c00851cf798363c7c..411959405ab6ed278d2a963c5931b546cff2dc2e
--- 1/include/uapi/linux/ip.h
--- 2/include/uapi/linux/ip.h
+++ b/include/uapi/linux/ip.h
@@@ -133,4 -133,38 +133,40 @@@ struct ip_beet_phdr 
        __u8 reserved;
  };
  
+ /* index values for the variables in ipv4_devconf */
+ enum
+ {
+       IPV4_DEVCONF_FORWARDING=1,
+       IPV4_DEVCONF_MC_FORWARDING,
+       IPV4_DEVCONF_PROXY_ARP,
+       IPV4_DEVCONF_ACCEPT_REDIRECTS,
+       IPV4_DEVCONF_SECURE_REDIRECTS,
+       IPV4_DEVCONF_SEND_REDIRECTS,
+       IPV4_DEVCONF_SHARED_MEDIA,
+       IPV4_DEVCONF_RP_FILTER,
+       IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE,
+       IPV4_DEVCONF_BOOTP_RELAY,
+       IPV4_DEVCONF_LOG_MARTIANS,
+       IPV4_DEVCONF_TAG,
+       IPV4_DEVCONF_ARPFILTER,
+       IPV4_DEVCONF_MEDIUM_ID,
+       IPV4_DEVCONF_NOXFRM,
+       IPV4_DEVCONF_NOPOLICY,
+       IPV4_DEVCONF_FORCE_IGMP_VERSION,
+       IPV4_DEVCONF_ARP_ANNOUNCE,
+       IPV4_DEVCONF_ARP_IGNORE,
+       IPV4_DEVCONF_PROMOTE_SECONDARIES,
+       IPV4_DEVCONF_ARP_ACCEPT,
+       IPV4_DEVCONF_ARP_NOTIFY,
+       IPV4_DEVCONF_ACCEPT_LOCAL,
+       IPV4_DEVCONF_SRC_VMARK,
+       IPV4_DEVCONF_PROXY_ARP_PVLAN,
+       IPV4_DEVCONF_ROUTE_LOCALNET,
++      IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL,
++      IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL,
+       __IPV4_DEVCONF_MAX
+ };
+ 
+ #define IPV4_DEVCONF_MAX (__IPV4_DEVCONF_MAX - 1)
+ 
  #endif /* _UAPI_LINUX_IP_H */

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

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

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

diff --cc net/packet/af_packet.c
Simple merge

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