David S. Miller 73ce00d4d6 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ... Pablo Neira Ayuso says: ==================== The following patchset contains Netfilter/IPVS fixes for 3.10-rc3, they are: * fix xt_addrtype with IPv6, from Florian Westphal. This required a new hook for IPv6 functions in the netfilter core to avoid hard dependencies with the ipv6 subsystem when this match is only used for IPv4. * fix connection reuse case in IPVS. Currently, if an reused connection are directed to the same server. If that server is down, those connection would fail. Therefore, clear the connection and choose a new server among the available ones. * fix possible non-nul terminated string sent to user-space if ipt_ULOG is used as the default netfilter logging stub, from Chen Gang. * fix mark logging of IPv6 packets in xt_LOG, from Michal Kubecek. This bug has been there since 2.6.26. * Fix breakage ip_vs_sh due to incorrect structure layout for RCU, from Jan Beulich. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2013-05-30 16:38:38 -07:00
..
acpi
asm-generic
clocksource
crypto
drm
dt-bindings
keys
linux	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2013-05-30 16:38:38 -07:00
math-emu
media
memory
misc
net	netfilter: add nf_ipv6_ops hook to fix xt_addrtype with IPv6	2013-05-23 11:58:55 +02:00
pcmcia
ras
rdma
rxrpc
scsi
sound
target
trace
uapi
video
xen
Kbuild