summaryrefslogtreecommitdiffstats
path: root/net/dcb
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-04-14 19:00:10 -0400
committerDavid S. Miller <davem@davemloft.net>2014-04-14 19:00:10 -0400
commit00cbc3dcd1e2758f65e82c46796e259a0ce22fcc (patch)
treea9542bbeeca6cfc6d5158b0004302f53f1f8c360 /net/dcb
parent1e785f48d29a09b6cf96db7b49b6320dada332e1 (diff)
parentb855d416dc17061ebb271ea7ef1201d100531770 (diff)
downloadlinux-stable-00cbc3dcd1e2758f65e82c46796e259a0ce22fcc.tar.gz
linux-stable-00cbc3dcd1e2758f65e82c46796e259a0ce22fcc.tar.bz2
linux-stable-00cbc3dcd1e2758f65e82c46796e259a0ce22fcc.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== Netfilter fixes for net The following patchset contains three Netfilter fixes for your net tree, they are: * Fix missing generation sequence initialization which results in a splat if lockdep is enabled, it was introduced in the recent works to improve nf_conntrack scalability, from Andrey Vagin. * Don't flush the GRE keymap list in nf_conntrack when the pptp helper is disabled otherwise this crashes due to a double release, from Andrey Vagin. * Fix nf_tables cmp fast in big endian, from Patrick McHardy. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dcb')
0 files changed, 0 insertions, 0 deletions