From: David S. Miller <davem@davemloft.net>
Date: Tue, 28 Apr 2015 03:12:34 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
X-Git-Tag: v4.1-rc2~6^2~24
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=39376ccb1968ba9f83e2a880a8bf02ad5dea44e1;p=linux-2.6-block.git

Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for your net tree,
they are:

1) Fix a crash in nf_tables when dictionaries are used from the ruleset,
   due to memory corruption, from Florian Westphal.

2) Fix another crash in nf_queue when used with br_netfilter. Also from
   Florian.

Both fixes are related to new stuff that got in 4.0-rc.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

39376ccb1968ba9f83e2a880a8bf02ad5dea44e1