diff options
| author | David S. Miller <davem@davemloft.net> | 2013-06-24 12:45:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-24 12:45:24 -0700 |
| commit | a3d9dd89b781bdcb14201847608b658442de812b (patch) | |
| tree | a5f0be09bc4d591cdc7b4422efd8c0d9c41fb722 /fs/efivarfs/file.c | |
| parent | f57da7a65b386dd4535daa4f7a3773a025fbb022 (diff) | |
| parent | c8fc51cfa758be945c6113a4b446e0159070f768 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
The following patchset contains five fixes for Netfilter/IPVS, they are:
* A skb leak fix in fragmentation handling in case that helpers are in place,
it occurs since the IPV6 NAT infrastructure, from Phil Oester.
* Fix SCTP port mangling in ICMP packets for IPVS, from Julian Anastasov.
* Fix event delivery in ctnetlink regarding the new connlabel infrastructure,
from Florian Westphal.
* Fix mangling in the SIP NAT helper, from Balazs Peter Odor.
* Fix crash in ipt_ULOG introduced while adding netnamespace support,
from Gao Feng.
I'll take care of passing several of these patches to -stable once they hit
Linus' tree.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/efivarfs/file.c')
0 files changed, 0 insertions, 0 deletions