Linux v3.17-rc4-168-g7ec62d421bdf

- Add support for touchpad in Asus X450 and X550 (rhbz 1110011)

ACPI-Limit-access-to-custom_method.patch

@@ -1,4 +1,4 @@
-From 57f1fb51c058251da703d9a71718d0906440bffa Mon Sep 17 00:00:00 2001
+From e6c0abbf82f22bd0b09ce25252bc261aa6bb0be0 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 9 Mar 2012 08:39:37 -0500
 Subject: [PATCH] ACPI: Limit access to custom_method

ARM-tegra-usb-no-reset.patch

@@ -1,4 +1,4 @@
-From b5826551ddd4011eb77731e91c01822fc2e08d09 Mon Sep 17 00:00:00 2001
+From 439fda1c9c225c9a49eda75afaa2d215aac9a3e1 Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
 Date: Thu, 3 May 2012 20:27:11 +0100
 Subject: [PATCH] ARM: tegra: usb no reset

Add-EFI-signature-data-types.patch

@@ -1,4 +1,4 @@
-From 04a31f958e3d13dd5f45d06f361e30b1715bdb6c Mon Sep 17 00:00:00 2001
+From f542de08efd84a94534cddcbb3b8f7d4b8ed6d4a Mon Sep 17 00:00:00 2001
 From: Dave Howells <dhowells@redhat.com>
 Date: Tue, 23 Oct 2012 09:30:54 -0400
 Subject: [PATCH] Add EFI signature data types

Add-an-EFI-signature-blob-parser-and-key-loader.patch

@@ -1,4 +1,4 @@
-From b4f350a3833e72810c1ed0cec005bb8445ad8eff Mon Sep 17 00:00:00 2001
+From 897d537d1a0649fef89d571b82c5cc0240ff681b Mon Sep 17 00:00:00 2001
 From: Dave Howells <dhowells@redhat.com>
 Date: Tue, 23 Oct 2012 09:36:28 -0400
 Subject: [PATCH] Add an EFI signature blob parser and key loader.

Add-option-to-automatically-enforce-module-signature.patch

@@ -1,4 +1,4 @@
-From 8adf5b7967a5f2510328bc60f1def5b86443362c Mon Sep 17 00:00:00 2001
+From e17b29e90f188888a56d090e1a672d7a38042254 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 9 Aug 2013 18:36:30 -0400
 Subject: [PATCH] Add option to automatically enforce module signatures when in

Add-secure_modules-call.patch

@@ -1,4 +1,4 @@
-From 92c22076c79a1ed760d777ddfe8e18d0340fe70c Mon Sep 17 00:00:00 2001
+From 908980155054138fcc42a3ecbb93c9d5edab1706 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 9 Aug 2013 17:58:15 -0400
 Subject: [PATCH] Add secure_modules() call

Add-sysrq-option-to-disable-secure-boot-mode.patch

@@ -1,4 +1,4 @@
-From d89260a4671edda6120b2c7ab9ccdafb6c0d2c95 Mon Sep 17 00:00:00 2001
+From 991c8a5e0b2f5593b30dbd4447bbc7f7bfe14482 Mon Sep 17 00:00:00 2001
 From: Kyle McMartin <kyle@redhat.com>
 Date: Fri, 30 Aug 2013 09:28:51 -0400
 Subject: [PATCH] Add sysrq option to disable secure boot mode

HID-wacom-Add-support-for-the-Cintiq-Companion.patch

@@ -1,4 +1,4 @@
-From 440dd9de931d6a8fcd30a087f5e7ffbb44f7403d Mon Sep 17 00:00:00 2001
+From df44ff63ac6d9e33621d195a56e337855bbd5a53 Mon Sep 17 00:00:00 2001
 From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
 Date: Wed, 3 Sep 2014 15:43:25 -0400
 Subject: [PATCH] HID: wacom: Add support for the Cintiq Companion

KEYS-Add-a-system-blacklist-keyring.patch

@@ -1,4 +1,4 @@
-From b352a01ca07c97eb4672dedb4ddeffaf877d74d2 Mon Sep 17 00:00:00 2001
+From c61238d82302fd457bc93838519aa19c40940e44 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Fri, 26 Oct 2012 12:36:24 -0400
 Subject: [PATCH] KEYS: Add a system blacklist keyring

KEYS-Fix-termination-condition-in-assoc-array-garbag.patch

@@ -1,4 +1,4 @@
-From 11646ff9e6874d205ab92af605db6b90fbe214d1 Mon Sep 17 00:00:00 2001
+From 0d0f2dc88164691b2e418f2c390ac93cbd348f2c Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 9 Sep 2014 19:12:32 +0100
 Subject: [PATCH] KEYS: Fix termination condition in assoc array garbage

MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch

@@ -1,4 +1,4 @@
-From cfc1daa3aa8842a148ed18cd2c0ae5d631b40446 Mon Sep 17 00:00:00 2001
+From c3fbfdc928c9c0dd9e111c205a7d76c7ddc61104 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Fri, 26 Oct 2012 12:42:16 -0400
 Subject: [PATCH] MODSIGN: Import certificates from UEFI Secure Boot

MODSIGN-Support-not-importing-certs-from-db.patch

@@ -1,4 +1,4 @@
-From dcd44df09553badbe5454af793c55b53cd320481 Mon Sep 17 00:00:00 2001
+From 405fe490bc7d31ff55d7f2bc76fcd95ae7421279 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Thu, 3 Oct 2013 10:14:23 -0400
 Subject: [PATCH] MODSIGN: Support not importing certs from db

PCI-Lock-down-BAR-access-when-module-security-is-ena.patch

@@ -1,4 +1,4 @@
-From 0aa239528b0bd13d924a0415716ad7acd10096e0 Mon Sep 17 00:00:00 2001
+From 3bfb092c81555c8a8ac43c15b40c5dbdfda9618a Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Thu, 8 Mar 2012 10:10:38 -0500
 Subject: [PATCH] PCI: Lock down BAR access when module security is enabled

Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch

@@ -1,4 +1,4 @@
-From 0a85a61492fa622f592766882275e8ddf5d423fc Mon Sep 17 00:00:00 2001
+From fb4d0d3e5dc1e8e032a984a274e22084303f6240 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 9 Mar 2012 09:28:15 -0500
 Subject: [PATCH] Restrict /dev/mem and /dev/kmem when module loading is

Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch

@@ -1,4 +1,4 @@
-From 81373f60218537d4b7f03077e74394059bdaacc4 Mon Sep 17 00:00:00 2001
+From 15a9aeed44921a3edd15193c865f456e463e585b Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Mon, 28 Jul 2014 12:59:48 -0400
 Subject: [PATCH] Revert "Revert "ACPI / video: change acpi-video

acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch

@@ -1,4 +1,4 @@
-From 6c2e4f730cda97d6ec8927a3128d77a767ba6a21 Mon Sep 17 00:00:00 2001
+From eb64ed0e91192492d8b248cfad697485dec74792 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@redhat.com>
 Date: Mon, 25 Jun 2012 19:57:30 -0400
 Subject: [PATCH] acpi: Ignore acpi_rsdp kernel parameter when module loading

acpi-video-Add-4-new-models-to-the-use_native_backli.patch

@@ -1,4 +1,4 @@
-From 330e3a9926c06a8a2750f0507323fea185af5557 Mon Sep 17 00:00:00 2001
+From a480bbb049bee159bf8a5b360b05835f35984649 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Wed, 30 Apr 2014 15:24:19 +0200
 Subject: [PATCH] acpi-video: Add 4 new models to the use_native_backlight dmi

acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch

@@ -1,4 +1,4 @@
-From 638ed23d3cd7dbc2f4925a9331ab66fdfa07784d Mon Sep 17 00:00:00 2001
+From 38eb85d9da568004a5d3b31547cdd3e7c22d21b3 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Mon, 2 Jun 2014 17:41:10 +0200
 Subject: [PATCH] acpi-video: Add use native backlight quirk for the ThinkPad

acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch

@@ -1,4 +1,4 @@
-From d83b2fced6e4935df3887c7e384abcb41779b546 Mon Sep 17 00:00:00 2001
+From b14b02efe2b97cad6653df77a720b6f08b8eb4fe Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Mon, 2 Jun 2014 17:41:11 +0200
 Subject: [PATCH] acpi-video: Add use_native_backlight quirk for HP ProBook

arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch

@@ -1,4 +1,4 @@
-From 81dd19dc3008b526142686b936432d8de39bad63 Mon Sep 17 00:00:00 2001
+From d48c4da4a05936abf30c9273b4b86c6767e7ae9b Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Thu, 13 Mar 2014 14:18:52 -0500
 Subject: [PATCH] arm: dts: am335x-bone-common: add

arm-dts-am335x-bone-common-enable-and-use-i2c2.patch

@@ -1,4 +1,4 @@
-From e9e0ae4dd9b33053445379968ddcc03fc4a0a577 Mon Sep 17 00:00:00 2001
+From bc08a846925536bcc3d2b9d3b02b2d1e5325e03f Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Tue, 31 Dec 2013 11:17:45 -0600
 Subject: [PATCH] arm: dts: am335x-bone-common: enable and use i2c2

