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:
Greg Kroah-Hartman
2021-12-16 17:16:39 +01:00
2 changed files with 1 additions and 1 deletions

View File

@@ -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
View File