Merge 5.10.86 into android12-5.10-lts
Changes in 5.10.86 netfilter: selftest: conntrack_vrf.sh: fix file permission Linux 5.10.86 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I31ace031afcbc18862b23c1f64e062bcbf4130a0
This commit is contained in:
2
Makefile
2
Makefile
@@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 5
|
||||
PATCHLEVEL = 10
|
||||
SUBLEVEL = 85
|
||||
SUBLEVEL = 86
|
||||
EXTRAVERSION =
|
||||
NAME = Dare mighty things
|
||||
|
||||
|
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