arm-dts-am335x-bone-common-setup-default-pinmux-http.patch

@@ -1,4 +1,4 @@
-From 8f39469b3a48061cc97de9624b5ad773a372823b Mon Sep 17 00:00:00 2001
+From 13a91c75b6a21ccbfaf07022b7ddd52e0f90d4a5 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Tue, 31 Dec 2013 14:18:00 -0600
 Subject: [PATCH] arm: dts: am335x-bone-common: setup default pinmux

arm-dts-am335x-boneblack-add-cpu0-opp-points.patch

@@ -1,4 +1,4 @@
-From 5abe6db4473c75235188e2615e2e933486c0d62e Mon Sep 17 00:00:00 2001
+From 117a87462050181a1b8924282dcc8e1205e27042 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Fri, 27 Dec 2013 13:14:19 -0600
 Subject: [PATCH] arm: dts: am335x-boneblack: add cpu0 opp points

arm-dts-am335x-boneblack-lcdc-add-panel-info.patch

@@ -1,4 +1,4 @@
-From 0a5ea7af7a06d8b40a6116c3900062d5fcbf9cb1 Mon Sep 17 00:00:00 2001
+From 1bc7a37e9fc5fc70752c096f6e0019a406f8f8fb Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Fri, 27 Dec 2013 13:05:09 -0600
 Subject: [PATCH] arm: dts: am335x-boneblack: lcdc add panel-info

arm-i.MX6-Utilite-device-dtb.patch

@@ -1,4 +1,4 @@
-From 6165c84f32ada74dd0c059a4732a63fbe51ec93f Mon Sep 17 00:00:00 2001
+From f0dbee7301c01b8cadae4710ac11e87c37daa93b Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
 Date: Fri, 11 Jul 2014 00:10:56 +0100
 Subject: [PATCH] arm: i.MX6 Utilite device dtb

asus-wmi-Restrict-debugfs-interface-when-module-load.patch

@@ -1,4 +1,4 @@
-From adfeadcab5e7f01cbbd0fb3653a0d2721cdaeb5a Mon Sep 17 00:00:00 2001
+From 068413f1985caf4eabab9223b1652be0492a1c97 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 9 Mar 2012 08:46:50 -0500
 Subject: [PATCH] asus-wmi: Restrict debugfs interface when module loading is

ath9k-rx-dma-stop-check.patch

@@ -1,4 +1,4 @@
-From 1ba3576c5396f24b860cb26f59f86c23160527f0 Mon Sep 17 00:00:00 2001
+From 53b8698d406d7952fb5e11f78ea0189176388927 Mon Sep 17 00:00:00 2001
 From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
 Date: Wed, 6 Feb 2013 09:57:47 -0500
 Subject: [PATCH] ath9k: rx dma stop check

crash-driver.patch

@@ -1,4 +1,4 @@
-From 692c0562c55a368bc666d462eade4e98d50040ca Mon Sep 17 00:00:00 2001
+From 4ba0bdd25fd90af59ad1bfff33ee345bd351d097 Mon Sep 17 00:00:00 2001
 From: Dave Anderson <anderson@redhat.com>
 Date: Tue, 26 Nov 2013 12:42:46 -0500
 Subject: [PATCH] crash-driver

criu-no-expert.patch

@@ -1,4 +1,4 @@
-From c54d5f38b0d1efa7d2822b24ba8100338cee42da Mon Sep 17 00:00:00 2001
+From d356a175ae641faeb86fdf593d439182d84a8e55 Mon Sep 17 00:00:00 2001
 From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
 Date: Wed, 30 Jan 2013 10:55:31 -0500
 Subject: [PATCH] criu: no expert

die-floppy-die.patch

@@ -1,4 +1,4 @@
-From b4a0896742321ea5d9b2c5cb43ad86f64b34bce3 Mon Sep 17 00:00:00 2001
+From 7f9282e584ddef60075f792231498603f949ca9e Mon Sep 17 00:00:00 2001
 From: Kyle McMartin <kyle@phobos.i.jkkm.org>
 Date: Tue, 30 Mar 2010 00:04:29 -0400
 Subject: [PATCH] die-floppy-die

disable-i8042-check-on-apple-mac.patch

@@ -1,4 +1,4 @@
-From a9342ec3b8cb2b229754e19b0ac78275d2407be0 Mon Sep 17 00:00:00 2001
+From efa1cf079f0a5ba7d66cd4a2730d8697751c5f0e Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess@hadess.net>
 Date: Thu, 20 May 2010 10:30:31 -0400
 Subject: [PATCH] disable i8042 check on apple mac

disable-libdw-unwind-on-non-x86.patch

