Linux v3.17-rc4-158-ge874a5fe3efa

- Add patch to fix oops on keyring gc (rhbz 1116347)

55 files changed, 159 insertions, 54 deletions

diff --git a/ACPI-Limit-access-to-custom_method.patch b/ACPI-Limit-access-to-custom_method.patch
index 1ee3077ea..a4f2ea7a1 100644
--- a/ACPI-Limit-access-to-custom_method.patch
+++ b/ACPI-Limit-access-to-custom_method.patch
@@ -1,4 +1,4 @@
-From 1b82a00460fcd1da07fb8cbdec2f5dfc62dfb8e1 Mon Sep 17 00:00:00 2001
+From 57f1fb51c058251da703d9a71718d0906440bffa 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
diff --git a/ARM-tegra-usb-no-reset.patch b/ARM-tegra-usb-no-reset.patch
index c37c97c30..8b9ce36bb 100644
--- a/ARM-tegra-usb-no-reset.patch
+++ b/ARM-tegra-usb-no-reset.patch
@@ -1,4 +1,4 @@
-From 90de32f2f87e7b0929e68878fd7c321e36afd5fb Mon Sep 17 00:00:00 2001
+From b5826551ddd4011eb77731e91c01822fc2e08d09 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
diff --git a/Add-EFI-signature-data-types.patch b/Add-EFI-signature-data-types.patch
index e754fa278..13c73fd69 100644
--- a/Add-EFI-signature-data-types.patch
+++ b/Add-EFI-signature-data-types.patch
@@ -1,4 +1,4 @@
-From 078bb9a060858a36bf7ac356a4c0fb0b869596b5 Mon Sep 17 00:00:00 2001
+From 04a31f958e3d13dd5f45d06f361e30b1715bdb6c 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
diff --git a/Add-an-EFI-signature-blob-parser-and-key-loader.patch b/Add-an-EFI-signature-blob-parser-and-key-loader.patch
index e57336641..107bda0e1 100644
--- a/Add-an-EFI-signature-blob-parser-and-key-loader.patch
+++ b/Add-an-EFI-signature-blob-parser-and-key-loader.patch
@@ -1,4 +1,4 @@
-From dfa45477fce68746dbaa029bacca9a84d8eb699f Mon Sep 17 00:00:00 2001
+From b4f350a3833e72810c1ed0cec005bb8445ad8eff 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.
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch
index 62640e311..58aefbd0f 100644
--- a/Add-option-to-automatically-enforce-module-signature.patch
+++ b/Add-option-to-automatically-enforce-module-signature.patch
@@ -1,4 +1,4 @@
-From 88c65e296bf6bab51f8e3d19739e882739714c83 Mon Sep 17 00:00:00 2001
+From 8adf5b7967a5f2510328bc60f1def5b86443362c 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
diff --git a/Add-secure_modules-call.patch b/Add-secure_modules-call.patch
index cd4d81efe..83eef52c9 100644
--- a/Add-secure_modules-call.patch
+++ b/Add-secure_modules-call.patch
@@ -1,4 +1,4 @@
-From 27ca35fec142b249b050a15ec39fbbcb7fff96db Mon Sep 17 00:00:00 2001
+From 92c22076c79a1ed760d777ddfe8e18d0340fe70c 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
diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch
index a8c434c92..f66ba45b0 100644
--- a/Add-sysrq-option-to-disable-secure-boot-mode.patch
+++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch
@@ -1,4 +1,4 @@
-From 3b817cb10befa3cff27a630e32e5274000ed974e Mon Sep 17 00:00:00 2001
+From d89260a4671edda6120b2c7ab9ccdafb6c0d2c95 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
diff --git a/HID-wacom-Add-support-for-the-Cintiq-Companion.patch b/HID-wacom-Add-support-for-the-Cintiq-Companion.patch
index a522fad6a..3d1f463c0 100644
--- a/HID-wacom-Add-support-for-the-Cintiq-Companion.patch
+++ b/HID-wacom-Add-support-for-the-Cintiq-Companion.patch
@@ -1,4 +1,4 @@
-From 0864ac121edf038977fde51fedfd4bbd347251aa Mon Sep 17 00:00:00 2001
+From 440dd9de931d6a8fcd30a087f5e7ffbb44f7403d 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
diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch
index 8ea25bb66..337814ae2 100644
--- a/KEYS-Add-a-system-blacklist-keyring.patch
+++ b/KEYS-Add-a-system-blacklist-keyring.patch
@@ -1,4 +1,4 @@
-From 1bfc16640a560041d3e14ac44c22e6a03fb5853d Mon Sep 17 00:00:00 2001
+From b352a01ca07c97eb4672dedb4ddeffaf877d74d2 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
diff --git a/KEYS-Fix-termination-condition-in-assoc-array-garbag.patch b/KEYS-Fix-termination-condition-in-assoc-array-garbag.patch
new file mode 100644
index 000000000..3afe63123
--- /dev/null
+++ b/KEYS-Fix-termination-condition-in-assoc-array-garbag.patch
@@ -0,0 +1,95 @@
+From 11646ff9e6874d205ab92af605db6b90fbe214d1 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
+
diff --git a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
index 17ab25ab5..3c3e69777 100644
--- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
@@ -1,4 +1,4 @@
-From 2ce63af19b2cbf06bba9a9955b88d3e2f1b9e881 Mon Sep 17 00:00:00 2001
+From cfc1daa3aa8842a148ed18cd2c0ae5d631b40446 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
diff --git a/MODSIGN-Support-not-importing-certs-from-db.patch b/MODSIGN-Support-not-importing-certs-from-db.patch
index 004cc3dbf..db3e96929 100644
--- a/MODSIGN-Support-not-importing-certs-from-db.patch
+++ b/MODSIGN-Support-not-importing-certs-from-db.patch
@@ -1,4 +1,4 @@
-From 7766067a349402d2d705135e0ba1150bac5f561c Mon Sep 17 00:00:00 2001
+From dcd44df09553badbe5454af793c55b53cd320481 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
diff --git a/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch b/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
index 80b32c2fe..cc07463e8 100644
--- a/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
+++ b/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
@@ -1,4 +1,4 @@
-From 7457a804e044fc513d15da6d6a1a14b852680b6b Mon Sep 17 00:00:00 2001
+From 0aa239528b0bd13d924a0415716ad7acd10096e0 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
diff --git a/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch b/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
index 9624cf30b..e3fb21f28 100644
--- a/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
+++ b/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
@@ -1,4 +1,4 @@
-From 6a059c9f8f6109277f904c410973272ed30645db Mon Sep 17 00:00:00 2001
+From 0a85a61492fa622f592766882275e8ddf5d423fc 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
diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
index 3b117917c..d9eaff2b1 100644
--- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
+++ b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
@@ -1,4 +1,4 @@
-From cdd9ed19953df0561de14f4a76d531f74b30b317 Mon Sep 17 00:00:00 2001
+From 81373f60218537d4b7f03077e74394059bdaacc4 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
diff --git a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
index 3c0c96c6c..4dbb18167 100644
--- a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
+++ b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
@@ -1,4 +1,4 @@
-From 18939ee20e8a98865f0fb56bc32dcb9605846abc Mon Sep 17 00:00:00 2001
+From 6c2e4f730cda97d6ec8927a3128d77a767ba6a21 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
diff --git a/acpi-video-Add-4-new-models-to-the-use_native_backli.patch b/acpi-video-Add-4-new-models-to-the-use_native_backli.patch
index aa186251e..bd6397b68 100644
--- a/acpi-video-Add-4-new-models-to-the-use_native_backli.patch
+++ b/acpi-video-Add-4-new-models-to-the-use_native_backli.patch
@@ -1,4 +1,4 @@
-From e7d603cbf4da59fcb1e6447ceee6a23a30c6a8b2 Mon Sep 17 00:00:00 2001
+From 330e3a9926c06a8a2750f0507323fea185af5557 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
diff --git a/acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch b/acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
index fdbba86cc..f735fd2cc 100644
--- a/acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
+++ b/acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
@@ -1,4 +1,4 @@
-From ed9e6dd6623e81687dd4fc8195b84c388080c8c1 Mon Sep 17 00:00:00 2001
+From 638ed23d3cd7dbc2f4925a9331ab66fdfa07784d 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
diff --git a/acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch b/acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
index ae69f3cfb..6ef43b6f8 100644
--- a/acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
+++ b/acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
@@ -1,4 +1,4 @@
-From 9c95834c6914c299380bc59be15bf77e8b939f04 Mon Sep 17 00:00:00 2001
+From d83b2fced6e4935df3887c7e384abcb41779b546 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
diff --git a/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch b/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
index 97d959769..67d85cea3 100644
--- a/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
+++ b/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
@@ -1,4 +1,4 @@
-From 3a68ce7ca45a95d707a7f8357a0014fb581654d8 Mon Sep 17 00:00:00 2001
+From 81dd19dc3008b526142686b936432d8de39bad63 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
diff --git a/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch b/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
index d869abcb3..07d5dbd91 100644
--- a/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
+++ b/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
@@ -1,4 +1,4 @@
-From 23631c7bd6b63a6b1c2e8ff895c907487841f28d Mon Sep 17 00:00:00 2001
+From e9e0ae4dd9b33053445379968ddcc03fc4a0a577 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
diff --git a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch b/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
index c46eb422f..6b76ef321 100644
--- a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
+++ b/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
@@ -1,4 +1,4 @@
-From a1e48fefdef775678969675156d9e18e3700c6e0 Mon Sep 17 00:00:00 2001
+From 8f39469b3a48061cc97de9624b5ad773a372823b 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
diff --git a/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch b/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
index 05f385929..36c86418a 100644
--- a/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
+++ b/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
@@ -1,4 +1,4 @@
-From 6d88db26a40d3c7c5fe0a8d6c40e7d3dc0da8797 Mon Sep 17 00:00:00 2001
+From 5abe6db4473c75235188e2615e2e933486c0d62e 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
diff --git a/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch b/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
index 396e56b60..2881c828b 100644
--- a/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
+++ b/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
@@ -1,4 +1,4 @@
-From dd483928326eda2dd28eb4b3dae1f38fcf51ce36 Mon Sep 17 00:00:00 2001
+From 0a5ea7af7a06d8b40a6116c3900062d5fcbf9cb1 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
diff --git a/arm-i.MX6-Utilite-device-dtb.patch b/arm-i.MX6-Utilite-device-dtb.patch
index 5f442f0fa..a5cc509da 100644
--- a/arm-i.MX6-Utilite-device-dtb.patch
+++ b/arm-i.MX6-Utilite-device-dtb.patch
@@ -1,4 +1,4 @@
-From 9d3bfdcc1e77f16db14bb2f4913278a2f75c63a5 Mon Sep 17 00:00:00 2001
+From 6165c84f32ada74dd0c059a4732a63fbe51ec93f 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
diff --git a/asus-wmi-Restrict-debugfs-interface-when-module-load.patch b/asus-wmi-Restrict-debugfs-interface-when-module-load.patch
index 46218c07f..77480b5bb 100644
--- a/asus-wmi-Restrict-debugfs-interface-when-module-load.patch
+++ b/asus-wmi-Restrict-debugfs-interface-when-module-load.patch
@@ -1,4 +1,4 @@
-From 8c60a46bd9447c0e1d87f2dfc4dd4a7c71ce2141 Mon Sep 17 00:00:00 2001
+From adfeadcab5e7f01cbbd0fb3653a0d2721cdaeb5a 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
diff --git a/ath9k-rx-dma-stop-check.patch b/ath9k-rx-dma-stop-check.patch
index 582b7c845..4699391b2 100644
--- a/ath9k-rx-dma-stop-check.patch
+++ b/ath9k-rx-dma-stop-check.patch
@@ -1,4 +1,4 @@
-From 028f8dafb118f8e24ee8172a091fbf448040d881 Mon Sep 17 00:00:00 2001
+From 1ba3576c5396f24b860cb26f59f86c23160527f0 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
diff --git a/crash-driver.patch b/crash-driver.patch
index 38c8305c6..aaee7ec6f 100644
--- a/crash-driver.patch
+++ b/crash-driver.patch
@@ -1,4 +1,4 @@
-From 7579007ba0da3e73df073bf3eda45f91b069a951 Mon Sep 17 00:00:00 2001
+From 692c0562c55a368bc666d462eade4e98d50040ca 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
diff --git a/criu-no-expert.patch b/criu-no-expert.patch
index abf8e1bb9..c6c42cfdc 100644
--- a/criu-no-expert.patch
+++ b/criu-no-expert.patch
@@ -1,4 +1,4 @@
-From 2d5b2aa7f32f8cea2a6a582c6050390349421160 Mon Sep 17 00:00:00 2001
+From c54d5f38b0d1efa7d2822b24ba8100338cee42da 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
diff --git a/die-floppy-die.patch b/die-floppy-die.patch
index 9f94134a4..4d4876ae6 100644
--- a/die-floppy-die.patch
+++ b/die-floppy-die.patch
@@ -1,4 +1,4 @@
-From 3524c628b7ed4602680af5a7442c4c0392457500 Mon Sep 17 00:00:00 2001
+From b4a0896742321ea5d9b2c5cb43ad86f64b34bce3 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
diff --git a/disable-i8042-check-on-apple-mac.patch b/disable-i8042-check-on-apple-mac.patch
index 353da6f6a..93577b192 100644
--- a/disable-i8042-check-on-apple-mac.patch
+++ b/disable-i8042-check-on-apple-mac.patch
@@ -1,4 +1,4 @@
-From 828d8aaba09b274f00ca7237104e2f3257e348eb Mon Sep 17 00:00:00 2001
+From a9342ec3b8cb2b229754e19b0ac78275d2407be0 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
diff --git a/disable-libdw-unwind-on-non-x86.patch b/disable-libdw-unwind-on-non-x86.patch
index 39b6aab74..9cd2fca2e 100644
--- a/disable-libdw-unwind-on-non-x86.patch
+++ b/disable-libdw-unwind-on-non-x86.patch
@@ -1,4 +1,4 @@
-From 88688458a65ebe3153f20faa5c7f31d1679d0312 Mon Sep 17 00:00:00 2001
+From 45047d94152b3dc0484c699cecc2413a9eccda63 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
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch
index a5fa74ad9..a9c807368 100644
--- a/drm-i915-hush-check-crtc-state.patch
+++ b/drm-i915-hush-check-crtc-state.patch
@@ -1,4 +1,4 @@
-From 139734aaf71aedc31ec91c9301cc83c3b68dd18d Mon Sep 17 00:00:00 2001
+From b89bd5713fe8707cbe05a98d5c1d77d7e36c4339 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
diff --git a/efi-Add-EFI_SECURE_BOOT-bit.patch b/efi-Add-EFI_SECURE_BOOT-bit.patch
index 1d8f2c005..37dd653fb 100644
--- a/efi-Add-EFI_SECURE_BOOT-bit.patch
+++ b/efi-Add-EFI_SECURE_BOOT-bit.patch
@@ -1,4 +1,4 @@
-From 23f7416574bc396c1cbf96ac53ea150e43f8a20a Mon Sep 17 00:00:00 2001
+From caa7d37fda4cff429ba2a7e409d51c95392cfdbd 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
diff --git a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
index 6ef2734f1..88f483f8d 100644
--- a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
+++ b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
@@ -1,4 +1,4 @@
-From 15c7f26845d2fe4f9a1b15ad4508905b5d9db5cb Mon Sep 17 00:00:00 2001
+From e977e62d874a026f9c5c33b29795c5f624ca1aff 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
diff --git a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
index 7bd014e75..430704872 100644
--- a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
+++ b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
@@ -1,4 +1,4 @@
-From faaef6b67f1fce90ef9a066318d7051177223f3d Mon Sep 17 00:00:00 2001
+From 5a8c04c87c790396adb7b0d97df343c7a556b86e 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
diff --git a/hibernate-Disable-in-a-signed-modules-environment.patch b/hibernate-Disable-in-a-signed-modules-environment.patch
index e81b0b09b..27e287b60 100644
--- a/hibernate-Disable-in-a-signed-modules-environment.patch
+++ b/hibernate-Disable-in-a-signed-modules-environment.patch
@@ -1,4 +1,4 @@
-From ea4a5cb39b6c1662107148eb03814ea704fd74b4 Mon Sep 17 00:00:00 2001
+From aa9f4f7627f847de2d733e8bf8ea2c674275f70a 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
diff --git a/input-kill-stupid-messages.patch b/input-kill-stupid-messages.patch
index 6e6319842..488d068e1 100644
--- a/input-kill-stupid-messages.patch
+++ b/input-kill-stupid-messages.patch
@@ -1,4 +1,4 @@
-From 06f84c0e211fbe285e73375294edf3b5d69f6157 Mon Sep 17 00:00:00 2001
+From 0ee3b7cbfbc534c081941bb638f0079e11810e53 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
diff --git a/input-silence-i8042-noise.patch b/input-silence-i8042-noise.patch
index 788566626..2eb4001bf 100644
--- a/input-silence-i8042-noise.patch
+++ b/input-silence-i8042-noise.patch
@@ -1,4 +1,4 @@
-From a183af90b05c16efb61ec45ead82d4069a9fb80f Mon Sep 17 00:00:00 2001
+From 9feeadc3375b54bce949cb29b8582142f2c076ec 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
diff --git a/kbuild-AFTER_LINK.patch b/kbuild-AFTER_LINK.patch
index 8638306a4..4b58afdcd 100644
--- a/kbuild-AFTER_LINK.patch
+++ b/kbuild-AFTER_LINK.patch
@@ -1,4 +1,4 @@
-From 280493559dc0211ad4e3700453af7621e6bdeb8e Mon Sep 17 00:00:00 2001
+From 215e2a2e84e72884521a8bf0cd1e2e4a388021e8 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
diff --git a/kernel.spec b/kernel.spec
index fcc08b97f..bcd403f05 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 4
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -612,6 +612,9 @@ 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
+
 # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
 Patch30000: kernel-arm64.patch
 
