From 510cbf0b1405a585b04d6682af1c40121d451069 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 2 Feb 2019 15:39:12 +0100 Subject: [PATCH] quilt ref on some patches --- ...orm-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch | 9 ++------- ...form-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch | 9 ++------- ...orm-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch | 9 ++------- ...form-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch | 9 ++------- ...orm-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch | 9 ++------- ...form-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch | 9 ++------- ...orm-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch | 9 ++------- ...form-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch | 9 ++------- ...orm-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch | 9 ++------- ...form-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch | 9 ++------- ...orm-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch | 9 ++------- ...form-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch | 9 ++------- 12 files changed, 24 insertions(+), 84 deletions(-) diff --git a/queue-3.18/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch b/queue-3.18/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch index ca8efa1da37..e0f5a77a5f8 100644 --- a/queue-3.18/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch +++ b/queue-3.18/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch @@ -18,14 +18,12 @@ Signed-off-by: João Paulo Rechi Vita Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- - drivers/platform/x86/asus-nb-wmi.c | 2 -- + drivers/platform/x86/asus-nb-wmi.c | 2 -- 1 file changed, 2 deletions(-) -diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index b46a3653e6ab..26a987cf2946 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -312,8 +312,6 @@ static const struct key_entry asus_nb_wmi_keymap[] = { +@@ -312,8 +312,6 @@ static const struct key_entry asus_nb_wm { KE_KEY, 0x30, { KEY_VOLUMEUP } }, { KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, { KE_KEY, 0x32, { KEY_MUTE } }, @@ -34,6 +32,3 @@ index b46a3653e6ab..26a987cf2946 100644 { KE_KEY, 0x35, { KEY_SCREENLOCK } }, { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, --- -2.19.1 - diff --git a/queue-3.18/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch b/queue-3.18/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch index 56367b15816..c3cf6c7ea0f 100644 --- a/queue-3.18/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch +++ b/queue-3.18/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch @@ -24,14 +24,12 @@ Signed-off-by: João Paulo Rechi Vita Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- - drivers/platform/x86/asus-nb-wmi.c | 1 + + drivers/platform/x86/asus-nb-wmi.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index f13b5b95c00f..b46a3653e6ab 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -314,6 +314,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { +@@ -314,6 +314,7 @@ static const struct key_entry asus_nb_wm { KE_KEY, 0x32, { KEY_MUTE } }, { KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */ { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */ @@ -39,6 +37,3 @@ index f13b5b95c00f..b46a3653e6ab 100644 { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, { KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */ --- -2.19.1 - diff --git a/queue-4.14/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch b/queue-4.14/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch index 4108f9bcc97..bdada1272ba 100644 --- a/queue-4.14/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch +++ b/queue-4.14/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch @@ -18,14 +18,12 @@ Signed-off-by: João Paulo Rechi Vita Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- - drivers/platform/x86/asus-nb-wmi.c | 2 -- + drivers/platform/x86/asus-nb-wmi.c | 2 -- 1 file changed, 2 deletions(-) -diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index 2a697bf572c9..9c4b0d7f15c3 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -433,8 +433,6 @@ static const struct key_entry asus_nb_wmi_keymap[] = { +@@ -433,8 +433,6 @@ static const struct key_entry asus_nb_wm { KE_KEY, 0x30, { KEY_VOLUMEUP } }, { KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, { KE_KEY, 0x32, { KEY_MUTE } }, @@ -34,6 +32,3 @@ index 2a697bf572c9..9c4b0d7f15c3 100644 { KE_KEY, 0x35, { KEY_SCREENLOCK } }, { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, --- -2.19.1 - diff --git a/queue-4.14/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch b/queue-4.14/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch index c8fcbfb7ae0..d2ebdaeb8f9 100644 --- a/queue-4.14/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch +++ b/queue-4.14/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch @@ -24,14 +24,12 @@ Signed-off-by: João Paulo Rechi Vita Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- - drivers/platform/x86/asus-nb-wmi.c | 1 + + drivers/platform/x86/asus-nb-wmi.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index a6a33327f5e7..2a697bf572c9 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -435,6 +435,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { +@@ -435,6 +435,7 @@ static const struct key_entry asus_nb_wm { KE_KEY, 0x32, { KEY_MUTE } }, { KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */ { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */ @@ -39,6 +37,3 @@ index a6a33327f5e7..2a697bf572c9 100644 { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, { KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */ --- -2.19.1 - diff --git a/queue-4.19/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch b/queue-4.19/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch index b8aa4f99cd3..3275c8495b5 100644 --- a/queue-4.19/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch +++ b/queue-4.19/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch @@ -18,14 +18,12 @@ Signed-off-by: João Paulo Rechi Vita Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- - drivers/platform/x86/asus-nb-wmi.c | 2 -- + drivers/platform/x86/asus-nb-wmi.c | 2 -- 1 file changed, 2 deletions(-) -diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index 5a00a7665f9b..b6f2ff95c3ed 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -442,8 +442,6 @@ static const struct key_entry asus_nb_wmi_keymap[] = { +@@ -442,8 +442,6 @@ static const struct key_entry asus_nb_wm { KE_KEY, 0x30, { KEY_VOLUMEUP } }, { KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, { KE_KEY, 0x32, { KEY_MUTE } }, @@ -34,6 +32,3 @@ index 5a00a7665f9b..b6f2ff95c3ed 100644 { KE_KEY, 0x35, { KEY_SCREENLOCK } }, { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, --- -2.19.1 - diff --git a/queue-4.19/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch b/queue-4.19/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch index 7958ecb4167..6b4bb7784b5 100644 --- a/queue-4.19/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch +++ b/queue-4.19/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch @@ -24,14 +24,12 @@ Signed-off-by: João Paulo Rechi Vita Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- - drivers/platform/x86/asus-nb-wmi.c | 1 + + drivers/platform/x86/asus-nb-wmi.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index db2af09067db..5a00a7665f9b 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -444,6 +444,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { +@@ -444,6 +444,7 @@ static const struct key_entry asus_nb_wm { KE_KEY, 0x32, { KEY_MUTE } }, { KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */ { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */ @@ -39,6 +37,3 @@ index db2af09067db..5a00a7665f9b 100644 { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, { KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */ --- -2.19.1 - diff --git a/queue-4.20/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch b/queue-4.20/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch index 71ecf5b4327..2b2d23baaa2 100644 --- a/queue-4.20/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch +++ b/queue-4.20/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch @@ -18,14 +18,12 @@ Signed-off-by: João Paulo Rechi Vita Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- - drivers/platform/x86/asus-nb-wmi.c | 2 -- + drivers/platform/x86/asus-nb-wmi.c | 2 -- 1 file changed, 2 deletions(-) -diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index 5a00a7665f9b..b6f2ff95c3ed 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -442,8 +442,6 @@ static const struct key_entry asus_nb_wmi_keymap[] = { +@@ -442,8 +442,6 @@ static const struct key_entry asus_nb_wm { KE_KEY, 0x30, { KEY_VOLUMEUP } }, { KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, { KE_KEY, 0x32, { KEY_MUTE } }, @@ -34,6 +32,3 @@ index 5a00a7665f9b..b6f2ff95c3ed 100644 { KE_KEY, 0x35, { KEY_SCREENLOCK } }, { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, --- -2.19.1 - diff --git a/queue-4.20/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch b/queue-4.20/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch index e18063d74ab..f0ea60ba2b1 100644 --- a/queue-4.20/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch +++ b/queue-4.20/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch @@ -24,14 +24,12 @@ Signed-off-by: João Paulo Rechi Vita Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- - drivers/platform/x86/asus-nb-wmi.c | 1 + + drivers/platform/x86/asus-nb-wmi.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index db2af09067db..5a00a7665f9b 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -444,6 +444,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { +@@ -444,6 +444,7 @@ static const struct key_entry asus_nb_wm { KE_KEY, 0x32, { KEY_MUTE } }, { KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */ { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */ @@ -39,6 +37,3 @@ index db2af09067db..5a00a7665f9b 100644 { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, { KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */ --- -2.19.1 - diff --git a/queue-4.4/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch b/queue-4.4/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch index 1217f3a6de5..4034b240d27 100644 --- a/queue-4.4/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch +++ b/queue-4.4/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch @@ -18,14 +18,12 @@ Signed-off-by: João Paulo Rechi Vita Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- - drivers/platform/x86/asus-nb-wmi.c | 2 -- + drivers/platform/x86/asus-nb-wmi.c | 2 -- 1 file changed, 2 deletions(-) -diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index 2ee8d016fa5c..a284a2b42bcd 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -339,8 +339,6 @@ static const struct key_entry asus_nb_wmi_keymap[] = { +@@ -339,8 +339,6 @@ static const struct key_entry asus_nb_wm { KE_KEY, 0x30, { KEY_VOLUMEUP } }, { KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, { KE_KEY, 0x32, { KEY_MUTE } }, @@ -34,6 +32,3 @@ index 2ee8d016fa5c..a284a2b42bcd 100644 { KE_KEY, 0x35, { KEY_SCREENLOCK } }, { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, --- -2.19.1 - diff --git a/queue-4.4/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch b/queue-4.4/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch index 77babafade5..fb14a31c8bf 100644 --- a/queue-4.4/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch +++ b/queue-4.4/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch @@ -24,14 +24,12 @@ Signed-off-by: João Paulo Rechi Vita Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- - drivers/platform/x86/asus-nb-wmi.c | 1 + + drivers/platform/x86/asus-nb-wmi.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index 852d2de7f69f..2ee8d016fa5c 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -341,6 +341,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { +@@ -341,6 +341,7 @@ static const struct key_entry asus_nb_wm { KE_KEY, 0x32, { KEY_MUTE } }, { KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */ { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */ @@ -39,6 +37,3 @@ index 852d2de7f69f..2ee8d016fa5c 100644 { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, { KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */ --- -2.19.1 - diff --git a/queue-4.9/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch b/queue-4.9/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch index f955d661be5..30c7ed89a85 100644 --- a/queue-4.9/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch +++ b/queue-4.9/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch @@ -18,14 +18,12 @@ Signed-off-by: João Paulo Rechi Vita Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- - drivers/platform/x86/asus-nb-wmi.c | 2 -- + drivers/platform/x86/asus-nb-wmi.c | 2 -- 1 file changed, 2 deletions(-) -diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index d113103fd6af..69ffbd7b76f7 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -477,8 +477,6 @@ static const struct key_entry asus_nb_wmi_keymap[] = { +@@ -477,8 +477,6 @@ static const struct key_entry asus_nb_wm { KE_KEY, 0x30, { KEY_VOLUMEUP } }, { KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, { KE_KEY, 0x32, { KEY_MUTE } }, @@ -34,6 +32,3 @@ index d113103fd6af..69ffbd7b76f7 100644 { KE_KEY, 0x35, { KEY_SCREENLOCK } }, { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, --- -2.19.1 - diff --git a/queue-4.9/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch b/queue-4.9/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch index deb77cead05..409d82f82da 100644 --- a/queue-4.9/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch +++ b/queue-4.9/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch @@ -24,14 +24,12 @@ Signed-off-by: João Paulo Rechi Vita Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- - drivers/platform/x86/asus-nb-wmi.c | 1 + + drivers/platform/x86/asus-nb-wmi.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index c857d2d7bbec..d113103fd6af 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -479,6 +479,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { +@@ -479,6 +479,7 @@ static const struct key_entry asus_nb_wm { KE_KEY, 0x32, { KEY_MUTE } }, { KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */ { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */ @@ -39,6 +37,3 @@ index c857d2d7bbec..d113103fd6af 100644 { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, { KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */ --- -2.19.1 - -- 2.47.2