David S. Miller 602e65a3b0 Merge branch 'master' of git://1984.lsi.us.es/nf ... Pablo Neira Ayuso says: ==================== I know that we're in fairly late stage to request pulls, but the IPVS people pinged me with little patches with oops fixes last week. One of them was recently introduced (during the 3.4 development cycle) while cleaning up the IPVS netns support. They are: * Fix one regression introduced in 3.4 while cleaning up the netns support for IPVS, from Julian Anastasov. * Fix one oops triggered due to resetting the conntrack attached to the skb instead of just putting it in the forward hook, from Lin Ming. This problem seems to be there since 2.6.37 according to Simon Horman. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2012-07-17 03:19:33 -07:00
..
9p	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 11:20:31 -07:00
802	tokenring: delete all remaining driver support	2012-05-15 20:23:16 -04:00
8021q	net: Fix memory leak - vlan_info struct	2012-07-10 23:32:27 -07:00
appletalk	appletalk: Remove out of date message in printk	2012-06-07 13:11:59 -07:00
atm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-05-22 19:22:50 -07:00
ax25	ax25: Fix missing break	2012-07-16 23:22:36 -07:00
batman-adv	batman-adv: check incoming packet type for bla	2012-07-06 00:08:46 +02:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 11:20:31 -07:00
bridge	bridge: Assign rtnl_link_ops to bridge devices created via ioctl (v2)	2012-06-26 21:12:32 -07:00
caif	caif: Fix access to freed pernet memory	2012-07-16 23:06:20 -07:00
can	net: remove skb_orphan_try()	2012-06-15 15:30:15 -07:00
ceph	libceph: flush msgr queue during mon_client shutdown	2012-06-20 07:43:50 -05:00
core	net: cgroup: fix access the unallocated memory in netprio cgroup	2012-07-16 23:00:43 -07:00
dcb	net: dcb: add CEE notify calls	2012-04-25 19:47:17 -04:00
dccp	net: include/net/sock.h cleanup	2012-05-17 04:50:21 -04:00
decnet	net: Convert net_ratelimit uses to net_<level>_ratelimited	2012-05-15 13:45:03 -04: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: verify packet size before trying to allocate it	2012-07-08 23:49:30 -07:00
ipv4	snmp: fix OutOctets counter to include forwarded datagrams	2012-06-07 14:50:56 -07:00
ipv6	tcp: heed result of security_inet_conn_request() in tcp_v6_conn_request()	2012-06-25 16:05:19 -07:00
ipx	ipx: Remove spurious NULL checking in ipx_ioctl().	2012-05-19 00:51:04 -04:00
irda	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -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	net: l2tp_eth: use LLTX to avoid LOCKDEP splats	2012-06-26 16:42:33 -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	mac80211: destroy assoc_data correctly if assoc fails	2012-07-09 15:01:00 -04:00
mac802154	mac802154: add missed braces	2012-06-25 16:35:30 -07:00
netfilter	ipvs: fix oops in ip_vs_dst_event on rmmod	2012-07-17 12:00:58 +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	NFC: Prevent NULL deref when getting socket name	2012-07-09 15:01:00 -04: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: packet_getsockopt() cleanup	2012-04-21 16:36:42 -04:00
phonet	net: remove my future former mail address	2012-06-17 16:29:38 -07:00
rds	rds_rdma: don't assume infiniband device is PCI	2012-05-29 17:30:07 -04:00
rfkill	device.h: cleanup users outside of linux/include (C files)	2012-03-11 14:27:37 -04:00
rose	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
rxrpc	net/rxrpc/ar-peer.c: remove invalid reference to list iterator variable	2012-07-09 15:24:33 -07:00
sched	sch_sfb: Fix missing NULL check	2012-07-12 08:33:18 -07:00
sctp	sctp: Fix list corruption resulting from freeing an association on a list	2012-07-16 22:32:26 -07:00
sunrpc	NFS client bugfixes for Linux 3.5	2012-06-15 17:37:23 -07:00
tipc	tipc: compress out gratuitous extra carriage returns	2012-04-30 15:53:56 -04:00
unix	net: sock_diag_handler structs can be const	2012-04-25 20:46:59 -04: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: fix potential deadlock in regulatory	2012-06-13 10:17:53 +02: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
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
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
nonet.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
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