David S. Miller 7e52b33bd5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/ipv6/route.c

This deals with a merge conflict between the net-next addition of the
inetpeer network namespace ops, and Thomas Graf's bug fix in
2a0c451ade8e1783c5d453948289e4a978d417c9 which makes sure we don't
register /proc/net/ipv6_route before it is actually safe to do so.

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

2012-06-15 15:51:55 -07:00

..

netfilter

netfilter: nf_conntrack: add namespace support for cttimeout

2012-06-07 14:58:41 +02:00

addrconf_core.c

net: cleanup unsigned to unsigned int

2012-04-15 12:44:40 -04:00

addrconf.c

Merge branch 'delete-tokenring' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2012-05-16 01:02:40 -04:00

addrlabel.c

ipv6: bool/const conversions phase2

2012-05-19 01:08:16 -04:00

af_inet6.c

ipv6: bool conversions phase1

2012-05-18 02:24:13 -04:00

ah6.c

ipv6: Handle PMTU in ICMP error handlers.

2012-06-15 14:54:11 -07:00

anycast.c

ipv6: bool/const conversions phase2

2012-05-19 01:08:16 -04:00

datagram.c

ipv6: bool/const conversions phase2

2012-05-19 01:08:16 -04:00

esp6.c

ipv6: Handle PMTU in ICMP error handlers.

2012-06-15 14:54:11 -07:00

exthdrs_core.c

ipv6: bool/const conversions phase2

2012-05-19 01:08:16 -04:00

exthdrs.c

net: Remove casts to same type

2012-06-04 11:45:11 -04:00

fib6_rules.c

net/ipv6/fib6_rules.c: Checkpatch cleanup

2012-04-02 04:33:46 -04:00

icmp.c

ipv6: Handle PMTU in ICMP error handlers.

2012-06-15 14:54:11 -07:00

inet6_connection_sock.c

tcp: bind() use stronger condition for bind_conflict

2012-04-14 15:28:55 -04:00

inet6_hashtables.c

net: Compute protocol sequence numbers and fragment IDs using MD5.

2011-08-06 18:33:19 -07:00

ip6_fib.c

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

2012-06-15 15:51:55 -07:00

ip6_flowlabel.c

ipv6: bool/const conversions phase2

2012-05-19 01:08:16 -04:00

ip6_input.c

ipv6: bool/const conversions phase2

2012-05-19 01:08:16 -04:00

ip6_output.c

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

2012-06-12 21:59:18 -07:00

ip6_tunnel.c

ipv6: bool conversions phase1

2012-05-18 02:24:13 -04:00

ip6mr.c

snmp: fix OutOctets counter to include forwarded datagrams

2012-06-07 14:50:56 -07:00

ipcomp6.c

ipv6: Handle PMTU in ICMP error handlers.

2012-06-15 14:54:11 -07:00

ipv6_sockglue.c

net: cleanup unsigned to unsigned int

2012-04-15 12:44:40 -04:00

Kconfig

xfrm: make xfrm_algo.c a module

2012-05-15 13:13:34 -04:00

Makefile

[IPV6] MROUTE: Support multicast forwarding.

2008-04-05 22:33:38 +09:00

mcast.c

ipv6: bool/const conversions phase2

2012-05-19 01:08:16 -04:00

mip6.c

ipv6: correct the ipv6 option name - Pad0 to Pad1

2012-05-17 15:49:51 -04:00

ndisc.c

inet: Create and use rt{,6}_get_peer_create().

2012-06-08 23:24:18 -07:00

netfilter.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

proc.c

ipv6: fix per device IP snmp counters

2012-01-17 23:56:18 -05:00

protocol.c

net: add __rcu annotations to protocol

2010-10-27 11:37:31 -07:00

raw.c

ipv6: Handle PMTU in ICMP error handlers.

2012-06-15 14:54:11 -07:00

reassembly.c

ipv6: use skb coalescing in reassembly

2012-05-19 18:34:57 -04:00

route.c

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

2012-06-15 15:51:55 -07:00

sit.c

ipv4: Handle PMTU in all ICMP error handlers.

2012-06-14 22:22:07 -07:00

syncookies.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

sysctl_net_ipv6.c

net: Delete all remaining instances of ctl_path

2012-04-20 21:22:30 -04:00

tcp_ipv6.c

ipv6: Handle PMTU in ICMP error handlers.

2012-06-15 14:54:11 -07:00

tunnel6.c

net: ipv6: Standardize prefixes for message logging

2012-05-16 01:01:03 -04:00

udp_impl.h

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

udp.c

ipv6: Handle PMTU in ICMP error handlers.

2012-06-15 14:54:11 -07:00

udplite.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

xfrm6_input.c

netfilter: ipv6: use NFPROTO values for NF_HOOK invocation

2010-03-25 16:00:49 +01:00

xfrm6_mode_beet.c

ipsec: be careful of non existing mac headers

2012-02-23 16:50:45 -05:00

xfrm6_mode_ro.c

[IPSEC]: Make x->lastused an unsigned long

2008-01-28 14:53:52 -08:00

xfrm6_mode_transport.c

[IPSEC]: Use IPv6 calling convention as the convention for x->mode->output

2007-10-10 16:55:54 -07:00

xfrm6_mode_tunnel.c

ipsec: be careful of non existing mac headers

2012-02-23 16:50:45 -05:00

xfrm6_output.c

xfrm6: remove unneeded NULL check in __xfrm6_output()

2012-02-01 02:52:48 -05:00

xfrm6_policy.c

inet: Hide route peer accesses behind helpers.

2012-06-11 02:08:47 -07:00

xfrm6_state.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

xfrm6_tunnel.c

net: cleanup unsigned to unsigned int

2012-04-15 12:44:40 -04:00