drop broken selftests patch from 5.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.4/selftests-fix-o-and-kbuild_output-handling-for-relat.patch b/queue-5.4/selftests-fix-o-and-kbuild_output-handling-for-relat.patch
deleted file mode 100644 (file)
index 4ac8198..0000000
--- a/queue-5.4/selftests-fix-o-and-kbuild_output-handling-for-relat.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 708656e3c5fcad36fab328b7849f356702562002 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 14 Oct 2019 19:45:05 -0600
-Subject: selftests: Fix O= and KBUILD_OUTPUT handling for relative paths
-
-From: Shuah Khan <skhan@linuxfoundation.org>
-
-[ Upstream commit 303e6218ecec475d5bc3e5922dec770ee5baf107 ]
-
-Fix O= and KBUILD_OUTPUT handling for relative paths.
-
-export KBUILD_OUTPUT=../kselftest_size
-make TARGETS=size kselftest-all
-
-or
-
-make O=../kselftest_size TARGETS=size kselftest-all
-
-In both of these cases, targets get built in ../kselftest_size which is
-a one level up from the size test directory.
-
-make[1]: Entering directory '/mnt/data/lkml/kselftest_size'
-make --no-builtin-rules INSTALL_HDR_PATH=$BUILD/usr \
-        ARCH=x86 -C ../../.. headers_install
-  INSTALL ../kselftest_size/usr/include
-gcc -static -ffreestanding -nostartfiles -s    get_size.c  -o ../kselftest_size/size/get_size
-/usr/bin/ld: cannot open output file ../kselftest_size/size/get_size: No such file or directory
-collect2: error: ld returned 1 exit status
-make[3]: *** [../lib.mk:138: ../kselftest_size/size/get_size] Error 1
-make[2]: *** [Makefile:143: all] Error 2
-make[1]: *** [/mnt/data/lkml/linux_5.4/Makefile:1221: kselftest-all] Error 2
-make[1]: Leaving directory '/mnt/data/lkml/kselftest_size'
-make: *** [Makefile:179: sub-make] Error 2
-
-Use abs_objtree exported by the main Makefile.
-
-Reported-by: Tim Bird <Tim.Bird@sony.com>
-Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
-Tested-by: Tim Bird <tim.bird@sony.com>
-Acked-by: Tim Bird <tim.bird@sony.com>
-Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
-index 612f6757015d..a3e253e49bb4 100644
---- a/tools/testing/selftests/Makefile
-+++ b/tools/testing/selftests/Makefile
-@@ -86,10 +86,10 @@ override LDFLAGS =
- endif
- 
- ifneq ($(O),)
--      BUILD := $(O)
-+      BUILD := $(abs_objtree)
- else
-       ifneq ($(KBUILD_OUTPUT),)
--              BUILD := $(KBUILD_OUTPUT)/kselftest
-+              BUILD := $(abs_objtree)/kselftest
-       else
-               BUILD := $(shell pwd)
-               DEFAULT_INSTALL_HDR_PATH := 1
-@@ -102,6 +102,7 @@ include $(top_srcdir)/scripts/subarch.include
- ARCH           ?= $(SUBARCH)
- export KSFT_KHDR_INSTALL_DONE := 1
- export BUILD
-+#$(info abd_objtree = $(abs_objtree) BUILD = $(BUILD))
- 
- # build and run gpio when output directory is the src dir.
- # gpio has dependency on tools/gpio and builds tools/gpio
--- 
-2.20.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index e707c4ae9b81241138032028b8c820b644ffaf11..b82dd17c4f8fdedaa66b91ec3c6e48d01c5318cc 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -127,7 +127,6 @@ bluetooth-btusb-avoid-unused-function-warning.patch
 bluetooth-missed-cpu_to_le16-conversion-in-hci_init4.patch
 bluetooth-workaround-directed-advertising-bug-in-bro.patch
 bluetooth-hci_core-fix-init-for-hci_user_channel.patch
-selftests-fix-o-and-kbuild_output-handling-for-relat.patch
 bpf-stackmap-fix-deadlock-with-rq_lock-in-bpf_get_st.patch
 x86-mce-lower-throttling-mce-messages-priority-to-wa.patch
 drm-amd-display-enable-hostvm-based-on-roimmu-active.patch