From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 13 Nov 2019 09:42:07 +0000 (+0100)
Subject: Merge branch 'master' of git://blackhole.kfki.hu/nf-next
X-Git-Tag: v5.5-rc1~174^2~71^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3944a4fd0d7015523d55e50fdaa40d12523f2e6a;p=thirdparty%2Flinux.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 <pablo@netfilter.org>
---

3944a4fd0d7015523d55e50fdaa40d12523f2e6a