| 1 |
commit: cd2868872be117fc86f21b69025411d9511ade1b |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 5 22:02:56 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 5 22:02:56 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/toolchain/linux-headers-patches.git/commit/?id=cd286887 |
| 7 |
|
| 8 |
5.18: add 00_all_0003-media-lirc-restore-defines.patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/847886 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
5.18/00_all_0003-media-lirc-restore-defines.patch | 61 +++++++++++++++++++++++ |
| 14 |
1 file changed, 61 insertions(+) |
| 15 |
|
| 16 |
diff --git a/5.18/00_all_0003-media-lirc-restore-defines.patch b/5.18/00_all_0003-media-lirc-restore-defines.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..8a61b41 |
| 19 |
--- /dev/null |
| 20 |
+++ b/5.18/00_all_0003-media-lirc-restore-defines.patch |
| 21 |
@@ -0,0 +1,61 @@ |
| 22 |
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e5499dd7253c8382d03f687f19a854adcc688357 |
| 23 |
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b1c8312c6bd70e2c41f96183936fdb6f4f07cc0e |
| 24 |
+ |
| 25 |
+https://bugs.gentoo.org/847886 |
| 26 |
+ |
| 27 |
+From: Sean Young <sean@××××.org> |
| 28 |
+Date: Wed, 25 May 2022 14:08:30 +0100 |
| 29 |
+Subject: media: lirc: revert removal of unused feature flags |
| 30 |
+ |
| 31 |
+Commit b2a90f4fcb14 ("media: lirc: remove unused lirc features") removed |
| 32 |
+feature flags which were never implemented, but they are still used by |
| 33 |
+the lirc daemon went built from source. |
| 34 |
+ |
| 35 |
+Reinstate these symbols in order not to break the lirc build. |
| 36 |
+ |
| 37 |
+Fixes: b2a90f4fcb14 ("media: lirc: remove unused lirc features") |
| 38 |
+Link: https://lore.kernel.org/all/a0470450-ecfd-2918-e04a-7b57c1fd7694@××××××.org/ |
| 39 |
+Reported-by: Jiri Slaby <jirislaby@××××××.org> |
| 40 |
+Cc: Mauro Carvalho Chehab <mchehab@××××××.org> |
| 41 |
+Signed-off-by: Sean Young <sean@××××.org> |
| 42 |
+Signed-off-by: Linus Torvalds <torvalds@××××××××××××××××.org> |
| 43 |
+--- a/include/uapi/linux/lirc.h |
| 44 |
++++ b/include/uapi/linux/lirc.h |
| 45 |
+@@ -84,6 +84,13 @@ |
| 46 |
+ #define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK) |
| 47 |
+ #define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK) |
| 48 |
+ |
| 49 |
++/* |
| 50 |
++ * Unused features. These features were never implemented, in tree or |
| 51 |
++ * out of tree. These definitions are here so not to break the lircd build. |
| 52 |
++ */ |
| 53 |
++#define LIRC_CAN_SET_REC_FILTER 0 |
| 54 |
++#define LIRC_CAN_NOTIFY_DECODE 0 |
| 55 |
++ |
| 56 |
+ /*** IOCTL commands for lirc driver ***/ |
| 57 |
+ |
| 58 |
+ #define LIRC_GET_FEATURES _IOR('i', 0x00000000, __u32) |
| 59 |
+cgit |
| 60 |
+From: Sean Young <sean@××××.org> |
| 61 |
+Date: Thu, 26 May 2022 08:59:40 +0100 |
| 62 |
+Subject: media: lirc: add missing exceptions for lirc uapi header file |
| 63 |
+ |
| 64 |
+Commit e5499dd7253c ("media: lirc: revert removal of unused feature |
| 65 |
+flags") reintroduced unused feature flags in the lirc uapi header, but |
| 66 |
+failed to reintroduce the necessary exceptions for the docs. |
| 67 |
+ |
| 68 |
+Fixes: e5499dd7253c ("media: lirc: revert removal of unused feature flags") |
| 69 |
+Signed-off-by: Sean Young <sean@××××.org> |
| 70 |
+Signed-off-by: Linus Torvalds <torvalds@××××××××××××××××.org> |
| 71 |
+--- a/Documentation/userspace-api/media/lirc.h.rst.exceptions |
| 72 |
++++ b/Documentation/userspace-api/media/lirc.h.rst.exceptions |
| 73 |
+@@ -30,6 +30,8 @@ ignore define LIRC_CAN_REC |
| 74 |
+ |
| 75 |
+ ignore define LIRC_CAN_SEND_MASK |
| 76 |
+ ignore define LIRC_CAN_REC_MASK |
| 77 |
++ignore define LIRC_CAN_SET_REC_FILTER |
| 78 |
++ignore define LIRC_CAN_NOTIFY_DECODE |
| 79 |
+ |
| 80 |
+ # Obsolete ioctls |
| 81 |
+ |
| 82 |
+cgit |
Archives