From: David S. Miller Date: Mon, 25 Mar 2013 16:11:44 +0000 (-0400) Subject: Merge branch 'master' of git://1984.lsi.us.es/nf-next X-Git-Tag: v3.12-rc1~874^2~352 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da134825348faf797dc57c768bffc454ab7af34b;p=kernel%2Fkernel-generic.git 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 --- da134825348faf797dc57c768bffc454ab7af34b