@@ -1335,6 +1338,9 @@ 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
+
 %if 0%{?aarch64patches}
 ApplyPatch kernel-arm64.patch
 %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2203,6 +2209,10 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* 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)
+
 * Tue Sep 09 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git1.1
 - Linux v3.17-rc4-140-g8c68face5548
 - Reenable debugging options.
diff --git a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
index b96bcbb0c..e0b19c90e 100644
--- a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
+++ b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
@@ -1,4 +1,4 @@
-From 6b3000835b6f7d5474e50497503351de5436e141 Mon Sep 17 00:00:00 2001
+From b0d3311bdba8183d94670473d980bd49a28f974d 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
diff --git a/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch b/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
index 8d6b775c0..9bbb2823b 100644
--- a/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
+++ b/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
@@ -1,4 +1,4 @@
-From 68ba9aebfaf80b4028a9de06487d845033cc5b4d Mon Sep 17 00:00:00 2001
+From 985a130cf970c711d5a913a56a1e71956ef44230 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
diff --git a/lis3-improve-handling-of-null-rate.patch b/lis3-improve-handling-of-null-rate.patch
index d32d9d81f..152e86821 100644
--- a/lis3-improve-handling-of-null-rate.patch
+++ b/lis3-improve-handling-of-null-rate.patch
@@ -1,4 +1,4 @@
-From 9ece18c65648fc9b164ff7c758959cc3dd97dd3f Mon Sep 17 00:00:00 2001
+From dfa60efe146c7a6dc65b05034bc74eae3a3df695 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
diff --git a/nfs-fix-kernel-warning-when-removing-proc-entry.patch b/nfs-fix-kernel-warning-when-removing-proc-entry.patch
index 65e90ca81..7c08b21be 100644
--- a/nfs-fix-kernel-warning-when-removing-proc-entry.patch
+++ b/nfs-fix-kernel-warning-when-removing-proc-entry.patch
@@ -1,4 +1,4 @@
-From 73e86a7954bcf9009967d2bd0eae8abc2fc75a6b Mon Sep 17 00:00:00 2001
+From 2987bec40b0fc6c81915329515fb298291bb37d2 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
diff --git a/no-pcspkr-modalias.patch b/no-pcspkr-modalias.patch
index 67e3502e1..8d69f0c8d 100644
--- a/no-pcspkr-modalias.patch
+++ b/no-pcspkr-modalias.patch
@@ -1,4 +1,4 @@
-From db84f42004c27714c6379139fd7520fc8f0ae179 Mon Sep 17 00:00:00 2001
+From 3ab58afed04ef5c2aaf938133f6f5208611ecea4 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
diff --git a/perf-install-trace-event-plugins.patch b/perf-install-trace-event-plugins.patch
index 5cc6c6f8b..db8a8a69d 100644
--- a/perf-install-trace-event-plugins.patch
+++ b/perf-install-trace-event-plugins.patch
@@ -1,4 +1,4 @@
-From dc22e4267fc1d0add0c5fdcb652bc3ead27f1835 Mon Sep 17 00:00:00 2001
+From 22880ec9d245cff19f3ac3c43be86e03baa02a4d 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
diff --git a/pinctrl-pinctrl-single-must-be-initialized-early.patch b/pinctrl-pinctrl-single-must-be-initialized-early.patch
index 853955c9e..b900bcb45 100644
--- a/pinctrl-pinctrl-single-must-be-initialized-early.patch
+++ b/pinctrl-pinctrl-single-must-be-initialized-early.patch
@@ -1,4 +1,4 @@
-From 48bfb6b27b50b1b0697e999c7cd5b926e9b7b92a Mon Sep 17 00:00:00 2001
+From a234ffaffa66fed8e89e4c7456515468489ea177 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.
diff --git a/samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch b/samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
index 780d66f23..622b623ed 100644
--- a/samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
+++ b/samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
@@ -1,4 +1,4 @@
-From 02aed46a6c3dd98f3a892bd0678bee8076cda01b Mon Sep 17 00:00:00 2001
+From ea4bdfd627c29628913d76f0ab5eb19045e9c891 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
diff --git a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
index 973b889de..0f21eed33 100644
--- a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
+++ b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -1,4 +1,4 @@
-From 251915645afe8d96605d74e9168b94749c48dbcf Mon Sep 17 00:00:00 2001
+From fa83c1b01f1764a7a2c22153c942470526a2d6ba 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
diff --git a/silence-fbcon-logo.patch b/silence-fbcon-logo.patch
index 84df81b44..9026e80fa 100644
--- a/silence-fbcon-logo.patch
+++ b/silence-fbcon-logo.patch
@@ -1,4 +1,4 @@
-From 97f499324e8f5aeaf9fb1c9c565bd637b9cbc137 Mon Sep 17 00:00:00 2001
+From a7990f9db873bc753631efd8944715ee9f435962 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
diff --git a/sources b/sources
index e834809a7..6560aeb7d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 5c569ed649a0c9711879f333e90c5386  linux-3.16.tar.xz
 49868ce6467b35cd9ffea1120d129462  perf-man-3.16.tar.gz
 31ccda15a838f060966fe4674c703d46  patch-3.17-rc4.xz