@@ -1,4 +1,4 @@
-From 45047d94152b3dc0484c699cecc2413a9eccda63 Mon Sep 17 00:00:00 2001
+From 2a6e37841e39b2309eb207fd1a964335076c8109 Mon Sep 17 00:00:00 2001
 From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
 Date: Fri, 18 Apr 2014 06:58:29 -0400
 Subject: [PATCH] disable libdw unwind on non-x86

drm-i915-hush-check-crtc-state.patch

@@ -1,4 +1,4 @@
-From b89bd5713fe8707cbe05a98d5c1d77d7e36c4339 Mon Sep 17 00:00:00 2001
+From a0438a3fdf85b9d0a09530738246e99cf332347d Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax@redhat.com>
 Date: Wed, 13 Nov 2013 10:17:24 -0500
 Subject: [PATCH] drm/i915: hush check crtc state

efi-Add-EFI_SECURE_BOOT-bit.patch

@@ -1,4 +1,4 @@
-From caa7d37fda4cff429ba2a7e409d51c95392cfdbd Mon Sep 17 00:00:00 2001
+From 3c01b1007e32dd8d72afc1992e48da1906b76653 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Tue, 27 Aug 2013 13:33:03 -0400
 Subject: [PATCH] efi: Add EFI_SECURE_BOOT bit

efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch

@@ -1,4 +1,4 @@
-From e977e62d874a026f9c5c33b29795c5f624ca1aff Mon Sep 17 00:00:00 2001
+From c574f3260cbb57221f9cb26e0efccbd791c053ea Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Tue, 5 Feb 2013 19:25:05 -0500
 Subject: [PATCH] efi: Disable secure boot if shim is in insecure mode

efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch

@@ -1,4 +1,4 @@
-From 5a8c04c87c790396adb7b0d97df343c7a556b86e Mon Sep 17 00:00:00 2001
+From 65d036f5b366872c07631dee2a5444b143f28999 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Tue, 27 Aug 2013 13:28:43 -0400
 Subject: [PATCH] efi: Make EFI_SECURE_BOOT_SIG_ENFORCE depend on EFI

hibernate-Disable-in-a-signed-modules-environment.patch

@@ -1,4 +1,4 @@
-From aa9f4f7627f847de2d733e8bf8ea2c674275f70a Mon Sep 17 00:00:00 2001
+From 9313f63f285d4f91123aee8dff009a7aac115680 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Fri, 20 Jun 2014 08:53:24 -0400
 Subject: [PATCH] hibernate: Disable in a signed modules environment

i8042-Also-store-the-aux-firmware-id-in-multi-plexed.patch

@@ -0,0 +1,32 @@
+From ef15224bce9875f9a5fbc93a2823219df6936a18 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 30 Jul 2014 17:56:05 +0200
+Subject: [PATCH] i8042: Also store the aux firmware id in multi-plexed aux
+ ports
+
+So that firmware-id matching can be used with multiplexed aux ports too.
+
+Bugzilla: 1110011
+Upstream-status: sent for 3.17/3.18
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/input/serio/i8042.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
+index f1aeb0240d6e..4b5015f27f9e 100644
+--- a/drivers/input/serio/i8042.c
++++ b/drivers/input/serio/i8042.c
+@@ -1253,6 +1253,8 @@ static int __init i8042_create_aux_port(int idx)
+ 	} else {
+ 		snprintf(serio->name, sizeof(serio->name), "i8042 AUX%d port", idx);
+ 		snprintf(serio->phys, sizeof(serio->phys), I8042_MUX_PHYS_DESC, idx + 1);
++		strlcpy(serio->firmware_id, i8042_aux_firmware_id,
++			sizeof(serio->firmware_id));
+ 	}
+ 
+ 	port->serio = serio;
+-- 
+1.9.3
+

input-kill-stupid-messages.patch

@@ -1,4 +1,4 @@
-From 0ee3b7cbfbc534c081941bb638f0079e11810e53 Mon Sep 17 00:00:00 2001
+From 133140e12fc5d70ec6d355f2a0ce634e740018f0 Mon Sep 17 00:00:00 2001
 From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
 Date: Thu, 29 Jul 2010 16:46:31 -0700
 Subject: [PATCH] input: kill stupid messages

input-silence-i8042-noise.patch

@@ -1,4 +1,4 @@
-From 9feeadc3375b54bce949cb29b8582142f2c076ec Mon Sep 17 00:00:00 2001
+From 6d6ce59ecccf005601fe5616038ff2ffb1a311a2 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 25 Sep 2008 16:23:33 -0400
 Subject: [PATCH] input: silence i8042 noise

kbuild-AFTER_LINK.patch

