projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5181b47 83c156d)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
authorDavid S. Miller <davem@davemloft.net>
Thu, 15 Aug 2019 02:59:00 +0000 (19:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Aug 2019 02:59:00 +0000 (19:59 -0700)
commit03eb57bb897f22ba06025ff628a3447520636572
tree703a8880260c76dc43329658f797545edda6c7a2tree | snapshot
parent5181b473d64ee278f24035ce335b89ddc4520fc0commit | diff
parent83c156d3ecc0121d27dc2b7f34e829b265c70c4fcommit | diff
Merge git://git./linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says:

====================
Netfilter updates for net-next

The following patchset contains Netfilter updates for net-next.
This round addresses fallout from previous pull request:

1) Remove #warning from ipt_LOG.h and ip6t_LOG.h headers,
   from Jeremy Sowden.

2) Incorrect parens in memcmp() in nft_bitwise, from Nathan Chancellor.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
John Crispins staging tree