OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f6ae9f1
b6520fc
)
Merge branch 'master' of git://blackhole.kfki.hu/nf-next
author
Pablo Neira Ayuso
<pablo@netfilter.org>
Wed, 13 Nov 2019 09:42:07 +0000
(10:42 +0100)
committer
Pablo Neira Ayuso
<pablo@netfilter.org>
Wed, 13 Nov 2019 09:42:07 +0000
(10:42 +0100)
Jozsef Kadlecsik says:
====================
ipset patches for nf-next
- Add wildcard support to hash:net,iface which makes possible to
match interface prefixes besides complete interfaces names, from
Kristian Evensen.
====================
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Trivial merge