David S. Miller 6bdc5f49e3 Merge branch 'master' of git://1984.lsi.us.es/nf-next ... Pablo says: ==================== The following patchset provides fixes for issues that were recently introduced by my new cthelper infrastructure. They have been spotted by Randy Dunlap, Andrew Morton and Dan Carpenter. The patches provide: * compilation fixes if CONFIG_NF_CONNTRACK is disabled: I moved all the conntrack code from nfnetlink_queue.c to nfnetlink_queue_ct.c to avoid peppering the entire code with lots of ifdefs. I needed to rename nfnetlink_queue.c to nfnetlink_queue_core.c to get it working with the Makefile tweaks I've added. * fix NULL pointer dereference via ctnetlink while trying to change the helper for an existing conntrack entry. I don't find any reasonable use case for changing the helper from one to another in run-time. Thus, now ctnetlink returns -EOPNOTSUPP for this operation. * fix possible out-of-bound zeroing of the conntrack extension area due to the helper automatic assignation routine. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-18 20:26:06 -07:00
..
9p	net/9p: Add __force to cast of __user pointer	2012-06-04 13:51:17 -04:00
802	tokenring: delete all remaining driver support	2012-05-15 20:23:16 -04:00
8021q	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-16 22:17:37 -04:00
appletalk	appletalk: Remove out of date message in printk	2012-06-07 13:11:59 -07:00
atm	net: Remove casts to same type	2012-06-04 11:45:11 -04:00
ax25	net: use consume_skb() in place of kfree_skb()	2012-06-04 11:27:40 -04:00
batman-adv	batman-adv: only store changed gw_bandwidth values	2012-06-18 18:01:07 +02:00
bluetooth	Bluetooth: Fix checking the wrong flag when accepting a socket	2012-06-05 06:26:26 +03:00
bridge	netfilter: bridge: switch hook PFs to nfproto	2012-06-07 14:58:42 +02:00
caif	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-05-22 19:22:50 -07:00
can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-15 15:51:55 -07:00
ceph	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2012-05-30 11:17:19 -07:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-15 15:51:55 -07:00
dcb	dcbnl: Use BUG_ON() instead of BUG()	2012-06-14 01:45:46 -07:00
dccp	ipv6: Handle PMTU in ICMP error handlers.	2012-06-15 14:54:11 -07:00
decnet	Merge branch 'master' of git://1984.lsi.us.es/net-next	2012-06-11 12:56:14 -07:00
dns_resolver	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-05-21 20:27:36 -07:00
dsa	dsa: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:19 -04:00
ethernet	net, drivers/net: Convert compare_ether_addr_64bits to ether_addr_equal_64bits	2012-05-10 23:33:01 -04:00
ieee802154	ieee802154: interface type to be added	2012-05-16 15:17:08 -04:00
ipv4	ipv4: Cap ADVMSS metric in the FIB rather than the routing cache.	2012-06-17 19:47:34 -07:00
ipv6	Merge branch 'master' of git://1984.lsi.us.es/nf-next	2012-06-16 15:23:35 -07:00
ipx	ipx: Remove spurious NULL checking in ipx_ioctl().	2012-05-19 00:51:04 -04:00
irda	net: Remove casts to same type	2012-06-04 11:45:11 -04:00
iucv	net: remove skb_orphan_try()	2012-06-15 15:30:15 -07:00
key	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
lapb	lapb: Neaten debugging	2012-05-17 18:45:20 -04:00
llc	net: include/net/sock.h cleanup	2012-05-17 04:50:21 -04:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
mac802154	mac802154: monitor device support	2012-05-16 15:17:08 -04:00
netfilter	netfilter: nfnetlink_queue: fix compilation with NF_CONNTRACK disabled	2012-06-19 04:44:57 +02:00
netlabel	netlabel: use GFP flags from caller instead of GFP_ATOMIC	2012-03-22 19:29:57 -04:00
netlink	genetlink: Build a generic netlink family module alias	2012-05-29 22:33:56 -04:00
netrom	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
nfc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-12 21:59:18 -07:00
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-16 22:17:37 -04:00
packet	af_packet: use sizeof instead of constant in spkt_device	2012-06-11 16:51:51 -07:00
phonet	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
rds	rds_rdma: don't assume infiniband device is PCI	2012-05-29 17:30:07 -04:00
rfkill	rfkill: Add the capability to switch all devices of all type in __rfkill_switch_all().	2012-06-06 15:18:17 -04:00
rose	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
rxrpc	ipv4: Kill ip_rt_frag_needed().	2012-06-11 02:08:59 -07:00
sched	sch_atm.c: get rid of poinless extern	2012-06-01 10:37:18 -04:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-16 22:17:37 -04:00
sunrpc	Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux	2012-06-01 08:32:58 -07:00
tipc	net: Remove casts to same type	2012-06-04 11:45:11 -04:00
unix	af_unix: remove unix_iter_state	2012-06-09 19:06:21 -07:00
wanrouter	net/wanrouter: Deprecate and schedule for removal	2012-05-24 16:22:53 -04:00
wimax	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
wireless	cfg80211: validate remain-on-channel time better	2012-06-06 15:20:22 -04:00
x25	net: add a limit parameter to sk_add_backlog()	2012-04-23 22:28:28 -04:00
xfrm	ipv6: fix incorrect ipsec fragment	2012-05-27 01:11:22 -04:00
compat.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-05-21 20:27:36 -07:00
Kconfig	net: drop NET dependency from HAVE_BPF_JIT	2012-05-21 12:50:12 -07:00
Makefile	econet: remove ancient bug ridden protocol	2012-05-18 01:35:08 -04:00
nonet.c
socket.c	Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2012-05-22 17:37:47 -07:00
sysctl_net.c	net: delete all instances of special processing for token ring	2012-05-15 20:14:35 -04:00