Merge branch 'master' into baytrail

ACPI-Limit-access-to-custom_method.patch

@@ -1,4 +1,4 @@
-From 70b5ad494c01fce2f3d3284affaefa8f581b21e8 Mon Sep 17 00:00:00 2001
+From 9a0524014ff15a4ecf504ae9eb0ca9ff4e22d81a 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 4efca4da7b99c99095a6390d5f20aee30bdb6d67 Mon Sep 17 00:00:00 2001
+From 522c5e30395af75639baaaf105bbafe84c47e2fb 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
@@ -10,10 +10,10 @@ Patch for disconnect issues with storage attached to a
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 46f5161c7891..be0877ff88b3 100644
+index d481c99a20d7..6050143ce7ec 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5035,6 +5035,13 @@ static void hub_events(void)
+@@ -5036,6 +5036,13 @@ static void hub_events(void)
  				(u16) hub->change_bits[0],
  				(u16) hub->event_bits[0]);
  

Add-EFI-signature-data-types.patch

@@ -1,4 +1,4 @@
-From fefd3c3f983024a88af6e80f03d999ca5f9314e2 Mon Sep 17 00:00:00 2001
+From a0cad672db673d76836c7293b832b4c1505ed8bb 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 1e20708ec6d992ab178cc0c9cc6c51ae3b95f48d Mon Sep 17 00:00:00 2001
+From 6a99c85fe212caec4c19893458c222bac7cd11ab 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 d9c97fea8a906281ee05486731746d648d8ff749 Mon Sep 17 00:00:00 2001
+From f2447f165fdb5b875f13e5c363675f64b5ace2be 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
@@ -34,10 +34,10 @@ index 199f453cb4de..ec38acf00b40 100644
  290/040	ALL	edd_mbr_sig_buffer EDD MBR signatures
  2D0/A00	ALL	e820_map	E820 memory map table
 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 778178f4c7d1..8899dc333793 100644
+index 36327438caf0..61542c282e70 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -1565,6 +1565,16 @@ config EFI_MIXED
+@@ -1566,6 +1566,16 @@ config EFI_MIXED
  
  	   If unsure, say N.
  

Add-secure_modules-call.patch