@@ -1,4 +1,4 @@
-From 215e2a2e84e72884521a8bf0cd1e2e4a388021e8 Mon Sep 17 00:00:00 2001
+From 1815a8a179fce6539886dc5fc29ea8265cb9e389 Mon Sep 17 00:00:00 2001
 From: Roland McGrath <roland@redhat.com>
 Date: Mon, 6 Oct 2008 23:03:03 -0700
 Subject: [PATCH] kbuild: AFTER_LINK

kernel.spec

@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 4
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -615,6 +615,11 @@ Patch26016: HID-wacom-Add-support-for-the-Cintiq-Companion.patch
 #rhbz 1116347
 Patch26017: KEYS-Fix-termination-condition-in-assoc-array-garbag.patch
 
+#rhbz 1110011
+Patch26018: i8042-Also-store-the-aux-firmware-id-in-multi-plexed.patch
+Patch26019: psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
+Patch26020: psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
+
 # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
 Patch30000: kernel-arm64.patch
 
@@ -1341,6 +1346,11 @@ ApplyPatch HID-wacom-Add-support-for-the-Cintiq-Companion.patch
 #rhbz 1116347
 ApplyPatch KEYS-Fix-termination-condition-in-assoc-array-garbag.patch
 
+#rhbz 1110011
+ApplyPatch i8042-Also-store-the-aux-firmware-id-in-multi-plexed.patch
+ApplyPatch psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
+ApplyPatch psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
+
 %if 0%{?aarch64patches}
 ApplyPatch kernel-arm64.patch
 %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2209,6 +2219,10 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Sep 11 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git3.1
+- Linux v3.17-rc4-168-g7ec62d421bdf
+- Add support for touchpad in Asus X450 and X550 (rhbz 1110011)
+
 * Wed Sep 10 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git2.1
 - Linux v3.17-rc4-158-ge874a5fe3efa
 - Add patch to fix oops on keyring gc (rhbz 1116347)

kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch

@@ -1,4 +1,4 @@
-From b0d3311bdba8183d94670473d980bd49a28f974d Mon Sep 17 00:00:00 2001
+From a1edeae1e9dafa2f056cd81a269e6dfebbf130f8 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 9 Aug 2013 03:33:56 -0400
 Subject: [PATCH] kexec: Disable at runtime if the kernel enforces module

lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch

@@ -1,4 +1,4 @@
-From 985a130cf970c711d5a913a56a1e71956ef44230 Mon Sep 17 00:00:00 2001
+From f8a974af9beabaf9268adf202a37e061df891dee Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Mon, 11 Nov 2013 08:39:16 -0500
 Subject: [PATCH] lib/cpumask: Make CPUMASK_OFFSTACK usable without debug

lis3-improve-handling-of-null-rate.patch

@@ -1,4 +1,4 @@
-From dfa60efe146c7a6dc65b05034bc74eae3a3df695 Mon Sep 17 00:00:00 2001
+From 1713c29746e1297c9ccac0f74bf95c6e9032cfe8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C3=89ric=20Piel?= <eric.piel@tremplin-utc.net>
 Date: Thu, 3 Nov 2011 16:22:40 +0100
 Subject: [PATCH] lis3: improve handling of null rate

nfs-fix-kernel-warning-when-removing-proc-entry.patch

@@ -1,4 +1,4 @@
-From 2987bec40b0fc6c81915329515fb298291bb37d2 Mon Sep 17 00:00:00 2001
+From e4341a0fbee8579d6bde57c1ae9f60242bcb34c4 Mon Sep 17 00:00:00 2001
 From: Cong Wang <xiyou.wangcong@gmail.com>
 Date: Sat, 16 Aug 2014 12:36:46 -0700
 Subject: [PATCH] nfs: fix kernel warning when removing proc entry

no-pcspkr-modalias.patch

@@ -1,4 +1,4 @@
-From 3ab58afed04ef5c2aaf938133f6f5208611ecea4 Mon Sep 17 00:00:00 2001
+From 0c1ad86140d76d51b5961cd463d8823ba54fa513 Mon Sep 17 00:00:00 2001
 From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
 Date: Thu, 29 Jul 2010 16:46:31 -0700
 Subject: [PATCH] no pcspkr modalias

perf-install-trace-event-plugins.patch

@@ -1,4 +1,4 @@
-From 22880ec9d245cff19f3ac3c43be86e03baa02a4d Mon Sep 17 00:00:00 2001
+From 18a3e717512b064596f079025c3580f3f85ecef5 Mon Sep 17 00:00:00 2001
 From: Kyle McMartin <kmcmarti@redhat.com>
 Date: Mon, 2 Jun 2014 15:11:01 -0400
 Subject: [PATCH] perf: install trace-event plugins

