Commit 4f0b8b90 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I31ace031afcbc18862b23c1f64e062bcbf4130a0
parents afc99789 37050f17
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment