projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8b4cd8a 9df9e78)
Merge branch 'master' of git://1984.lsi.us.es/nf
authorDavid S. Miller <davem@davemloft.net>
Thu, 7 Mar 2013 20:20:02 +0000 (15:20 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Mar 2013 20:20:02 +0000 (15:20 -0500)
commit43b18db8a27fcd28c2bd290adf031ca04ea573ce
treeb9159b5319822a962edb018b651e5be69d72f542tree | snapshot (tar.gz zip)
parent8b4cd8a0535706ab3f47dd52f5650b11152080b3commit | diff
parent9df9e7832391cf699abbf39fc8d95d7e78297462commit | diff
Merge branch 'master' of git://1984.lsi.us.es/nf

Pablo Neira Ayuso says:

====================
The following patchset contains Netfilter fixes for your net tree,
they are:

* Don't generate audit log message if audit is not enabled, from Gao Feng.

* Fix logging formatting for packets dropped by helpers, by Joe Perches.

* Fix a compilation warning in nfnetlink if CONFIG_PROVE_RCU is not set,
  from Paul Bolle.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nf_conntrack_helper.c diff1 | diff2 | blob | history