-3b1ab306a6dc39c6d97b66b9ac1e17ef  patch-3.17-rc4-git1.xz
+c6c834bdff2b94640ea7e71267434e3d  patch-3.17-rc4-git2.xz
diff --git a/watchdog-Disable-watchdog-on-virtual-machines.patch b/watchdog-Disable-watchdog-on-virtual-machines.patch
index afb3e1e40..95b615dbb 100644
--- a/watchdog-Disable-watchdog-on-virtual-machines.patch
+++ b/watchdog-Disable-watchdog-on-virtual-machines.patch
@@ -1,4 +1,4 @@
-From 922817aa5a167819e6387fb07d7349044b271386 Mon Sep 17 00:00:00 2001
+From 0d14aeeeac2260ec38388eb371403862c4a24648 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.
diff --git a/x86-Lock-down-IO-port-access-when-module-security-is.patch b/x86-Lock-down-IO-port-access-when-module-security-is.patch
index b37d2d1f7..2276ae1ee 100644
--- a/x86-Lock-down-IO-port-access-when-module-security-is.patch
+++ b/x86-Lock-down-IO-port-access-when-module-security-is.patch
@@ -1,4 +1,4 @@
-From 7b0c4ea353837e3951a9d2e00063c69242c1bfb0 Mon Sep 17 00:00:00 2001
+From 7402f2c5ce28f35591797fff05cc071841be3457 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
diff --git a/x86-Restrict-MSR-access-when-module-loading-is-restr.patch b/x86-Restrict-MSR-access-when-module-loading-is-restr.patch
index 199628fff..9d7aca2d7 100644
--- a/x86-Restrict-MSR-access-when-module-loading-is-restr.patch
+++ b/x86-Restrict-MSR-access-when-module-loading-is-restr.patch
@@ -1,4 +1,4 @@
-From 08664761d1403620e67e3bba6282b2eefe32c400 Mon Sep 17 00:00:00 2001
+From e9142a3fe3e56e949783ef75599cb608eee43b75 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