From: pablo@xxxxxxxxxxxxx Date: Fri, 16 Nov 2012 13:40:49 +0100 > This is the second try to include the following four patches that contain > updates for your net-next tree, they are: > > * Little cleanup for IPVS the use of a strange notation to assign the > conntrack object, from Alan Cox. > > * Another little cleanup for nf_nat to save a couple of lines by using > PTR_RET, from Wu Fengguan > > * getsockopt support to obtain the original IPv6 address after NAT, > similar to the one that IPv4 provides, from Florian Westphal. > > * Follow-up patch pointed out by YOSHIFUJI Hideaki to only provide > the scope_id in case that link is local, again from Florian Westphal. > > You can pull these changes from: > > git://1984.lsi.us.es/nf-next master Pulled, thanks. There was a conflict I had to resolve because the net-next tree had a series of IS_ENABLED conversions that overlapped with some of the changes in your tree. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
