From: David S. Miller Date: Mon, 11 Feb 2013 01:44:08 +0000 (-0500) Subject: Merge branch 'master' of git://1984.lsi.us.es/nf X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=cfa82e020bc0be6ab9a1e3c186fe41f1e5cecf7a;p=~shefty%2Frdma-dev.git Merge branch 'master' of git://1984.lsi.us.es/nf Pablo Neira Ayuso says: ==================== The following patchset contains Netfilter/IPVS fixes for 3.8-rc7, they are: * Fix oops in IPVS state-sync due to releasing a random memory area due to unitialized pointer, from Dan Carpenter. * Fix SCTP flow establishment due to bad checksumming mangling in IPVS, from Daniel Borkmann. * Three fixes for the recently added IPv6 NPT, all from YOSHIFUJI Hideaki, with an amendment collapsed into those patches from Ulrich Weber. They fiix adjustment calculation, fix prefix mangling and ensure LSB of prefixes are zeroes (as required by RFC). Specifically, it took me a while to validate the 1's complement arithmetics/ checksumming approach in the IPv6 NPT code. ==================== Signed-off-by: David S. Miller --- cfa82e020bc0be6ab9a1e3c186fe41f1e5cecf7a