Message ID | 20190513095630.32443-1-pablo@netfilter.org |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
From: Pablo Neira Ayuso <pablo@netfilter.org> Date: Mon, 13 May 2019 11:56:17 +0200 > The following patchset contains Netfilter fixes for net: ... > This batch comes with a conflict that can be fixed with this patch: Thanks for this. > You can pull these changes from: > > git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git Pulled, thanks again.
diff --cc include/uapi/linux/netfilter/nf_tables.h index 7bdb234f3d8c,f0cf7b0f4f35..505393c6e959 --- a/include/uapi/linux/netfilter/nf_tables.h