From: Pablo Neira Ayuso Date: Wed, 13 Nov 2019 09:42:07 +0000 (+0100) Subject: Merge branch 'master' of git://blackhole.kfki.hu/nf-next X-Git-Tag: for-linus-20191129~13^2~71^2~12 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3944a4fd0d7015523d55e50fdaa40d12523f2e6a;p=linux-2.6-block.git Merge branch 'master' of git://blackhole.kfki.hu/nf-next 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 --- 3944a4fd0d7015523d55e50fdaa40d12523f2e6a