diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-11 14:27:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-11 14:27:24 -0800 |
| commit | 4a3046d68a5a6b7a2474c9d65811091841675cdb (patch) | |
| tree | be6c0878a164e45bced7c4cfa534fe29f34110c5 /Documentation/zh_CN | |
| parent | 73b4f63aebd6d57db4ca1d31fa6f8516651207b0 (diff) | |
| parent | 4c1017aa80c95a74703139bb95c4ce0d130efe4d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
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>
Diffstat (limited to 'Documentation/zh_CN')
0 files changed, 0 insertions, 0 deletions