]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 May 2016 04:50:20 +0000 (00:50 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 May 2016 04:50:20 +0000 (00:50 -0400)
commite8ca5c15db93fad67bf9bed0e99702a8d8379b5e
tree2e36817cdefc4a23667475f6c2f3c48d0bea358e
parentf3305cc9a93e81121ef95d9f2344d27c132f7f38
parent0140f2183609102c1ed49e561291747bf26661d1
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contain Netfilter simple fixes for your net tree,
two one-liner and one two-liner:

1) Oneliner to fix missing spinlock definition that triggers
   'BUG: spinlock bad magic on CPU#' when spinlock debugging is enabled,
   from Florian Westphal.

2) Fix missing workqueue cancelation on IDLETIMER removal,
   from Liping Zhang.

3) Fix insufficient validation of netlink of NFACCT_QUOTA in
   nfnetlink_acct, from Phil Turnbull.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>