@@ -1,4 +1,4 @@
-From 3a2e996725c790c4a7db13246c312f3f5ed085e7 Mon Sep 17 00:00:00 2001
+From 85f1d5055d6b541c6d50b84537029c76d5d9875c 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 8e57a11b2016ad15653f55d2b0b799f94050cb8e Mon Sep 17 00:00:00 2001
+From 56ad2877113a2440ce57079c90e6a750f1f6df7b 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 bbe2ff3101aff1009fe9afbe17cb16a273797193 Mon Sep 17 00:00:00 2001
+From e5490f18e53f48930f4852e5f0f9b62f2dad39f4 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 6aca93c96e067deab170188aea3edb0afd88e9a2 Mon Sep 17 00:00:00 2001
+From 0161ebd611da0771f819fa132a2e11895031a7a1 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,95 +0,0 @@
-From 02c3c0f0c83483a79783b211ef1bbd79ef0bd360 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
- collection
-
-It is possible for an associative array to end up with a shortcut node at the
-root of the tree, if there are more than fan-out nodes in the tree, but they
-all crowd into the same slot in the lowest level (ie. they all have the same
-first nibble of their index keys).
-
-When assoc_array_gc() returns back up the tree after scanning some leaves, it
-can fall off of the root and crash because it assumes that the back pointer
-from a shortcut (after label ascend_old_tree) must point to a normal node -
-which isn't true of a shortcut node at the root.
-
-Should we find we're ascending rootwards over a shortcut, we should check to
-see if the backpointer is zero - and if it is, we have completed the scan.
-
-This particular bug cannot occur if the root node is not a shortcut - ie. if
-you have fewer than 17 keys in a keyring or if you have at least two keys that
-sit into separate slots (eg. a keyring and a non keyring).
-
-If we do fall off of the top of the tree, we get the following oops:
-
-  BUG: unable to handle kernel NULL pointer dereference at 0000000000000018
-  IP: [<ffffffff8136cea7>] assoc_array_gc+0x2f7/0x540
-  PGD dae15067 PUD cfc24067 PMD 0
-  Oops: 0000 [#1] SMP
-  Modules linked in: xt_nat xt_mark nf_conntrack_netbios_ns nf_conntrack_broadcast ip6t_rpfilter ip6t_REJECT xt_conntrack ebtable_nat ebtable_broute bridge stp llc ebtable_filter ebtables ip6table_ni
-  CPU: 0 PID: 26011 Comm: kworker/0:1 Not tainted 3.14.9-200.fc20.x86_64 #1
-  Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
-  Workqueue: events key_garbage_collector
-  task: ffff8800918bd580 ti: ffff8800aac14000 task.ti: ffff8800aac14000
-  RIP: 0010:[<ffffffff8136cea7>] [<ffffffff8136cea7>] assoc_array_gc+0x2f7/0x540
-  RSP: 0018:ffff8800aac15d40  EFLAGS: 00010206
-  RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffff8800aaecacc0
-  RDX: ffff8800daecf440 RSI: 0000000000000001 RDI: ffff8800aadc2bc0
-  RBP: ffff8800aac15da8 R08: 0000000000000001 R09: 0000000000000003
-  R10: ffffffff8136ccc7 R11: 0000000000000000 R12: 0000000000000000
-  R13: 0000000000000000 R14: 0000000000000070 R15: 0000000000000001
-  FS:  0000000000000000(0000) GS:ffff88011fc00000(0000) knlGS:0000000000000000
-  CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
-  CR2: 0000000000000018 CR3: 00000000db10d000 CR4: 00000000000006f0
-  Stack:
-   ffff8800aac15d50 0000000000000011 ffff8800aac15db8 ffffffff812e2a70
-   ffff880091a00600 0000000000000000 ffff8800aadc2bc3 00000000cd42c987
-   ffff88003702df20 ffff88003702dfa0 0000000053b65c09 ffff8800aac15fd8
-  Call Trace:
-   [<ffffffff812e2a70>] ? keyring_detect_cycle_iterator+0x30/0x30
-   [<ffffffff812e3e75>] keyring_gc+0x75/0x80
-   [<ffffffff812e1424>] key_garbage_collector+0x154/0x3c0
-   [<ffffffff810a67b6>] process_one_work+0x176/0x430
-   [<ffffffff810a744b>] worker_thread+0x11b/0x3a0
-   [<ffffffff810a7330>] ? rescuer_thread+0x3b0/0x3b0
-   [<ffffffff810ae1a8>] kthread+0xd8/0xf0
-   [<ffffffff810ae0d0>] ? insert_kthread_work+0x40/0x40
-   [<ffffffff816ffb7c>] ret_from_fork+0x7c/0xb0
-   [<ffffffff810ae0d0>] ? insert_kthread_work+0x40/0x40
-  Code: 08 4c 8b 22 0f 84 bf 00 00 00 41 83 c7 01 49 83 e4 fc 41 83 ff 0f 4c 89 65 c0 0f 8f 5a fe ff ff 48 8b 45 c0 4d 63 cf 49 83 c1 02 <4e> 8b 34 c8 4d 85 f6 0f 84 be 00 00 00 41 f6 c6 01 0f 84 92
-  RIP  [<ffffffff8136cea7>] assoc_array_gc+0x2f7/0x540
-   RSP <ffff8800aac15d40>
-  CR2: 0000000000000018
-  ---[ end trace 1129028a088c0cbd ]---
-
-Bugzilla: 1116347
-Upstream-status: ??
-
-Signed-off-by: David Howells <dhowells@redhat.com>
----
- lib/assoc_array.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/assoc_array.c b/lib/assoc_array.c
-index ae146f0734eb..2404d03e251a 100644
---- a/lib/assoc_array.c
-+++ b/lib/assoc_array.c
-@@ -1723,11 +1723,13 @@ ascend_old_tree:
- 		shortcut = assoc_array_ptr_to_shortcut(ptr);
- 		slot = shortcut->parent_slot;
- 		cursor = shortcut->back_pointer;
-+		if (!cursor)
-+			goto gc_complete;
- 	} else {
- 		slot = node->parent_slot;
- 		cursor = ptr;
- 	}
--	BUG_ON(!ptr);
-+	BUG_ON(!cursor);
- 	node = assoc_array_ptr_to_node(cursor);
- 	slot++;
- 	goto continue_node;
--- 
-1.9.3
-

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

