From: Pablo Neira Ayuso Date: Sun, 8 Nov 2015 22:52:23 +0000 (+0100) Subject: Merge branch 'master' of git://blackhole.kfki.hu/nf X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e75cb467df29a428612c162e6f1451c5c0717091;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'master' of git://blackhole.kfki.hu/nf Jozsef Kadlecsik says: ==================== Please apply the next bugfixes against the nf tree. - Fix extensions alignment in ipset: Gerhard Wiesinger reported that the missing data aligments lead to crash on non-intel architecture. The patch was tested on armv7h by Gerhard Wiesinger and on x86_64 and sparc64 by me. - An incorrect index at the hash:* types could lead to falsely early expired entries and memory leak when the comment extension was used too. - Release empty hash bucket block when all entries are expired or all slots are empty instead of shrinkig the data part to zero. ==================== Signed-off-by: Pablo Neira Ayuso --- e75cb467df29a428612c162e6f1451c5c0717091