David S. Miller 0c1072ae02 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/freescale/fec_main.c
	drivers/net/ethernet/renesas/sh_eth.c
	net/ipv4/gre.c

The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list)
and the splitting of the gre.c code into seperate files.

The FEC conflict was two sets of changes adding ethtool support code
in an "!CONFIG_M5272" CPP protected block.

Finally the sh_eth.c conflict was between one commit add bits set
in the .eesr_err_check mask whilst another commit removed the
.tx_error_check member and assignments.

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

2013-07-03 14:55:13 -07:00

..

netfilter

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

2013-07-03 14:55:13 -07:00

af_inet.c

gro: remove a sparse error

2013-06-12 15:03:24 -07:00

ah4.c

ipv4: properly refresh rtable entries on pmtu/redirect events

2013-06-03 00:07:42 -07:00

arp.c

arp: flush arp cache on IFF_NOARP change

2013-05-28 13:11:02 -07: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

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

esp4.c

ipv4: properly refresh rtable entries on pmtu/redirect events

2013-06-03 00:07:42 -07:00

fib_frontend.c

netlink: fix splat in skb_clone with large messages

2013-06-27 22:44:16 -07:00

fib_lookup.h

…

fib_rules.c

…

fib_semantics.c

ipv4: use next hop exceptions also for input routes

2013-06-28 21:27:47 -07:00

fib_trie.c

fib_trie: no need to delay vfree()

2013-05-06 11:06:51 -04:00

gre_demux.c

net: gre: move GSO functions to gre_offload

2013-07-03 14:37:39 -07:00

gre_offload.c

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

2013-07-03 14:55:13 -07:00

icmp.c

icmp: avoid allocating large struct on stack

2013-06-03 00:28:44 -07:00

igmp.c

igmp: fix new sparse errors

2013-06-12 14:14:55 -07:00

inet_connection_sock.c

tcp: Remove TCPCT

2013-03-17 14:35:13 -04:00

inet_diag.c

netlink: rename ssk to sk in struct netlink_skb_params

2013-04-19 14:57:56 -04:00

inet_fragment.c

inet: frag , remove an empty ifdef.

2013-06-19 23:06:52 -07:00

inet_hashtables.c

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

inet_lro.c

ipv4: replace ip_fast_csum with csum_replace2

2013-03-15 09:12:25 -04:00

inet_timewait_sock.c

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

inetpeer.c

…

ip_forward.c

…

ip_fragment.c

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

2013-04-22 20:32:51 -04:00

ip_gre.c

gre: fix a regression in ioctl

2013-07-01 23:35:22 -07:00

ip_input.c

net: Add MIB counters for checksum errors

2013-04-29 15:14:03 -04:00

ip_options.c

net/ipv4: Ensure that location of timestamp option is stored

2013-03-12 05:35:39 -04:00

ip_output.c

ipv4: ip_output: remove inline marking of EXPORT_SYMBOL functions

2013-05-11 16:12:44 -07:00

ip_sockglue.c

…

ip_tunnel_core.c

ip_tunnel: push generic protocol handling to ip_tunnel module.

2013-06-19 18:07:41 -07:00

ip_tunnel.c

ip_tunnels: Use skb-len to PMTU check.

2013-07-02 16:43:35 -07:00

ip_vti.c

vti: remove duplicated code to fix a memory leak

2013-07-01 23:37:14 -07:00

ipcomp.c

ipv4: properly refresh rtable entries on pmtu/redirect events

2013-06-03 00:07:42 -07:00

ipconfig.c

ipconfig: add informative timeout messages while waiting for carrier

2013-04-02 14:35:33 -04:00

ipip.c

ipip: fix a regression in ioctl

2013-07-02 01:13:09 -07:00

ipmr.c

net: remove last caller of skb_tail_offset() and itself

2013-06-10 22:22:23 -07:00

Kconfig

Kconfig: remove dangling references to the deleted file

2013-06-04 15:17:39 -07:00

Makefile

net: gre: move GSO functions to gre_offload

2013-07-03 14:37:39 -07:00

netfilter.c

netfilter: add my copyright statements

2013-04-18 20:27:55 +02:00

ping.c

net: ping_check_bind_addr() etc. can be static

2013-06-13 01:36:41 -07:00

proc.c

net: add low latency socket poll

2013-06-10 21:22:35 -07:00

protocol.c

ipv4: Disallow non-namespace aware protocols to register.

2013-02-05 14:42:23 -05:00

raw.c

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

route.c

ipv4: use next hop exceptions also for input routes

2013-06-28 21:27:47 -07:00

syncookies.c

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

2013-04-22 20:32:51 -04:00

sysctl_net_ipv4.c

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

tcp_bic.c

…

tcp_cong.c

tcp: remove Appropriate Byte Count support

2013-02-05 14:51:16 -05:00

tcp_cubic.c

…

tcp_diag.c

…

tcp_fastopen.c

…

tcp_highspeed.c

…

tcp_htcp.c

…

tcp_hybla.c

…

tcp_illinois.c

…

tcp_input.c

tcp: introduce a per-route knob for quick ack

2013-06-19 23:06:51 -07:00

tcp_ipv4.c

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

2013-07-03 14:55:13 -07:00

tcp_lp.c

…

tcp_memcontrol.c

net: tcp_memcontrol: minor: remove unused variable

2013-04-14 15:41:49 -04:00

tcp_metrics.c

tcp: do not expire TCP fastopen cookies

2013-05-05 16:58:02 -04:00

tcp_minisocks.c

tcp: md5: remove spinlock usage in fast path

2013-05-20 14:00:42 -07:00

tcp_offload.c

net: tcp: move GRO/GSO functions to tcp_offload

2013-06-07 14:39:05 -07:00

tcp_output.c

tcp: introduce a per-route knob for quick ack

2013-06-19 23:06:51 -07:00

tcp_probe.c

net: proc: change proc_net_remove to remove_proc_entry

2013-02-18 14:53:08 -05:00

tcp_scalable.c

…

tcp_timer.c

tcp: refactor F-RTO

2013-03-21 11:47:50 -04:00

tcp_vegas.c

…

tcp_vegas.h

…

tcp_veno.c

…

tcp_westwood.c

tcp: refactor F-RTO

2013-03-21 11:47:50 -04:00

tcp_yeah.c

…

tcp.c

tcp: add low latency socket poll support.

2013-06-10 21:22:36 -07:00

tunnel4.c

…

udp_diag.c

netlink: rename ssk to sk in struct netlink_skb_params

2013-04-19 14:57:56 -04:00

udp_impl.h

…

udp_offload.c

net: udp4: move GSO functions to udp_offload

2013-06-12 00:47:25 -07:00

udp.c

ipv6: call udp_push_pending_frames when uncorking a socket with AF_INET pending data

2013-07-02 12:44:18 -07:00

udplite.c

…

xfrm4_input.c

net: Add skb_unclone() helper function.

2013-02-15 15:10:37 -05:00

xfrm4_mode_beet.c

…

xfrm4_mode_transport.c

…

xfrm4_mode_tunnel.c

xfrm: allow to avoid copying DSCP during encapsulation

2013-03-06 07:02:45 +01:00

xfrm4_output.c

…

xfrm4_policy.c

xfrm: make gc_thresh configurable in all namespaces

2013-02-06 11:36:29 +01:00

xfrm4_state.c

…

xfrm4_tunnel.c

sit: add IPv4 over IPv4 support

2013-05-31 17:19:05 -07:00