@@ -1,4 +1,4 @@
-From 728aa078f7fa819843c2eb68517d326cbf3947ea Mon Sep 17 00:00:00 2001
+From 20d15a9684978478d87c351611c97cb8bb1b1757 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 423462db8b901e6cc936350a5e1f538d15aa5555 Mon Sep 17 00:00:00 2001
+From a4440ad8ead4131f20cc0671a2936ee03a85c284 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 6f2298da3471189910506e3eec34c2a9b7c12761 Mon Sep 17 00:00:00 2001
+From 3ccfc16c29b022bfae03dd3df09d07eed0d979fa 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 d999220356c7c2526cdaa1a9113784f95004d65e Mon Sep 17 00:00:00 2001
+From 46efbd1ee33bdbb0aba714e4255c9e4f57f40d70 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 37a1b979a715b1c7e8247cfdfcc2eedc9aea1471 Mon Sep 17 00:00:00 2001
+From fc514f5bf8ace4624a8710f0b268a60928ec583e 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
@@ -16,10 +16,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 5ae8608ca9f5..8ffa8f91eeb2 100644
+index 10d51c2f10d7..5b6ebe8b519e 100644
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
-@@ -3595,7 +3595,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -3596,7 +3596,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
  			the allocated input device; If set to 0, video driver
  			will only send out the event without touching backlight
  			brightness level.

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

@@ -1,4 +1,4 @@
-From e2b4ee7e99b8c0a0d48ed4aa76fd01e11bfe275d Mon Sep 17 00:00:00 2001
+From 95f82733b73c405f02ca4a0b249670c11adaccf7 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 11ad2e84a328a6bc9861646044d4411352d82258 Mon Sep 17 00:00:00 2001
+From 9c9e0005434106778f8b7896db2a1edb2862d959 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 f2516b128351bcc2856d39a8b2aa98f748becda5 Mon Sep 17 00:00:00 2001
+From 636bb5c51b888ffccf560e8b82b176616739ee51 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 d48552d47446ac0562a46bbafcb1ab396d9b8555 Mon Sep 17 00:00:00 2001
+From a5e78d0edf921d1ba786bd90e64ca5e5b3e032c0 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 eff4447db91c46b6e638ceb0da832354e15e4502 Mon Sep 17 00:00:00 2001
+From e22192c05f5d2023b8cc5a412d52b46f24fe5166 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 1f781abfa691083a36dd0d255d190cdb0251725e Mon Sep 17 00:00:00 2001
+From dfb26bfbb4eb74f373623a27b6c862645b62a715 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 3cdbaad2a041e42677e1e8137bb1a9f01fd37277 Mon Sep 17 00:00:00 2001
+From 6828a05494d174fd4e4fa9b9a18eb0dcb81adaf3 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 30cbae0ae84ca0e7f874517dc10e0ac218de4050 Mon Sep 17 00:00:00 2001
+From eadee0c1a7f78f1cd82d71dbe17465bb6e290ee1 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 dfbaa9d6f848714f27e4cb0e007e86c4ac650268 Mon Sep 17 00:00:00 2001
+From ae8d1fbf41382f4d74228eda6f8b872cd823ce31 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 cb21611afe95c256214d50379279f8e79cd72cea Mon Sep 17 00:00:00 2001
+From 9bb49c6fdfafaeaf9e0bf8da797c1f211ab5b91b 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 f04bd0bd583d4b531b2adc7299c85b4e9934a133 Mon Sep 17 00:00:00 2001
+From 4fcf22b9570403fcb9fc3e7a99408cde05a7e5a6 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 d57ac23df8a6f1b21bd55d0884ae81f6e8e3bb8f Mon Sep 17 00:00:00 2001
+From 00c327c9b1f43a59c81b1db548b2acd9a0402fa8 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 cd5c274ee73762b5616bf36fab3a2df50bceb203 Mon Sep 17 00:00:00 2001
+From 1e0fecc62e3b9e9a9ce5cf791a98fb758b76665e 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 feb3b6774ce9a5b11aec2602961eee0017349534 Mon Sep 17 00:00:00 2001
+From 62b8aa06a3aab05ab855793a51608613a5b91e24 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 d8889580d123fefd57c25681a39de089bedf42ba Mon Sep 17 00:00:00 2001
+From e2696fcf03e37e8253a11f3b14d7d822b0dac5b3 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 9eeae62a9c758b843ac7dac5ee67248d3ad282a1 Mon Sep 17 00:00:00 2001
+From 53e0d01e8d7ac658bde8a81f7e8ceaf87974b5d2 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
@@ -18,10 +18,10 @@ Signed-off-by: Bastien Nocera <hadess@hadess.net>
  1 file changed, 22 insertions(+)
 
 diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
