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

Fix merge between commit 3adadc08cc ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

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

2012-04-23 23:15:17 -04:00

..

netfilter

net: Convert all sysctl registrations to register_net_sysctl

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

addrconf_core.c

net: cleanup unsigned to unsigned int

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

addrconf.c

net ipv6: Convert addrconf to use register_net_sysctl

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

addrlabel.c

rtnetlink: Compute and store minimum ifinfo dump size

2011-06-09 20:38:07 -07:00

af_inet6.c

sock: Introduce named constants for sk_reuse

2012-04-21 15:52:25 -04:00

ah6.c

net: remove ipv6_addr_copy()

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

anycast.c

ipv6: Remove never used function inet6_ac_check().

2012-02-01 16:14:17 -05:00

datagram.c

net: cleanup unsigned to unsigned int

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

esp6.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-05-05 14:59:02 -07:00

exthdrs_core.c

net/ipv6/exthdrs_core.c: Checkpatch cleanups

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

exthdrs.c

net/ipv6/exthdrs.c: Strict PadN option checking

2012-04-12 17:36:44 -04:00

fib6_rules.c

net/ipv6/fib6_rules.c: Checkpatch cleanup

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

icmp.c

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

2012-04-10 14:30:45 -04: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

ipv6: fix problem with expired dst cache

2012-04-13 12:58:29 -04:00

ip6_flowlabel.c

net: cleanup unsigned to unsigned int

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

ip6_input.c

ipv6: Add fragment reporting to ipv6_skip_exthdr().

2011-12-03 09:35:10 -08:00

ip6_output.c

ipv6: fix incorrent ipv6 ipsec packet fragment

2012-03-20 05:39:34 -04:00

ip6_tunnel.c

ip6_tunnel: dont drop packet but consume it

2012-04-19 14:23:55 -04:00

ip6mr.c

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

2012-04-10 14:30:45 -04:00

ipcomp6.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ipv6_sockglue.c

net: cleanup unsigned to unsigned int

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

Kconfig

…

Makefile

…

mcast.c

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

2012-04-10 14:30:45 -04:00

mip6.c

net: remove ipv6_addr_copy()

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

ndisc.c

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

2012-04-15 13:19:04 -04: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: Implement IPV6_UNICAST_IF socket option.

2012-02-08 15:52:45 -05:00

reassembly.c

net: Convert all sysctl registrations to register_net_sysctl

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

route.c

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

2012-04-15 13:19:04 -04:00

sit.c

tunnel: implement 64 bits statistics

2012-04-14 14:47:05 -04: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

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

2012-04-23 23:15:17 -04:00

tunnel6.c

tunnels: add _rcu annotations

2010-10-25 13:09:45 -07:00

udp_impl.h

…

udp.c

net: add a limit parameter to sk_add_backlog()

2012-04-23 22:28:28 -04: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

…

xfrm6_mode_beet.c

ipsec: be careful of non existing mac headers

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

xfrm6_mode_ro.c

…

xfrm6_mode_transport.c

…

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

net: Convert all sysctl registrations to register_net_sysctl

2012-04-20 21:22:30 -04: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