drop queue-6.0/selftests-vm-use-top_srcdir-instead-of-recomputing-r.patch

diff --git a/queue-6.0/selftests-vm-use-top_srcdir-instead-of-recomputing-r.patch b/queue-6.0/selftests-vm-use-top_srcdir-instead-of-recomputing-r.patch
deleted file mode 100644 (file)
index 0ea1b70..0000000
--- a/queue-6.0/selftests-vm-use-top_srcdir-instead-of-recomputing-r.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 785bb909c3ea8e8a4e94cbf9c2a338ff0a31e6d1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 19 Aug 2022 12:19:29 -0700
-Subject: selftests/vm: use top_srcdir instead of recomputing relative paths
-
-From: Axel Rasmussen <axelrasmussen@google.com>
-
-[ Upstream commit 0e29bc0ebaabf4e5270a23fd5ccce06fac3e140d ]
-
-In various places both in t/t/s/v/Makefile as well as some of the test
-sources, we were referring to headers or directories using some fairly
-long relative paths.
-
-Since we have a working top_srcdir variable though, which refers to the
-root of the kernel tree, we can clean up all of these "up and over"
-relative paths, just relying on the single variable instead.
-
-Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
-Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
-Stable-dep-of: 51d4c851465c ("selftests/cpu-hotplug: Reserve one cpu online at least")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/vm/Makefile    | 2 +-
- tools/testing/selftests/vm/gup_test.c  | 2 +-
- tools/testing/selftests/vm/hmm-tests.c | 4 ++--
- tools/testing/selftests/vm/ksm_tests.c | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile
-index d9fa6a9ea584..d516b8c38eed 100644
---- a/tools/testing/selftests/vm/Makefile
-+++ b/tools/testing/selftests/vm/Makefile
-@@ -25,7 +25,7 @@ MACHINE ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/p
- # LDLIBS.
- MAKEFLAGS += --no-builtin-rules
- 
--CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS) $(KHDR_INCLUDES)
-+CFLAGS = -Wall -I $(top_srcdir) -I $(top_srcdir)/usr/include $(EXTRA_CFLAGS) $(KHDR_INCLUDES)
- LDLIBS = -lrt -lpthread
- TEST_GEN_FILES = compaction_test
- TEST_GEN_FILES += gup_test
-diff --git a/tools/testing/selftests/vm/gup_test.c b/tools/testing/selftests/vm/gup_test.c
-index a309876d832f..e43879291dac 100644
---- a/tools/testing/selftests/vm/gup_test.c
-+++ b/tools/testing/selftests/vm/gup_test.c
-@@ -10,7 +10,7 @@
- #include <sys/types.h>
- #include <pthread.h>
- #include <assert.h>
--#include "../../../../mm/gup_test.h"
-+#include <mm/gup_test.h>
- #include "../kselftest.h"
- 
- #include "util.h"
-diff --git a/tools/testing/selftests/vm/hmm-tests.c b/tools/testing/selftests/vm/hmm-tests.c
-index 529f53b40296..98b949c279be 100644
---- a/tools/testing/selftests/vm/hmm-tests.c
-+++ b/tools/testing/selftests/vm/hmm-tests.c
-@@ -35,8 +35,8 @@
-  * This is a private UAPI to the kernel test module so it isn't exported
-  * in the usual include/uapi/... directory.
-  */
--#include "../../../../lib/test_hmm_uapi.h"
--#include "../../../../mm/gup_test.h"
-+#include <lib/test_hmm_uapi.h>
-+#include <mm/gup_test.h>
- 
- struct hmm_buffer {
-       void            *ptr;
-diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c
-index f5e4e0bbd081..0d85be2350fa 100644
---- a/tools/testing/selftests/vm/ksm_tests.c
-+++ b/tools/testing/selftests/vm/ksm_tests.c
-@@ -11,7 +11,7 @@
- #include <err.h>
- 
- #include "../kselftest.h"
--#include "../../../../include/vdso/time64.h"
-+#include <include/vdso/time64.h>
- #include "util.h"
- 
- #define KSM_SYSFS_PATH "/sys/kernel/mm/ksm/"
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index ccd00fde35e280451181b7f77f0d4479fb514d98..30b1f82f3b67454f4ddf75518c186a64106ff012 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -456,7 +456,6 @@ arm64-ftrace-fix-module-plts-with-mcount.patch
 arm64-dts-exynos-fix-polarity-of-enable-line-of-nfc-.patch
 arm-dts-exynos-fix-polarity-of-vbus-gpio-of-origen.patch
 iomap-iomap-fix-memory-corruption-when-recording-err.patch
-selftests-vm-use-top_srcdir-instead-of-recomputing-r.patch
 selftests-cpu-hotplug-use-return-instead-of-exit.patch
 selftests-cpu-hotplug-delete-fault-injection-related.patch
 selftests-cpu-hotplug-reserve-one-cpu-online-at-leas.patch