-index 612f855c340f..f1aeb0240d6e 100644
+index 9bb95eab6926..4b5015f27f9e 100644
 --- a/drivers/input/serio/i8042.c
 +++ b/drivers/input/serio/i8042.c
-@@ -1469,6 +1469,22 @@ static struct platform_driver i8042_driver = {
+@@ -1471,6 +1471,22 @@ static struct platform_driver i8042_driver = {
  	.shutdown	= i8042_shutdown,
  };
  
@@ -44,7 +44,7 @@ index 612f855c340f..f1aeb0240d6e 100644
  static int __init i8042_init(void)
  {
  	struct platform_device *pdev;
-@@ -1476,6 +1492,12 @@ static int __init i8042_init(void)
+@@ -1478,6 +1494,12 @@ static int __init i8042_init(void)
  
  	dbg_init();
  

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

@@ -1,4 +1,4 @@
-From b729efbc480486186d8916a87f58f6114220a7cb Mon Sep 17 00:00:00 2001
+From b66ea6f3d8fd863e6010542070db582cc8899409 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 395528c008e2d49c9bf8f02d6cb071aa11742755 Mon Sep 17 00:00:00 2001
+From 738607f7379441ad8c8954bd9590641715f11b8e 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 5a8578dc90626d4bc4d9dca2311fcdb2b75a3a87 Mon Sep 17 00:00:00 2001
+From 5f2969386c63411a01b2a5ad0f0b585bf8fbd67e 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 bb5d57cb1278a0ca3ba6d904c3698d308c12b3be Mon Sep 17 00:00:00 2001
+From a04f786b6799ace9a7d42631abc4daf3d8e3bd89 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 27c9c6fc3c570ac29db93262d712ce1557b90128 Mon Sep 17 00:00:00 2001
+From 5af5d95a6b1068e4e1c9a20f5fb28fe763265610 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
@@ -12,10 +12,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 8899dc333793..33dfa4ce8c09 100644
+index 61542c282e70..e5ee669e87b6 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -1566,7 +1566,8 @@ config EFI_MIXED
+@@ -1567,7 +1567,8 @@ config EFI_MIXED
  	   If unsure, say N.
  
  config EFI_SECURE_BOOT_SIG_ENFORCE

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

@@ -1,4 +1,4 @@
-From 1ed340b9f2da1a8f5a38c7bf9b181feae8580eb5 Mon Sep 17 00:00:00 2001
+From 864f3a13e29d0f86775e337e1398868173af3a14 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

@@ -1,32 +0,0 @@
-From 6fd77b0f76b946fd6de55c0a1acff4eee191e5ed 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 f10b526aee84af2e6de026ea7300e325e117705f Mon Sep 17 00:00:00 2001
+From 2fd9e12020ad2b89222bb44f026400ddec8ef2ce 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
@@ -10,7 +10,7 @@ Upstream-status: Fedora mustard
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
-index 2dd1d0dd4f7d..7116b70074bf 100644
+index 6f5d79569136..95469f6ecfa5 100644
 --- a/drivers/input/keyboard/atkbd.c
 +++ b/drivers/input/keyboard/atkbd.c
 @@ -436,11 +436,15 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,

input-silence-i8042-noise.patch

@@ -1,4 +1,4 @@
-From 8be33914661d87ef0e644dc23d10ead4bc1c68c9 Mon Sep 17 00:00:00 2001
+From 43b38765023999cb920cf389baaa285e401d2be3 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
@@ -30,7 +30,7 @@ index b67d9aef9fe4..dd58b0fdaafd 100644
  	if (dev->parent && dev->parent->power.is_prepared)
  		dev_warn(dev, "parent %s should not be sleeping\n",
 diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
-index 3807c3e971cc..612f855c340f 100644
+index f5a98af3b325..9bb95eab6926 100644
 --- a/drivers/input/serio/i8042.c
 +++ b/drivers/input/serio/i8042.c
 @@ -857,7 +857,6 @@ static int __init i8042_check_aux(void)

kbuild-AFTER_LINK.patch

@@ -1,4 +1,4 @@
-From 4ce7b2f872d8fc2520f05dae5e1c523e20cda894 Mon Sep 17 00:00:00 2001
+From 8411be6a92fe0a9ae0644bcd1d8d4a176798b6ec 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

@@ -68,9 +68,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 4
+%define rcrev 5
 # The git snapshot level
-%define gitrev 4
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -607,17 +607,10 @@ Patch26002: samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
 Patch26013: acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
 Patch26014: acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
 
-#rhbz 1132368
-Patch26015: nfs-fix-kernel-warning-when-removing-proc-entry.patch
-
 #rhbz 1134969
 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
 
@@ -1355,17 +1348,10 @@ ApplyPatch samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
 ApplyPatch acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
 ApplyPatch acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
 
-#rhbz 1132368
-ApplyPatch nfs-fix-kernel-warning-when-removing-proc-entry.patch
-
 #rhbz 1134969
 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
 
@@ -2247,6 +2233,14 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Tue Sep 16 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git1.1
+- Linux v3.17-rc5-13-g2324067fa9a4
+- Reenable debugging options.
+
+* Mon Sep 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git0.1
+- Linux v3.17-rc5
+- Disable debugging options.
+
 * Fri Sep 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git4.1
 - Linux v3.17-rc4-244-g5874cfed0b04
 

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

@@ -1,4 +1,4 @@
-From 1f5d1a446393a33490fe50d4ae6dd3e67d06e7e5 Mon Sep 17 00:00:00 2001
+From 7d7cf8b5771f0ede7191c69127260db0862bef2e 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 be4d9ecdaa91bd4dcc38e6082c5e48c5c88ec3ee Mon Sep 17 00:00:00 2001
+From 5f8dab4ab55dfcfde9f2caf33470bb0c232f518b 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
@@ -20,10 +20,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/lib/Kconfig b/lib/Kconfig
-index a5ce0c7f6c30..54cef46c99d7 100644
+index 54cf309a92a5..64f8bb4882fb 100644
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
-@@ -379,7 +379,8 @@ config CHECK_SIGNATURE
+@@ -382,7 +382,8 @@ config CHECK_SIGNATURE
  	bool
  
  config CPUMASK_OFFSTACK

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

@@ -1,4 +1,4 @@
-From 913036cdc44e936c194294184853e4844af0494b Mon Sep 17 00:00:00 2001
+From b908a0fe3b5e562ef471e777e257da288f96f532 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,77 +0,0 @@
-From 86b73a312f2d997ba0518674a221e026f127acd3 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
-
-I saw the following kernel warning:
-
-[ 1852.321222] ------------[ cut here ]------------
-[ 1852.326527] WARNING: CPU: 0 PID: 118 at fs/proc/generic.c:521 remove_proc_entry+0x154/0x16b()
-[ 1852.335630] remove_proc_entry: removing non-empty directory 'fs/nfsfs', leaking at least 'volumes'
-[ 1852.344084] CPU: 0 PID: 118 Comm: kworker/u8:2 Not tainted 3.16.0+ #540
-[ 1852.350036] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
-[ 1852.354992] Workqueue: netns cleanup_net
-[ 1852.358701]  0000000000000000 ffff880116f2fbd0 ffffffff819c03e9 ffff880116f2fc18
-[ 1852.366474]  ffff880116f2fc08 ffffffff810744ee ffffffff811e0e6e ffff8800d4e96238
-[ 1852.373507]  ffffffff81dbe665 ffff8800d46a5948 0000000000000005 ffff880116f2fc68
-[ 1852.380224] Call Trace:
-[ 1852.381976]  [<ffffffff819c03e9>] dump_stack+0x4d/0x66
-[ 1852.385495]  [<ffffffff810744ee>] warn_slowpath_common+0x7a/0x93
-[ 1852.389869]  [<ffffffff811e0e6e>] ? remove_proc_entry+0x154/0x16b
-[ 1852.393987]  [<ffffffff8107457b>] warn_slowpath_fmt+0x4c/0x4e
-[ 1852.397999]  [<ffffffff811e0e6e>] remove_proc_entry+0x154/0x16b
-[ 1852.402034]  [<ffffffff8129c73d>] nfs_fs_proc_net_exit+0x53/0x56
-[ 1852.406136]  [<ffffffff812a103b>] nfs_net_exit+0x12/0x1d
-[ 1852.409774]  [<ffffffff81785bc9>] ops_exit_list+0x44/0x55
-[ 1852.413529]  [<ffffffff81786389>] cleanup_net+0xee/0x182
-[ 1852.417198]  [<ffffffff81088c9e>] process_one_work+0x209/0x40d
-[ 1852.502320]  [<ffffffff81088bf7>] ? process_one_work+0x162/0x40d
-[ 1852.587629]  [<ffffffff810890c1>] worker_thread+0x1f0/0x2c7
-[ 1852.673291]  [<ffffffff81088ed1>] ? process_scheduled_works+0x2f/0x2f
-[ 1852.759470]  [<ffffffff8108e079>] kthread+0xc9/0xd1
-[ 1852.843099]  [<ffffffff8109427f>] ? finish_task_switch+0x3a/0xce
-[ 1852.926518]  [<ffffffff8108dfb0>] ? __kthread_parkme+0x61/0x61
-[ 1853.008565]  [<ffffffff819cbeac>] ret_from_fork+0x7c/0xb0
-[ 1853.076477]  [<ffffffff8108dfb0>] ? __kthread_parkme+0x61/0x61
-[ 1853.140653] ---[ end trace 69c4c6617f78e32d ]---
-
-It looks wrong that we add "/proc/net/nfsfs" in nfs_fs_proc_net_init()
-while remove "/proc/fs/nfsfs" in nfs_fs_proc_net_exit().
-
-Bugzilla: 1132368
-Upstream-status: Sent for 3.17-rcX
-
-Fixes: commit 65b38851a17 (NFS: Fix /proc/fs/nfsfs/servers and /proc/fs/nfsfs/volumes)
-Cc: Eric W. Biederman <ebiederm@xmission.com>
-Cc: Trond Myklebust <trond.myklebust@primarydata.com>
-Cc: Dan Aloni <dan@kernelim.com>
-Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
----
- fs/nfs/client.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fs/nfs/client.c b/fs/nfs/client.c
-index 1c5ff6d58385..c117b96c7da9 100644
---- a/fs/nfs/client.c
-+++ b/fs/nfs/client.c
-@@ -1418,7 +1418,7 @@ int nfs_fs_proc_net_init(struct net *net)
- error_2:
- 	remove_proc_entry("servers", nn->proc_nfsfs);
- error_1:
--	remove_proc_entry("fs/nfsfs", NULL);
-+	remove_proc_entry("nfsfs", net->proc_net);
- error_0:
- 	return -ENOMEM;
- }
-@@ -1429,7 +1429,7 @@ void nfs_fs_proc_net_exit(struct net *net)
- 
- 	remove_proc_entry("volumes", nn->proc_nfsfs);
- 	remove_proc_entry("servers", nn->proc_nfsfs);
--	remove_proc_entry("fs/nfsfs", NULL);
-+	remove_proc_entry("nfsfs", net->proc_net);
- }
- 
- /*
--- 
-1.9.3
-

no-pcspkr-modalias.patch

@@ -1,4 +1,4 @@
-From 4152c0892d275b0109d7b38f7dbb274cdcedd9e1 Mon Sep 17 00:00:00 2001
+From 5f80ea47e06951b59935000b6bda75af7791a5d8 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 b4d5b24ff5ec0808968c393021ce88cbddce9fa3 Mon Sep 17 00:00:00 2001
+From 1b201edb207a4be37c46b3bba6e13d8f1ad1b566 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 29486eeff20681c8523bf86915358c0790a2b7a0 Mon Sep 17 00:00:00 2001
+From 12f91b34148671d7c3c64a3838d8e33f97d813ed 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

@@ -1,4 +1,4 @@
-From cfbd9cc79483f4c8fb9c061724249136757ab727 Mon Sep 17 00:00:00 2001
+From 665b19601bddba33e2fed281a8bff00829cf9c89 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

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

@@ -1,4 +1,4 @@
-From 9f60e7ea169aff31a737ef1be3ed8cfe11eab8d3 Mon Sep 17 00:00:00 2001
+From 0b87591a56a41f7aee68991150471ff498b1c4e0 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

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

@@ -1,4 +1,4 @@
-From b918716b8ee213a9e4eba5a019c93b078e3df58c Mon Sep 17 00:00:00 2001
+From a4a2042c79c24e5dbefec682af4bbd783deb5c7e 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 b03234b1664e0508e2170df5679fcbacec72f4a6 Mon Sep 17 00:00:00 2001
+From 78f2b98263f0f9c487aafa177e48c2f85ad8e40d 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 2709025677a0af31e59e8ab60fa1b32dfd7057cc Mon Sep 17 00:00:00 2001
+From f2711040b5b853fef948c0f381b7822b2afe4f5c 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
+b9960a1861ef3acb8b78ee19f9ca7bac  patch-3.17-rc5.xz
-b1a9732a1a1401b97712490123fcfb5f  patch-3.17-rc4-git4.xz
+48aa60853a327b5e32098abd6b069ef3  patch-3.17-rc5-git1.xz

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

@@ -1,4 +1,4 @@
-From 0b054268cfba32175c108c27ccb0a913c472f389 Mon Sep 17 00:00:00 2001
+From 7361c690dcee6003a3dfbba146407c117fd88c0f 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 2fc4f31acaaf5d0c32cf7f2b85b1a348e9300660 Mon Sep 17 00:00:00 2001
+From 8c38df48422ecd8706959ec3f0ba911cf121eeea 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 3b102b85e9730a71903dc45e0e7694fd0e6e5a8a Mon Sep 17 00:00:00 2001
+From a3ba1ab7309cadd986eb1ff9ce1842d6aa92c9bb 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