5.10-stable patches

added patches:
	usr-include-makefile-add-linux-nfc.h-to-the-compile-test-coverage.patch

diff --git a/queue-5.10/series b/queue-5.10/series
index 9985fddbb7f03937db610c5993d5f9ec18e6adec..3a8c8fd5c48b3f442f0f957ebf0706a87d9d2a3e 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -95,3 +95,4 @@ ipv4-tcp-send-zero-ipid-in-synack-messages.patch
 ipv4-remove-sparse-error-in-ip_neigh_gw4.patch
 net-bridge-vlan-fix-memory-leak-in-__allowed_ingress.patch
 dt-bindings-can-tcan4x5x-fix-mram-cfg-rx-fifo-config.patch
+usr-include-makefile-add-linux-nfc.h-to-the-compile-test-coverage.patch

diff --git a/queue-5.10/usr-include-makefile-add-linux-nfc.h-to-the-compile-test-coverage.patch b/queue-5.10/usr-include-makefile-add-linux-nfc.h-to-the-compile-test-coverage.patch
new file mode 100644 (file)
index 0000000..19a2adf
--- /dev/null
+++ b/queue-5.10/usr-include-makefile-add-linux-nfc.h-to-the-compile-test-coverage.patch
@@ -0,0 +1,32 @@
+From 10756dc5b02bff370ddd351d7744bc99ada659c2 Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Mon, 3 Jan 2022 04:24:02 +0300
+Subject: usr/include/Makefile: add linux/nfc.h to the compile-test coverage
+
+From: Dmitry V. Levin <ldv@altlinux.org>
+
+commit 10756dc5b02bff370ddd351d7744bc99ada659c2 upstream.
+
+As linux/nfc.h userspace compilation was finally fixed by commits
+79b69a83705e ("nfc: uapi: use kernel size_t to fix user-space builds")
+and 7175f02c4e5f ("uapi: fix linux/nfc.h userspace compilation errors"),
+there is no need to keep the compile-test exception for it in
+usr/include/Makefile.
+
+Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ usr/include/Makefile |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/usr/include/Makefile
++++ b/usr/include/Makefile
+@@ -34,7 +34,6 @@ no-header-test += linux/hdlc/ioctl.h
+ no-header-test += linux/ivtv.h
+ no-header-test += linux/kexec.h
+ no-header-test += linux/matroxfb.h
+-no-header-test += linux/nfc.h
+ no-header-test += linux/omap3isp.h
+ no-header-test += linux/omapfb.h
+ no-header-test += linux/patchkey.h