From: David S. Miller <davem@davemloft.net>
Date: Mon, 26 Aug 2013 20:37:08 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: next-20130912~156^2~186
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=b05930f5d1c7d5873cb050261d21789a99de9d48

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>
---

b05930f5d1c7d5873cb050261d21789a99de9d48
diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 126dec4342e6,00b88cbfde25..12202f81735c
--- a/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 include/uapi/linux/ip.h
index 6cf06bfd841b,2fee45bdec0a..411959405ab6
--- a/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 */