summaryrefslogtreecommitdiff
path: root/net/hsr
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-10-21 10:25:22 -0400
committerDavid S. Miller <davem@davemloft.net>2016-10-21 10:25:22 -0400
commit8dbad1a81128f7e224fce3cce28a1d545d9c0b88 (patch)
tree57efecac9c603028704e8c97fa8993b4e00356e0 /net/hsr
parent97dcaa0fcfd24daa9a36c212c1ad1d5a97759212 (diff)
parent7034b566a4e7d550621c2dfafd380b77b3787cd9 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== Netfilter fixes for net The following patchset contains Netfilter fixes for your net tree, they are: 1) Fix compilation warning in xt_hashlimit on m68k 32-bits, from Geert Uytterhoeven. 2) Fix wrong timeout in set elements added from packet path via nft_dynset, from Anders K. Pedersen. 3) Remove obsolete nf_conntrack_events_retry_timeout sysctl documentation, from Nicolas Dichtel. 4) Ensure proper initialization of log flags via xt_LOG, from Liping Zhang. 5) Missing alias to autoload ipcomp, also from Liping Zhang. 6) Missing NFTA_HASH_OFFSET attribute validation, again from Liping. 7) Wrong integer type in the new nft_parse_u32_check() function, from Dan Carpenter. 8) Another wrong integer type declaration in nft_exthdr_init, also from Dan Carpenter. 9) Fix insufficient mode validation in nft_range. 10) Fix compilation warning in nft_range due to possible uninitialized value, from Arnd Bergmann. 11) Zero nf_hook_ops allocated via xt_hook_alloc() in x_tables to calm down kmemcheck, from Florian Westphal. 12) Schedule gc_worker() to run again if GC_MAX_EVICTS quota is reached, from Nicolas Dichtel. 13) Fix nf_queue() after conversion to single-linked hook list, related to incorrect bypass flag handling and incorrect hook point of reinjection. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/hsr')
0 files changed, 0 insertions, 0 deletions