From: Pablo Neira Ayuso Date: Wed, 26 Feb 2020 12:55:15 +0000 (+0100) Subject: Merge branch 'master' of git://blackhole.kfki.hu/nf X-Git-Tag: v5.6-rc4~12^2~22^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ea4894ba4492c1afeff3142f34bcf9af706a2e1;p=thirdparty%2Fkernel%2Fstable.git Merge branch 'master' of git://blackhole.kfki.hu/nf Jozsef Kadlecsik says: ==================== ipset patches for nf The first one is larger than usual, but the issue could not be solved simpler. Also, it's a resend of the patch I submitted a few days ago, with a one line fix on top of that: the size of the comment extensions was not taken into account at reporting the full size of the set. - Fix "INFO: rcu detected stall in hash_xxx" reports of syzbot by introducing region locking and using workqueue instead of timer based gc of timed out entries in hash types of sets in ipset. - Fix the forceadd evaluation path - the bug was also uncovered by the syzbot. ==================== Signed-off-by: Pablo Neira Ayuso --- 9ea4894ba4492c1afeff3142f34bcf9af706a2e1