Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Browse source

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>

...

This commit is contained in:

David S. Miller 2019-08-14 19:59:00 -07:00

parent 5181b473d6 83c156d3ec

commit 03eb57bb89

3 changed files with 2 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/uapi/linux/netfilter_ipv4/ipt_LOG.h

View file

2

include/uapi/linux/netfilter_ipv6/ip6t_LOG.h

View file

4

net/netfilter/nft_bitwise.c

View file