From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 17 Jun 2019 14:37:24 +0000 (+0200)
Subject: Merge branch 'master' of git://blackhole.kfki.hu/nf-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=667ec21ebf0913d7166ddea2de14a0d56be0efc6;p=linux.git

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

Jozsef Kadlecsik says:

====================
ipset patches for nf-next

- Remove useless memset() calls, nla_parse_nested/nla_parse
  erase the tb array properly, from Florent Fourcot.
- Merge the uadd and udel functions, the code is nicer
  this way, also from Florent Fourcot.
- Add a missing check for the return value of a
  nla_parse[_deprecated] call, from Aditya Pakki.
- Add the last missing check for the return value
  of nla_parse[_deprecated] call.
- Fix error path and release the references properly
  in set_target_v3_checkentry().
- Fix memory accounting which is reported to userspace
  for hash types on resize, from Stefano Brivio.
- Update my email address to kadlec@netfilter.org.
  The patch covers all places in the source tree where
  my kadlec@blackhole.kfki.hu address could be found.
====================

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

667ec21ebf0913d7166ddea2de14a0d56be0efc6