diff --git a/blacklist.conf b/blacklist.conf
index 2134d58..40c3e7f 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -2804,3 +2804,6 @@ f192970de860d3ab90aa9e2a22853201a57bde78 # not needed
 4966babd904d7f8e9e20735f3637a98fd7ca538c # CONFIG_ROSE is not set
 de526f401284e1638d4c97cb5a4c292ac3f37655 # not needed
 0e5a82efda872c2469c210957d7d4161ef8f4391 # not needed
+4b9880dbf3bdba3a7c56445137c3d0e30aaa0a40 # not needed with downstream version of patch
+07b050f9290ee012a407a0f64151db902a1520f5 # not needed with downstream version of patch
+a494398bde273143c2352dd373cad8211f7d94b2 # not needed with downstream version of patch
diff --git a/patches.suse/arm64-Discard-.note.GNU-stack-section.patch b/patches.suse/arm64-Discard-.note.GNU-stack-section.patch
index d51fdec..3812125 100644
--- a/patches.suse/arm64-Discard-.note.GNU-stack-section.patch
+++ b/patches.suse/arm64-Discard-.note.GNU-stack-section.patch
@@ -7,6 +7,14 @@ Git-commit: 99cb0d917ffa1ab628bb67364ca9b162c07699b1 (partial - arm64 only)
 Patch-mainline: v6.2-rc2
 References: bsc#1203693 bsc#1209798
 
+Note: the more general upstream solution requires at least
+
+4b9880dbf3bd powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT
+07b050f9290e powerpc/vmlinux.lds: Don't discard .rela* for relocatable builds
+a494398bde27 s390: define RUNTIME_DISCARD_EXIT to fix link error with GNU ld < 2.36
+
+which are not applicable to the 4.12 kernel
+
 Commit "Makefile: link with -z noexecstack --no-warn-rwx-segments: ddbd47d2219a"
 creates a new section .note.GNU-stack, which is not discarded by arm64.
 This changes the ELF layout and causes the build to fail on arm64.