| commit | 03eb57bb897f22ba06025ff628a3447520636572 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Aug 14 19:59:00 2019 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Wed Aug 14 19:59:00 2019 -0700 |
| tree | 703a8880260c76dc43329658f797545edda6c7a2 | |
| parent | 5181b473d64ee278f24035ce335b89ddc4520fc0 [diff] | |
| parent | 83c156d3ecc0121d27dc2b7f34e829b265c70c4f [diff] |
Merge git://git.kernel.org/pub/scm/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>