projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73b4f63 4c1017a)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 Feb 2015 22:27:24 +0000 (14:27 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Feb 2015 22:27:24 +0000 (14:27 -0800)
Pablo Neira Ayuso says:

====================
Netfilter updates for net-next

The following patchset contains two small Netfilter updates for your
net-next tree, they are:

1) Add ebtables support to nft_compat, from Arturo Borrero.

2) Fix missing validation of the SET_ID attribute in the lookup
   expressions, from Patrick McHardy.
====================

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

Trivial merge
Linux 6.x block layer and io_uring tree(s)