From: David S. Miller <davem@davemloft.net>
Date: Sun, 24 Jun 2012 00:10:10 +0000 (-0700)
Subject: Merge branch 'master' of git://1984.lsi.us.es/nf-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0b4a9e1a591ca92726d32dbe043eb737734c6a0e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'master' of git://1984.lsi.us.es/nf-next

Pablo says:

====================
The following four patches provide Netfilter fixes for the cthelper
infrastructure that was recently merged mainstream, they are:

* two fixes for compilation breakage with two different configurations:

  - CONFIG_NF_NAT=m and CONFIG_NF_CT_NETLINK=y
  - NF_CONNTRACK_EVENTS=n and CONFIG_NETFILTER_NETLINK_QUEUE_CT=y

* two fixes for sparse warnings.
====================

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

0b4a9e1a591ca92726d32dbe043eb737734c6a0e