Merge 5.4.166 into android11-5.4-lts
Changes in 5.4.166 netfilter: selftest: conntrack_vrf.sh: fix file permission Linux 5.4.166 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I7869a27b2de2889fcbb7bf868288891b6e5c658a
This commit is contained in:
2
Makefile
2
Makefile
@@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 5
|
||||
PATCHLEVEL = 4
|
||||
SUBLEVEL = 165
|
||||
SUBLEVEL = 166
|
||||
EXTRAVERSION =
|
||||
NAME = Kleptomaniac Octopus
|
||||
|
||||
|
||||
0
tools/testing/selftests/netfilter/conntrack_vrf.sh
Normal file → Executable file
0
tools/testing/selftests/netfilter/conntrack_vrf.sh
Normal file → Executable file
Reference in New Issue
Block a user