projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bcb74e1 33758c8)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
authorDavid S. Miller <davem@davemloft.net>
Mon, 28 Mar 2022 15:57:10 +0000 (08:57 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Mar 2022 15:57:10 +0000 (08:57 -0700)
commit2aa2f88c970783633da3d248ab3df7e15a416eca
tree7d74f1d35ccd72b1af22a8225cba65c42148a146tree | snapshot
parentbcb74e132a76ce0502bb33d5b65533a4ed72d159commit | diff
parent33758c891479ea1c736abfee64b5225925875557commit | diff
Merge git://git./linux/kernel/git/netfilter/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for net:

1) Incorrect output device in nf_egress hook, from Phill Sutter.

2) Preserve liberal flag in TCP conntrack state, reported by Sven Auhagen.

3) Use GFP_KERNEL_ACCOUNT flag for nf_tables objects, from Vasily Averin.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/core.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
MicroBlaze GIT Repository