David S. Miller 188d1f76d0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/ethtool.c drivers/net/vmxnet3/vmxnet3_drv.c drivers/net/wireless/iwlwifi/dvm/tx.c net/ipv6/route.c The ipv6 route.c conflict is simple, just ignore the 'net' side change as we fixed the same problem in 'net-next' by eliminating cached neighbours from ipv6 routes. The e1000e conflict is an addition of a new statistic in the ethtool code, trivial. The vmxnet3 conflict is about one change in 'net' removing a guarding conditional, whilst in 'net-next' we had a netdev_info() conversion. The iwlwifi conflict is dealing with a WARN_ON() conversion in 'net-next' vs. a revert happening in 'net'. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-02-05 14:12:20 -05:00
..
netfilter	net: remove redundant check for timer pending state before del_timer	2013-02-04 13:26:49 -05:00
af_inet.c	net: fix possible wrong checksum generation	2013-01-28 00:27:15 -05:00
ah4.c	xfrm4: Invalidate all ipv4 routes on IPsec pmtu events	2013-01-21 12:43:54 +01:00
arp.c	arp: fix a regression in arp_solicit()	2012-12-24 18:42:58 -08:00
cipso_ipv4.c
datagram.c	ipv4: Add a socket release callback for datagram sockets	2013-01-21 14:17:05 -05:00
devinet.c	ipv4: introduce address lifetime	2013-01-29 13:59:57 -05:00
esp4.c	xfrm4: Invalidate all ipv4 routes on IPsec pmtu events	2013-01-21 12:43:54 +01:00
fib_frontend.c	ipv4: fib: fix a comment.	2013-01-11 15:58:08 -08:00
fib_lookup.h
fib_rules.c	sections: fix section conflicts in net	2012-10-06 03:04:45 +09:00
fib_semantics.c	ipv4: 16 slots in initial fib_info hash table	2012-10-22 14:29:06 -04:00
fib_trie.c	ipv4/route: arg delay is useless in rt_cache_flush()	2012-09-18 15:44:34 -04:00
gre.c
icmp.c	ipv4: avoid passing NULL to inet_putpeer() in icmpv4_xrlim_allow()	2012-11-26 17:24:41 -05:00
igmp.c	igmp: export symbol ip_mc_leave_group	2012-10-01 18:39:44 -04:00
inet_connection_sock.c	soreuseport: fix use of uid in tb->fastuid	2013-01-27 01:01:42 -05:00
inet_diag.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-12-12 18:07:07 -08:00
inet_fragment.c	net: frag, move LRU list maintenance outside of rwlock	2013-01-29 13:36:24 -05:00
inet_hashtables.c	soreuseport: TCP/IPv4 implementation	2013-01-23 13:44:01 -05:00
inet_lro.c
inet_timewait_sock.c
inetpeer.c	Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2012-10-02 09:54:49 -07:00
ip_forward.c	ipv4: introduce rt_uses_gateway	2012-10-08 17:42:36 -04:00
ip_fragment.c	net: frag, move LRU list maintenance outside of rwlock	2013-01-29 13:36:24 -05:00
ip_gre.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-29 15:32:13 -05:00
ip_input.c	net: TCP early demux cleanup	2012-07-30 14:53:21 -07:00
ip_options.c	net: Allow userns root to control ipv4	2012-11-18 20:32:45 -05:00
ip_output.c	net: Handle encapsulated offloads before fragmentation or handing to lower dev	2012-12-09 00:20:28 -05:00
ip_sockglue.c	net: prevent setting ttl=0 via IP_TTL	2013-01-08 17:57:10 -08:00
ip_vti.c	net: Allow userns root to control ipv4	2012-11-18 20:32:45 -05:00
ipcomp.c	ipcomp: Mark as netns_ok.	2013-02-04 15:46:15 -05:00
ipconfig.c	net/ipv4/ipconfig: really display the BOOTP/DHCP server's address.	2013-01-04 15:14:14 -08:00
ipip.c	net: fix possible wrong checksum generation	2013-01-28 00:27:15 -05:00
ipmr.c	ipmr: fix sparse warning when testing origin or group	2013-01-22 14:24:29 -05:00
Kconfig
Makefile	memcg: rename config variables	2012-07-31 18:42:43 -07:00
netfilter.c	netfilter: properly annotate ipv4_netfilter_{init,fini}()	2012-09-03 13:56:04 +02:00
ping.c	ipv4: Add a socket release callback for datagram sockets	2013-01-21 14:17:05 -05:00
proc.c	tcp: TCP Fast Open Server - header & support functions	2012-08-31 20:02:18 -04:00
protocol.c	net: Add net protocol offload registration infrustructure	2012-11-15 17:36:17 -05:00
raw.c	ipv4: Add a socket release callback for datagram sockets	2013-01-21 14:17:05 -05:00
route.c	ipv4: Fix route refcount on pmtu discovery	2013-01-22 14:23:17 -05:00
syncookies.c	tcp: make sysctl_tcp_ecn namespace aware	2013-01-06 21:09:56 -08:00
sysctl_net_ipv4.c	net: avoid to hang up on sending due to sysctl configuration overflow.	2013-01-28 23:15:27 -05:00
tcp.c	net: fix possible wrong checksum generation	2013-01-28 00:27:15 -05:00
tcp_bic.c
tcp_cong.c	tcp: fix an infinite loop in tcp_slow_start()	2013-02-03 16:00:25 -05:00
tcp_cubic.c
tcp_diag.c
tcp_fastopen.c	tcp: TCP Fast Open Server - header & support functions	2012-08-31 20:02:18 -04:00
tcp_highspeed.c
tcp_htcp.c
tcp_hybla.c
tcp_illinois.c	net: fix divide by zero in tcp algorithm illinois	2012-11-01 11:55:59 -04:00
tcp_input.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-05 14:12:20 -05:00
tcp_ipv4.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-05 14:12:20 -05:00
tcp_lp.c
tcp_memcontrol.c
tcp_metrics.c	tcp: handle tcp_net_metrics_init() order-5 memory allocation failures	2012-11-16 13:36:27 -05:00
tcp_minisocks.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
tcp_output.c	net: fix possible wrong checksum generation	2013-01-28 00:27:15 -05:00
tcp_probe.c
tcp_scalable.c
tcp_timer.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
tcp_vegas.c
tcp_vegas.h
tcp_veno.c
tcp_westwood.c
tcp_yeah.c
tunnel4.c
udp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-29 15:32:13 -05:00
udp_diag.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
udp_impl.h
udplite.c
xfrm4_input.c	ipv4: Fix input route performance regression.	2012-07-26 15:50:39 -07:00
xfrm4_mode_beet.c
xfrm4_mode_transport.c
xfrm4_mode_tunnel.c
xfrm4_output.c
xfrm4_policy.c	xfrm: Fix the gc threshold value for ipv4	2012-11-13 09:15:07 +01:00
xfrm4_state.c
xfrm4_tunnel.c