David S. Miller da13482534 Merge branch 'master' of git://1984.lsi.us.es/nf-next ... Pablo Neira Ayuso says: ==================== The following patchset contains Netfilter/IPVS updates for your net-next tree, they are: * Better performance in nfnetlink_queue by avoiding copy from the packet to netlink message, from Eric Dumazet. * Remove unnecessary locking in the exit path of ebt_ulog, from Gao Feng. * Use new function ipv6_iface_scope_id in nf_ct_ipv6, from Hannes Frederic Sowa. * A couple of sparse fixes for IPVS, from Julian Anastasov. * Use xor hashing in nfnetlink_queue, as suggested by Eric Dumazet, from myself. * Allow to dump expectations per master conntrack via ctnetlink, from myself. * A couple of cleanups to use PTR_RET in module init path, from Silviu-Mihai Popescu. * Remove nf_conntrack module a bit faster if netns are in use, from Vladimir Davydov. * Use checksum_partial in ip6t_NPT, from YOSHIFUJI Hideaki. * Sparse fix for nf_conntrack, from Stephen Hemminger. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2013-03-25 12:11:44 -04:00
..
9p	Revert parts of "hlist: drop the node parameter from iterators"	2013-03-08 15:05:34 -08:00
802	…
8021q	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
appletalk	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
atm	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
ax25	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
batman-adv	batman-adv: network coding - receive coded packets and decode them	2013-03-13 22:53:51 +01:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth	2013-03-18 15:17:11 -04:00
bridge	Merge branch 'master' of git://1984.lsi.us.es/nf-next	2013-03-25 12:11:44 -04:00
caif	CAIF: fix indentation for function arguments	2013-03-07 16:24:45 -05:00
can	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2013-03-12 09:22:42 -07:00
core	ipv4: provide addr and netconf dump consistency info	2013-03-24 17:16:29 -04:00
dcb	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
dccp	tcp: Remove TCPCT	2013-03-17 14:35:13 -04:00
decnet	decnet: Move rtm_dn_policy to dn_route to make it available if !CONFIG_DECNET_ROUTER	2013-03-22 12:51:59 -04:00
dns_resolver	…
dsa	dsa: add device tree bindings to register DSA switches	2013-03-24 17:16:30 -04:00
ethernet	…
ieee802154	6lowpan: Fix endianness issue in is_addr_link_local().	2013-03-10 16:49:35 -04:00
ipv4	Merge branch 'master' of git://1984.lsi.us.es/nf-next	2013-03-25 12:11:44 -04:00
ipv6	Merge branch 'master' of git://1984.lsi.us.es/nf-next	2013-03-25 12:11:44 -04:00
ipx	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
irda	net/irda: add missing error path release_sock call	2013-03-20 12:23:13 -04:00
iucv	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
key	afkey: fix a typo	2013-03-07 16:26:45 -05:00
l2tp	l2tp: calling the ref() instead of deref()	2013-03-22 14:39:24 -04:00
lapb	…
llc	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
mac80211	mac80211: init mesh timer for user authed STAs	2013-03-06 16:36:14 +01:00
mac802154	Driver core patches for 3.9-rc1	2013-02-21 12:05:51 -08:00
netfilter	Merge branch 'master' of git://1984.lsi.us.es/nf-next	2013-03-25 12:11:44 -04:00
netlabel	netlabel: fix build problems when CONFIG_IPV6=n	2013-03-08 11:33:51 -05:00
netlink	netlink: Diag core and basic socket info dumping (v2)	2013-03-21 12:38:03 -04:00
netrom	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
nfc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-03-18 09:39:21 -04:00
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-03-20 12:46:26 -04:00
packet	packet: packet fanout rollover during socket overload	2013-03-19 17:15:04 -04:00
phonet	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
rds	net/rds: zero last byte for strncpy	2013-03-08 00:35:44 -05:00
rfkill	net: rfkill: Fix sparse warning in rfkill-regulator.c	2013-03-06 16:35:41 +01:00
rose	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
rxrpc	Driver core patches for 3.9-rc1	2013-02-21 12:05:51 -08:00
sched	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
sctp	sctp: don't break the loop while meeting the active_path so as to find the matched transport	2013-03-13 10:09:55 -04:00
sunrpc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2013-03-13 15:47:50 -07:00
tipc	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
unix	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
vmw_vsock	VSOCK: Support VM sockets connected to the hypervisor.	2013-03-15 08:26:26 -04:00
wimax	…
wireless	nl80211: user_mpm overrides auto_open_plinks	2013-03-06 16:36:13 +01:00
x25	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
xfrm	xfrm: use xfrm direction when lookup policy	2013-03-19 10:35:11 -04:00
Kconfig	netlink: Diag core and basic socket info dumping (v2)	2013-03-21 12:38:03 -04:00
Makefile	…
compat.c	…
nonet.c	…
socket.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-02-26 20:16:07 -08:00
sysctl_net.c	…