Linux v3.18-rc2-106-ga7ca10f263d7

4 files changed, 5 insertions, 82 deletions

diff --git a/HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-00.patch b/HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-00.patch
deleted file mode 100644
index 8ebd1fa1b..000000000
--- a/HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-00.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Adel Gadllah <adel.gadllah@gmail.com>
-Date: Mon, 6 Oct 2014 15:32:01 +0200
-Subject: [PATCH] HID: usbhid: always-poll quirk for Elan Touchscreen 009b
-
-This device needs the quirk as well.
----
- drivers/hid/hid-ids.h           | 1 +
- drivers/hid/usbhid/hid-quirks.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index cd9c9e96cf0e..27fbd138c509 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -298,6 +298,7 @@
- 
- #define USB_VENDOR_ID_ELAN		0x04f3
- #define USB_DEVICE_ID_ELAN_TOUCHSCREEN	0x0089
-+#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B	0x009b
- 
- #define USB_VENDOR_ID_ELECOM		0x056e
- #define USB_DEVICE_ID_ELECOM_BM084	0x0061
-diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
-index f3cb5b0a4345..40aac2158156 100644
---- a/drivers/hid/usbhid/hid-quirks.c
-+++ b/drivers/hid/usbhid/hid-quirks.c
-@@ -71,6 +71,7 @@ static const struct hid_blacklist {
- 	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },
- 	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
- 	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL },
-+	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL },
- 	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
- 	{ USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },
- 	{ USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
--- 
-1.9.3
-
diff --git a/HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-01.patch b/HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-01.patch
deleted file mode 100644
index 15f0e9c2c..000000000
--- a/HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-01.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Adel Gadllah <adel.gadllah@gmail.com>
-Date: Tue, 7 Oct 2014 18:45:09 +0200
-Subject: [PATCH] HID: usbhid: always-poll quirk for Elan Touchscreen 016f
-
-This device needs the quirk as well.
-
-Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com>
----
- drivers/hid/hid-ids.h           | 1 +
- drivers/hid/usbhid/hid-quirks.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index 27fbd138c509..e23ab8b30626 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -299,6 +299,7 @@
- #define USB_VENDOR_ID_ELAN		0x04f3
- #define USB_DEVICE_ID_ELAN_TOUCHSCREEN	0x0089
- #define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B	0x009b
-+#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F	0x016f
- 
- #define USB_VENDOR_ID_ELECOM		0x056e
- #define USB_DEVICE_ID_ELECOM_BM084	0x0061
-diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
-index 40aac2158156..5014bb567b29 100644
---- a/drivers/hid/usbhid/hid-quirks.c
-+++ b/drivers/hid/usbhid/hid-quirks.c
-@@ -72,6 +72,7 @@ static const struct hid_blacklist {
- 	{ USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
- 	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN, HID_QUIRK_ALWAYS_POLL },
- 	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B, HID_QUIRK_ALWAYS_POLL },
-+	{ USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F, HID_QUIRK_ALWAYS_POLL },
- 	{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
- 	{ USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },
- 	{ USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
--- 
-1.9.3
-
diff --git a/kernel.spec b/kernel.spec
index e1b81d358..4a73c1278 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 2
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -606,9 +606,7 @@ Patch26035: nf_reject_ipv4-module-license-unspecified-taints-ker.patch
 
 #rhbz 1149509
 Patch26036: USB-quirks-enable-device-qualifier-quirk-for-another.patch
-Patch26037: HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-00.patch
 Patch26038: USB-quirks-device-qualifier-quirk-for-another-Elan-t.patch
-Patch26039: HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-01.patch
 
 #CVE-2014-8086 rhbz 1151353 1152608
 Patch26056: ext4-fix-race-between-write-and-fcntl-F_SETFL.patch
@@ -1341,9 +1339,7 @@ ApplyPatch nf_reject_ipv4-module-license-unspecified-taints-ker.patch
 
 #rhbz 1149509
 ApplyPatch USB-quirks-enable-device-qualifier-quirk-for-another.patch
-ApplyPatch HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-00.patch
 ApplyPatch USB-quirks-device-qualifier-quirk-for-another-Elan-t.patch
-ApplyPatch HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-01.patch
 
 #CVE-2014-8086 rhbz 1151353 1152608
 ApplyPatch ext4-fix-race-between-write-and-fcntl-F_SETFL.patch
@@ -2229,6 +2225,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Oct 30 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc2.git3.1
+- Linux v3.18-rc2-106-ga7ca10f263d7
+
 * Wed Oct 29 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc2.git2.1
 - Linux v3.18-rc2-53-g9f76628da20f
 
diff --git a/sources b/sources
index c6445a5ea..e1a1baed7 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 fb30d0f29214d75cddd2faa94f73d5cf  linux-3.17.tar.xz
 159e969cbc27201d8e2fa0f609dc722f  perf-man-3.17.tar.gz
 cdc96388a5c70f5f385925caab06db12  patch-3.18-rc2.xz
-277429804d0b4993382f8c6da6e32bc3  patch-3.18-rc2-git2.xz
+997764b2f1f4a94bb11c4f4f19a46c77  patch-3.18-rc2-git3.xz