From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 4 Nov 2019 19:59:00 +0000 (+0100)
Subject: Merge branch 'master' of git://blackhole.kfki.hu/nf
X-Git-Tag: v5.4-rc7~16^2~17^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=774e4d34dbebc9dc441535c4712794d336a9478c;p=thirdparty%2Flinux.git

Merge branch 'master' of git://blackhole.kfki.hu/nf

Jozsef Kadlecsik says:

====================
ipset patches for nf

- Fix the error code in ip_set_sockfn_get() when copy_to_user() is used,
  from Dan Carpenter.
- The IPv6 part was missed when fixing copying the right MAC address
  in the patch "netfilter: ipset: Copy the right MAC address in bitmap:ip,mac
  and hash:ip,mac sets", it is completed now by Stefano Brivio.
- ipset nla_policies are fixed to fully support NL_VALIDATE_STRICT and
  the code is converted from deprecated parsings to verified ones.
====================

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

774e4d34dbebc9dc441535c4712794d336a9478c