Commit 0a8aa283 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.166 into android12-5.4-lts 



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

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I3c8e0bc6593bd51f117f1ef4328e5bda417457c1
parents 5355229f c32c40ff
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