From: Greg Kroah-Hartman Date: Wed, 25 Oct 2023 09:02:42 +0000 (+0200) Subject: fix up queue-6.1/hid-input-map-battery-system-charging.patch X-Git-Tag: v4.14.328~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18dcbc6c60be6a465f14acb84c661190bd5af320;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-6.1/hid-input-map-battery-system-charging.patch The Kconfig change was dropped by quilt :( --- diff --git a/queue-6.1/hid-input-map-battery-system-charging.patch b/queue-6.1/hid-input-map-battery-system-charging.patch index 2ac4926975a..da43c2a0fbe 100644 --- a/queue-6.1/hid-input-map-battery-system-charging.patch +++ b/queue-6.1/hid-input-map-battery-system-charging.patch @@ -26,10 +26,11 @@ Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman --- drivers/hid/.kunitconfig | 1 + drivers/hid/Kconfig | 1 drivers/hid/hid-input-test.c | 80 +++++++++++++++++++++++++++++++++++++++++++ drivers/hid/hid-input.c | 36 ++++++++++++++++++- include/linux/hid.h | 2 + - 4 files changed, 117 insertions(+), 2 deletions(-) + 5 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 drivers/hid/hid-input-test.c --- a/drivers/hid/.kunitconfig @@ -41,6 +42,16 @@ Signed-off-by: Greg Kroah-Hartman +CONFIG_HID_BATTERY_STRENGTH=y CONFIG_HID_UCLOGIC=y CONFIG_HID_KUNIT_TEST=y +--- a/drivers/hid/Kconfig ++++ b/drivers/hid/Kconfig +@@ -1263,6 +1263,7 @@ config HID_MCP2221 + config HID_KUNIT_TEST + tristate "KUnit tests for HID" if !KUNIT_ALL_TESTS + depends on KUNIT ++ depends on HID_BATTERY_STRENGTH + depends on HID_UCLOGIC + default KUNIT_ALL_TESTS + help --- /dev/null +++ b/drivers/hid/hid-input-test.c @@ -0,0 +1,80 @@