commit 14655b6d42046a537950bfb0dee371742a3dd1fc Author: Greg Kroah-Hartman Date: Thu Dec 16 15:17:49 2021 +0100 Linux 5.15.9 Signed-off-by: Greg Kroah-Hartman commit 3be0c72f51531ba4cfb4509257e502c1551b6f83 Author: Greg Kroah-Hartman Date: Thu Dec 16 15:15:31 2021 +0100 netfilter: selftest: conntrack_vrf.sh: fix file permission When backporting 33b8aad21ac1 ("selftests: netfilter: add a vrf+conntrack testcase") to this stable branch, the executable bits were not properly set on the tools/testing/selftests/netfilter/conntrack_vrf.sh file due to quilt not honoring them. Fix this up manually by setting the correct mode. Reported-by: "Rantala, Tommi T. (Nokia - FI/Espoo)" Link: https://lore.kernel.org/r/234d7a6a81664610fdf21ac72730f8bd10d3f46f.camel@nokia.com Signed-off-by: Greg Kroah-Hartman