pinctrl-pinctrl-single-must-be-initialized-early.patch

@@ -1,4 +1,4 @@
-From a234ffaffa66fed8e89e4c7456515468489ea177 Mon Sep 17 00:00:00 2001
+From 9acb8faef92b6bcc03f2e66dfa9b5f3a91ec501d Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <panto@antoniou-consulting.com>
 Date: Sat, 15 Sep 2012 12:00:41 +0300
 Subject: [PATCH] pinctrl: pinctrl-single must be initialized early.

psmouse-Add-psmouse_matches_pnp_id-helper-function.patch

@@ -0,0 +1,100 @@
+From d0d1fbdb2d34a669ffbec814893696909381ac0e Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Fri, 27 Jun 2014 18:46:42 +0200
+Subject: [PATCH] psmouse: Add psmouse_matches_pnp_id helper function
+
+The matches_pnp_id function from the synaptics driver is useful for other
+drivers too. Make it a generic psmouse helper function.
+
+Bugzilla: 1110011
+Upstream-status: sent for 3.17/3.18
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/input/mouse/psmouse-base.c | 14 ++++++++++++++
+ drivers/input/mouse/psmouse.h      |  1 +
+ drivers/input/mouse/synaptics.c    | 17 +++--------------
+ 3 files changed, 18 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
+index cff065f6261c..bc1bc2653f15 100644
+--- a/drivers/input/mouse/psmouse-base.c
++++ b/drivers/input/mouse/psmouse-base.c
+@@ -462,6 +462,20 @@ static int psmouse_poll(struct psmouse *psmouse)
+ 			   PSMOUSE_CMD_POLL | (psmouse->pktsize << 8));
+ }
+ 
++/*
++ * psmouse_matches_pnp_id - check if psmouse matches one of the passed in ids.
++ */
++bool psmouse_matches_pnp_id(struct psmouse *psmouse, const char * const ids[])
++{
++	int i;
++
++	if (!strncmp(psmouse->ps2dev.serio->firmware_id, "PNP:", 4))
++		for (i = 0; ids[i]; i++)
++			if (strstr(psmouse->ps2dev.serio->firmware_id, ids[i]))
++				return true;
++
++	return false;
++}
+ 
+ /*
+  * Genius NetMouse magic init.
+diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
+index 2f0b39d59a9b..f4cf664c7db3 100644
+--- a/drivers/input/mouse/psmouse.h
++++ b/drivers/input/mouse/psmouse.h
+@@ -108,6 +108,7 @@ void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution);
+ psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse);
+ int psmouse_activate(struct psmouse *psmouse);
+ int psmouse_deactivate(struct psmouse *psmouse);
++bool psmouse_matches_pnp_id(struct psmouse *psmouse, const char * const ids[]);
+ 
+ struct psmouse_attribute {
+ 	struct device_attribute dattr;
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index e8573c68f77e..854caca6e86e 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -185,18 +185,6 @@ static const char * const topbuttonpad_pnp_ids[] = {
+ 	NULL
+ };
+ 
+-static bool matches_pnp_id(struct psmouse *psmouse, const char * const ids[])
+-{
+-	int i;
+-
+-	if (!strncmp(psmouse->ps2dev.serio->firmware_id, "PNP:", 4))
+-		for (i = 0; ids[i]; i++)
+-			if (strstr(psmouse->ps2dev.serio->firmware_id, ids[i]))
+-				return true;
+-
+-	return false;
+-}
+-
+ /*****************************************************************************
+  *	Synaptics communications functions
+  ****************************************************************************/
+@@ -362,7 +350,8 @@ static int synaptics_resolution(struct psmouse *psmouse)
+ 	}
+ 
+ 	for (i = 0; min_max_pnpid_table[i].pnp_ids; i++) {
+-		if (matches_pnp_id(psmouse, min_max_pnpid_table[i].pnp_ids)) {
++		if (psmouse_matches_pnp_id(psmouse,
++					   min_max_pnpid_table[i].pnp_ids)) {
+ 			priv->x_min = min_max_pnpid_table[i].x_min;
+ 			priv->x_max = min_max_pnpid_table[i].x_max;
+ 			priv->y_min = min_max_pnpid_table[i].y_min;
+@@ -1456,7 +1445,7 @@ static void set_input_params(struct psmouse *psmouse,
+ 
+ 	if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
+ 		__set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
+-		if (matches_pnp_id(psmouse, topbuttonpad_pnp_ids))
++		if (psmouse_matches_pnp_id(psmouse, topbuttonpad_pnp_ids))
+ 			__set_bit(INPUT_PROP_TOPBUTTONPAD, dev->propbit);
+ 		/* Clickpads report only left button */
+ 		__clear_bit(BTN_RIGHT, dev->keybit);
+-- 
+1.9.3
+

psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch

@@ -0,0 +1,158 @@
+From 4ab16f30317966f892342e8821a6dc26070d1a06 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Fri, 27 Jun 2014 18:50:33 +0200
+Subject: [PATCH] psmouse: Add support for detecting FocalTech PS/2 touchpads
+
+The Asus X450 and X550 laptops use a PS/2 touchpad from a new manufacturer
+called FocalTech:
+
+https://bugzilla.kernel.org/show_bug.cgi?id=77391
+https://bugzilla.redhat.com/show_bug.cgi?id=1110011
+
+The protocol for these devices is not known at this time, but even without
+knowing the protocol they need some special handling. They get upset by some
+of our other PS/2 device probing, and once upset generate random mouse events
+making things unusable even with an external mouse.
+
+This patch adds detection of these devices based on their pnp ids, and when
+they are detected, treats them as a bare ps/2 mouse. Doing things this way
+they at least work in their ps/2 mouse emulation mode.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/input/mouse/Makefile       |  2 +-
+ drivers/input/mouse/focaltech.c    | 44 ++++++++++++++++++++++++++++++++++++++
+ drivers/input/mouse/focaltech.h    | 21 ++++++++++++++++++
+ drivers/input/mouse/psmouse-base.c | 10 +++++++++
+ 4 files changed, 76 insertions(+), 1 deletion(-)
+ create mode 100644 drivers/input/mouse/focaltech.c
+ create mode 100644 drivers/input/mouse/focaltech.h
+
+diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
+index c25efdb3f288..dda507f8b3a2 100644
+--- a/drivers/input/mouse/Makefile
++++ b/drivers/input/mouse/Makefile
+@@ -23,7 +23,7 @@ obj-$(CONFIG_MOUSE_SYNAPTICS_I2C)	+= synaptics_i2c.o
+ obj-$(CONFIG_MOUSE_SYNAPTICS_USB)	+= synaptics_usb.o
+ obj-$(CONFIG_MOUSE_VSXXXAA)		+= vsxxxaa.o
+ 
+-psmouse-objs := psmouse-base.o synaptics.o
++psmouse-objs := psmouse-base.o synaptics.o focaltech.o
+ 
+ psmouse-$(CONFIG_MOUSE_PS2_ALPS)	+= alps.o
+ psmouse-$(CONFIG_MOUSE_PS2_ELANTECH)	+= elantech.o
+diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
+new file mode 100644
+index 000000000000..d83a23554d63
+--- /dev/null
++++ b/drivers/input/mouse/focaltech.c
+@@ -0,0 +1,44 @@
++/*
++ * Focaltech TouchPad PS/2 mouse driver
++ *
++ * Copyright (c) 2014 Red Hat Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * Red Hat authors:
++ *
++ * Hans de Goede <hdegoede@redhat.com>
++ */
++
++/*
++ * The Focaltech PS/2 touchpad protocol is unknown. This drivers deals with
++ * detection only, to avoid further detection attempts confusing the touchpad
++ * this way it at least works in PS/2 mouse compatibility mode.
++ */
++
++#include <linux/device.h>
++#include <linux/libps2.h>
++#include "psmouse.h"
++
++static const char * const focaltech_pnp_ids[] = {
++	"FLT0101",
++	"FLT0102",
++	"FLT0103",
++	NULL
++};
++
++int focaltech_detect(struct psmouse *psmouse, bool set_properties)
++{
++	if (!psmouse_matches_pnp_id(psmouse, focaltech_pnp_ids))
++		return -ENODEV;
++
++	if (set_properties) {
++		psmouse->vendor = "FocalTech";
++		psmouse->name = "FocalTech Touchpad in mouse emulation mode";
++	}
++
++	return 0;
++}
+diff --git a/drivers/input/mouse/focaltech.h b/drivers/input/mouse/focaltech.h
+new file mode 100644
+index 000000000000..0d0fc49451fe
+--- /dev/null
++++ b/drivers/input/mouse/focaltech.h
+@@ -0,0 +1,21 @@
++/*
++ * Focaltech TouchPad PS/2 mouse driver
++ *
++ * Copyright (c) 2014 Red Hat Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * Red Hat authors:
++ *
++ * Hans de Goede <hdegoede@redhat.com>
++ */
++
++#ifndef _FOCALTECH_H
++#define _FOCALTECH_H
++
++int focaltech_detect(struct psmouse *psmouse, bool set_properties);
++
++#endif
+diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
+index bc1bc2653f15..0730209cddb0 100644
+--- a/drivers/input/mouse/psmouse-base.c
++++ b/drivers/input/mouse/psmouse-base.c
+@@ -35,6 +35,7 @@
+ #include "elantech.h"
+ #include "sentelic.h"
+ #include "cypress_ps2.h"
++#include "focaltech.h"
+ 
+ #define DRIVER_DESC	"PS/2 mouse driver"
+ 
+@@ -720,6 +721,13 @@ static int psmouse_extensions(struct psmouse *psmouse,
+ {
+ 	bool synaptics_hardware = false;
+ 
++/* Always check for focaltech, this is safe as it uses pnp-id matching */
++	if (psmouse_do_detect(focaltech_detect, psmouse, set_properties) == 0) {
++		/* Not supported yet, use bare protocol */
++		psmouse_max_proto = max_proto = PSMOUSE_PS2;
++		goto reset_to_defaults;
++	}
++
+ /*
+  * We always check for lifebook because it does not disturb mouse
+  * (it only checks DMI information).
+@@ -871,6 +879,8 @@ static int psmouse_extensions(struct psmouse *psmouse,
+ 		}
+ 	}
+ 
++reset_to_defaults:
++
+ /*
+  * Reset to defaults in case the device got confused by extended
+  * protocol probes. Note that we follow up with full reset because
+-- 
+1.9.3
+

samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch

@@ -1,4 +1,4 @@
-From ea4bdfd627c29628913d76f0ab5eb19045e9c891 Mon Sep 17 00:00:00 2001
+From a62a68de00366a60e2639825fb02b6ab9c703e4c Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Mon, 2 Jun 2014 17:40:59 +0200
 Subject: [PATCH] samsung-laptop: Add broken-acpi-video quirk for NC210/NC110

scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch

@@ -1,4 +1,4 @@
-From fa83c1b01f1764a7a2c22153c942470526a2d6ba Mon Sep 17 00:00:00 2001
+From dd2c28c35a966e3276c560816b50d177224f902b Mon Sep 17 00:00:00 2001
 From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
 Date: Fri, 10 Feb 2012 14:56:13 -0500
 Subject: [PATCH] scsi: sd_revalidate_disk prevent NULL ptr deref

silence-fbcon-logo.patch

@@ -1,4 +1,4 @@
-From a7990f9db873bc753631efd8944715ee9f435962 Mon Sep 17 00:00:00 2001
+From 4c87e2a9b0849e3cd9125894b6ab9a382dfc3ad6 Mon Sep 17 00:00:00 2001
 From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
 Date: Thu, 29 Jul 2010 16:46:31 -0700
 Subject: [PATCH] silence fbcon logo

sources

@@ -1,4 +1,4 @@
 5c569ed649a0c9711879f333e90c5386  linux-3.16.tar.xz
 49868ce6467b35cd9ffea1120d129462  perf-man-3.16.tar.gz
 31ccda15a838f060966fe4674c703d46  patch-3.17-rc4.xz
-c6c834bdff2b94640ea7e71267434e3d  patch-3.17-rc4-git2.xz
+dc333675718cd45e75ef75ef37cd3cf1  patch-3.17-rc4-git3.xz

watchdog-Disable-watchdog-on-virtual-machines.patch

@@ -1,4 +1,4 @@
-From 0d14aeeeac2260ec38388eb371403862c4a24648 Mon Sep 17 00:00:00 2001
+From 095e0d2955605494dd2e33ce6ca9d7e73d754e01 Mon Sep 17 00:00:00 2001
 From: Dave Jones <davej@redhat.com>
 Date: Tue, 24 Jun 2014 08:43:34 -0400
 Subject: [PATCH] watchdog: Disable watchdog on virtual machines.

x86-Lock-down-IO-port-access-when-module-security-is.patch

@@ -1,4 +1,4 @@
-From 7402f2c5ce28f35591797fff05cc071841be3457 Mon Sep 17 00:00:00 2001
+From b0c433f2d49ca2b712b1d738cb0f0a16428a6613 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Thu, 8 Mar 2012 10:35:59 -0500
 Subject: [PATCH] x86: Lock down IO port access when module security is enabled

x86-Restrict-MSR-access-when-module-loading-is-restr.patch

@@ -1,4 +1,4 @@
-From e9142a3fe3e56e949783ef75599cb608eee43b75 Mon Sep 17 00:00:00 2001
+From b70d2f45438f80e47f987c84fed016b01443fd49 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Fri, 8 Feb 2013 11:12:13 -0800
 Subject: [PATCH] x86: Restrict MSR access when module loading is restricted