projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 37198e9 48d072c)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorJakub Kicinski <kuba@kernel.org>
Fri, 9 Oct 2020 19:15:00 +0000 (12:15 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 9 Oct 2020 19:18:16 +0000 (12:18 -0700)
commitd3b2dc9472e1b76661bc381df4e26eaec3c9f2a8
tree657ec0ac707946f0fea97d14b84091363e323fdatree | snapshot
parent37198e93ced70733f0b993dff28b7c33857e254fcommit | diff
parent48d072c4e8cdb542ade06727c31d7851bcc40a89commit | diff
Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

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

The following patchset contains Netfilter selftests fixes from
Fabian Frederick:

1) Extend selftest nft_meta.sh to check for meta cpu.

2) Fix selftest nft_meta.sh error reporting.

3) Fix shellcheck warnings in selftest nft_meta.sh.

4) Extend selftest nft_meta.sh to check for meta time.
====================

Signed-off-by: Jakub Kicinski <kuba@kernel.org>