Merge 5.15.9 into android13-5.15

Changes in 5.15.9
	netfilter: selftest: conntrack_vrf.sh: fix file permission
	Linux 5.15.9

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia248681a71667aa39c36482d2807ac19a4637aec
This commit is contained in:
Greg Kroah-Hartman
2021-12-16 15:40:58 +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 = 15
SUBLEVEL = 8
SUBLEVEL = 9
EXTRAVERSION =
NAME = Trick or Treat

0
tools/testing/selftests/netfilter/conntrack_vrf.sh Normal file → Executable file
View File