Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a68bf48 authored Dec 16, 2021 by Greg Kroah-Hartman

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

parents a91f4fe2 c32c40ff

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0		# SPDX-License-Identifier: GPL-2.0
	VERSION = 5		VERSION = 5
	PATCHLEVEL = 4		PATCHLEVEL = 4
	SUBLEVEL = 165		SUBLEVEL = 166
	EXTRAVERSION =		EXTRAVERSION =
	NAME = Kleptomaniac Octopus		NAME = Kleptomaniac Octopus

tools/testing/selftests/netfilter/conntrack_vrf.sh

100644 → 100755

+0 −0

File mode changed from 100644 to 100755.