diff --git a/debian/changelog b/debian/changelog
index 3fb9d3523..756cbd794 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -107,7 +107,6 @@ linux (4.19.120-1) UNRELEASED; urgency=medium
     https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.19.120
     - remoteproc: Fix wrong rvring index computation
     - mtd: cfi: fix deadloop in cfi_cmdset_0002.c do_write_buffer
-    - include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap
     - binder: take read mode of mmap_sem in binder_alloc_free_page()
     - usb: dwc3: gadget: Do link recovery for SS and SSP
     - usb: gadget: udc: bdc: Remove unnecessary NULL checks in bdc_req_complete
diff --git a/debian/patches/bugfix/all/include-uapi-linux-swab.h-fix-userspace-breakage-use.patch b/debian/patches/bugfix/all/include-uapi-linux-swab.h-fix-userspace-breakage-use.patch
deleted file mode 100644
index 8912e7b38..000000000
--- a/debian/patches/bugfix/all/include-uapi-linux-swab.h-fix-userspace-breakage-use.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Christian Borntraeger <borntraeger@de.ibm.com>
-Date: Thu, 20 Feb 2020 20:04:03 -0800
-Subject: include/uapi/linux/swab.h: fix userspace breakage, use
- __BITS_PER_LONG for swap
-Origin: https://git.kernel.org/linus/467d12f5c7842896d2de3ced74e4147ee29e97c8
-Bug-Debian: https://bugs.debian.org/960271
-
-QEMU has a funny new build error message when I use the upstream kernel
-headers:
-
-      CC      block/file-posix.o
-    In file included from /home/cborntra/REPOS/qemu/include/qemu/timer.h:4,
-                     from /home/cborntra/REPOS/qemu/include/qemu/timed-average.h:29,
-                     from /home/cborntra/REPOS/qemu/include/block/accounting.h:28,
-                     from /home/cborntra/REPOS/qemu/include/block/block_int.h:27,
-                     from /home/cborntra/REPOS/qemu/block/file-posix.c:30:
-    /usr/include/linux/swab.h: In function `__swab':
-    /home/cborntra/REPOS/qemu/include/qemu/bitops.h:20:34: error: "sizeof" is not defined, evaluates to 0 [-Werror=undef]
-       20 | #define BITS_PER_LONG           (sizeof (unsigned long) * BITS_PER_BYTE)
-          |                                  ^~~~~~
-    /home/cborntra/REPOS/qemu/include/qemu/bitops.h:20:41: error: missing binary operator before token "("
-       20 | #define BITS_PER_LONG           (sizeof (unsigned long) * BITS_PER_BYTE)
-          |                                         ^
-    cc1: all warnings being treated as errors
-    make: *** [/home/cborntra/REPOS/qemu/rules.mak:69: block/file-posix.o] Error 1
-    rm tests/qemu-iotests/socket_scm_helper.o
-
-This was triggered by commit d5767057c9a ("uapi: rename ext2_swab() to
-swab() and share globally in swab.h").  That patch is doing
-
-  #include <asm/bitsperlong.h>
-
-but it uses BITS_PER_LONG.
-
-The kernel file asm/bitsperlong.h provide only __BITS_PER_LONG.
-
-Let us use the __ variant in swap.h
-
-Link: http://lkml.kernel.org/r/20200213142147.17604-1-borntraeger@de.ibm.com
-Fixes: d5767057c9a ("uapi: rename ext2_swab() to swab() and share globally in swab.h")
-Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
-Cc: Yury Norov <yury.norov@gmail.com>
-Cc: Allison Randal <allison@lohutok.net>
-Cc: Joe Perches <joe@perches.com>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: William Breathitt Gray <vilhelm.gray@gmail.com>
-Cc: Torsten Hilbrich <torsten.hilbrich@secunet.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- include/uapi/linux/swab.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
-index fa7f97da5b76..7272f85d6d6a 100644
---- a/include/uapi/linux/swab.h
-+++ b/include/uapi/linux/swab.h
-@@ -135,9 +135,9 @@ static inline __attribute_const__ __u32 __fswahb32(__u32 val)
- 
- static __always_inline unsigned long __swab(const unsigned long y)
- {
--#if BITS_PER_LONG == 64
-+#if __BITS_PER_LONG == 64
- 	return __swab64(y);
--#else /* BITS_PER_LONG == 32 */
-+#else /* __BITS_PER_LONG == 32 */
- 	return __swab32(y);
- #endif
- }
--- 
-2.26.2
-
diff --git a/debian/patches/series b/debian/patches/series
index fd84df1a1..c6a363f9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -100,7 +100,6 @@ bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch
 debian/revert-objtool-fix-config_stack_validation-y-warning.patch
 bugfix/all/mt76-use-the-correct-hweight8-function.patch
 bugfix/all/rtc-s35390a-set-uie_unsupported.patch
-bugfix/all/include-uapi-linux-swab.h-fix-userspace-breakage-use.patch
 bugfix/all/ALSA-pcm-oss-Place-the-plugin-buffer-overflow-checks.patch
 bugfix/all/apparmor-don-t-try-to-replace-stale-label-in-ptracem.patch
 bugfix/all/nfsd-apply-umask-on-fs-without-ACL-support.patch