David S. Miller b48b63a1f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/netfilter/nfnetlink_log.c net/netfilter/xt_LOG.c Rather easy conflict resolution, the 'net' tree had bug fixes to make sure we checked if a socket is a time-wait one or not and elide the logging code if so. Whereas on the 'net-next' side we are calculating the UID and GID from the creds using different interfaces due to the user namespace changes from Eric Biederman. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-15 11:43:53 -04:00
..
associola.c	sctp: Make sysctl tunables per net	2012-08-14 23:32:16 -07:00
auth.c	sctp: fix bogus if statement in sctp_auth_recv_cid()	2012-08-16 13:36:29 -07:00
bind_addr.c	sctp: Make sysctl tunables per net	2012-08-14 23:32:16 -07:00
chunk.c	sctp: Make the mib per network namespace	2012-08-14 23:30:36 -07:00
command.c
debug.c	sctp: remove completely unsed EMPTY state	2011-04-20 01:51:03 -07:00
endpointola.c	sctp: Make sysctl tunables per net	2012-08-14 23:32:16 -07:00
input.c	sctp: Make sysctl tunables per net	2012-08-14 23:32:16 -07:00
inqueue.c	net/sctp: Use pr_fmt and pr_<level>	2010-08-26 14:11:48 -07:00
ipv6.c	sctp: Make the mib per network namespace	2012-08-14 23:30:36 -07:00
Kconfig	sctp: implement sctp association probing module	2010-04-30 22:41:09 -04:00
Makefile	sctp: implement sctp association probing module	2010-04-30 22:41:09 -04:00
objcnt.c	sctp: Make the proc files per network namespace.	2012-08-14 23:29:53 -07:00
output.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
outqueue.c	sctp: use list_move_tail instead of list_del/list_add_tail	2012-09-04 14:16:13 -04:00
primitive.c	sctp: Push struct net down to sctp_chunk_event_lookup	2012-08-14 23:30:37 -07:00
probe.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
proc.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2012-08-24 18:54:37 -04:00
protocol.c	sctp: Make sysctl tunables per net	2012-08-14 23:32:16 -07:00
sm_make_chunk.c	sctp: Make sysctl tunables per net	2012-08-14 23:32:16 -07:00
sm_sideeffect.c	sctp: Push struct net down into all of the state machine functions	2012-08-14 23:30:37 -07:00
sm_statefuns.c	sctp: Make sysctl tunables per net	2012-08-14 23:32:16 -07:00
sm_statetable.c	sctp: Make sysctl tunables per net	2012-08-14 23:32:16 -07:00
socket.c	sctp: Make sysctl tunables per net	2012-08-14 23:32:16 -07:00
ssnmap.c
sysctl.c	sctp: Make sysctl tunables per net	2012-08-14 23:32:16 -07:00
transport.c	sctp: Make sysctl tunables per net	2012-08-14 23:32:16 -07:00
tsnmap.c	sctp: be more restrictive in transport selection on bundled sacks	2012-06-30 22:44:35 -07:00
ulpevent.c	netvm: prevent a stream-specific deadlock	2012-07-31 18:42:47 -07:00
ulpqueue.c	sctp: Make the mib per network namespace	2012-08-14 23:30:36 -07:00