Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel into baytrail

ACPI-Limit-access-to-custom_method.patch

@@ -1,4 +1,4 @@
-From 24e2a51519d6e750bbaa77a89dbd0deaef731ac4 Mon Sep 17 00:00:00 2001
+From b191661e0e244a142b1a4dd89ef493aacfc0130b 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 4c3c248234fddd8bc46a6f81dc642003b1b4ff06 Mon Sep 17 00:00:00 2001
+From 9d8673e4006ce1aaddfc326e46dbaf2010eda926 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 18e033ab43f2be368caa65019ff302e3ff56b9bf Mon Sep 17 00:00:00 2001
+From 3b0e4981b752ac9177aab3bb1c387b1d33fe7f25 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 7e8b52249deb775a2c32a115d9f295d1eaf2d7e1 Mon Sep 17 00:00:00 2001
+From d80c67904150376c95efef5e89fd3c71a9a6b372 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 43936581256163352d855fe449ecad6ce8859345 Mon Sep 17 00:00:00 2001
+From c33f1163a808514d13b7f5c21dfe9776ff744ef4 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 25011f0392f9fec35715ac50ce6e47b47fdb1fd0 Mon Sep 17 00:00:00 2001
+From d62226e7a2a7361b09154ee92a21cc478a160ca4 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 bf850a098e7ccc726236310b47d9720e716de249 Mon Sep 17 00:00:00 2001
+From 2c6e707e281b5bd3277b10cdfb9fdde74df97561 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 550891802050909033fca84a764fb7b6cb39badb Mon Sep 17 00:00:00 2001
+From 46c887fcfa556e158406dd41858509d4250b1b97 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 d04eb3bd623304216c14ce62a441ac0731ecc5ae Mon Sep 17 00:00:00 2001
+From f6576d5b1a6527cc51e99ad52ed4ae8abb463e8c 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-Reinstate-EPERM-for-a-key-type-name-beginning-w.patch

@@ -0,0 +1,45 @@
+From 97ae62050594a612dc6c590de7e550528811eb72 Mon Sep 17 00:00:00 2001
+From: David Howells <dhowells@redhat.com>
+Date: Tue, 16 Sep 2014 17:29:03 +0100
+Subject: [PATCH] KEYS: Reinstate EPERM for a key type name beginning with a
+ '.'
+
+Reinstate the generation of EPERM for a key type name beginning with a '.' in
+a userspace call.  Types whose name begins with a '.' are internal only.
+
+The test was removed by:
+
+	commit a4e3b8d79a5c6d40f4a9703abf7fe3abcc6c3b8d
+	Author: Mimi Zohar <zohar@linux.vnet.ibm.com>
+	Date:   Thu May 22 14:02:23 2014 -0400
+	Subject: KEYS: special dot prefixed keyring name bug fix
+
+I think we want to keep the restriction on type name so that userspace can't
+add keys of a special internal type.
+
+Note that removal of the test causes several of the tests in the keyutils
+testsuite to fail.
+
+Signed-off-by: David Howells <dhowells@redhat.com>
+Acked-by: Vivek Goyal <vgoyal@redhat.com>
+cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
+---
+ security/keys/keyctl.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
+index e26f860e5f2e..eff88a5f5d40 100644
+--- a/security/keys/keyctl.c
++++ b/security/keys/keyctl.c
+@@ -37,6 +37,8 @@ static int key_get_type_from_user(char *type,
+ 		return ret;
+ 	if (ret == 0 || ret >= len)
+ 		return -EINVAL;
++	if (type[0] == '.')
++		return -EPERM;
+ 	type[len - 1] = '\0';
+ 	return 0;
+ }
+-- 
+1.9.3
+

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

@@ -1,4 +1,4 @@
-From 33e94234c73f1aa8cf340e38ff9c68b316fce839 Mon Sep 17 00:00:00 2001
+From 79428d5399e61484bbe6210cc6a18160120da05f 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 dacd050742106815c32ec9d85062a40afb10357c Mon Sep 17 00:00:00 2001
+From 1e51a6528c217970894434458026f1b854f0ba6b 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 1e6e602526e7d5d9b7dc8a198f7dc37d7c40b36f Mon Sep 17 00:00:00 2001
+From d0b2c36be73f821bb0cca096430d3138ffc68ac4 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 b86c6884582c166c6960c486962ef25b4d64384c Mon Sep 17 00:00:00 2001
+From b1ddd8b3e3622d35ce5d3052278b85200538e136 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 7d6d50ebbfd3476c24b727f3207408b39b0798cf Mon Sep 17 00:00:00 2001
+From 9f977256a2a447b1ad2a3df2f54d7c9dc3ad892f 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 c2fa2cbbd0516e0edb7f22ec862b352e2262588f Mon Sep 17 00:00:00 2001
+From 66632f74336e8698f99a8e5b58bf9965b4582e6c 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 85bc7fbbbf1116b805e05872b5e80f16f649a6cb Mon Sep 17 00:00:00 2001
+From a3dc621f23cb499ac51b5194805cb05cdf8e3c53 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 466bfef3e3b2b0321cbea6138c36c9f1d8265baf Mon Sep 17 00:00:00 2001
+From 48bda121e75f2cadc828ee722dfd7fd1f6593fa8 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 86754098779aa5b4ee80ca4931bc494834021912 Mon Sep 17 00:00:00 2001
+From d766862c6a4a47eb49abc235f97f181109da9331 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 1647ac0e85102e88d086fae63b4ae5c8aa50e2ec Mon Sep 17 00:00:00 2001
+From dc868e6a60619c5b6cc2196946c1a1a223abb1c7 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 8892d56c711c7e895d23e137f547fcd011d97d4a Mon Sep 17 00:00:00 2001
+From a37eef827de2081fb2fcf6e21f4688c08ec1360c 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 0a89bdfe1e7e5b1ddd5d6628e2b5338ca682c889 Mon Sep 17 00:00:00 2001
+From 848886fbd67ec1b03e525ef1f2a3b93569e3a5b9 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 91d44a9bb5bce2bbfd5fb23db4dcd38a6a881840 Mon Sep 17 00:00:00 2001
+From 52dc0a6952f67e505f4f5efb7d7ac91c8e46fda1 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 6f31aa49694156131613f26492025df1727e9d8d Mon Sep 17 00:00:00 2001
+From b282db6857d9d2d4f8dcbf7a71af0b3585b35b24 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 70f09aa8bbe0a35ceb1cf67bf1c14b7c17f6ce22 Mon Sep 17 00:00:00 2001
+From b9a005e810a18ae331a42649be21401a79c0668a 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 7197fe8f60d5cdaaec0462cf6b9b92a538df56bf Mon Sep 17 00:00:00 2001
+From 0a132f3763f9726eb91a65411a0f644dc92f4870 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 6e4d25af3b3fa9b354d4c06c1d852cf4690a9b27 Mon Sep 17 00:00:00 2001
+From 5169f81b865a1ead5fd703d83f51c4d449ceeb7b 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 24616bc46403d40dcc7392bee4d71b6b5ea18be9 Mon Sep 17 00:00:00 2001
+From 5b90ba692da0671bf1e07d032f8ab21ccc5e11f8 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 9c743c9a7b253c0aa881ce21bc9bba2fc536a095 Mon Sep 17 00:00:00 2001
+From 1dce5d85f095caf419aad8ef67f694f42648b1db 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 60eb768c1c10a1c7b32f0580e807e57ff36fe341 Mon Sep 17 00:00:00 2001
+From 1c9df8cf509586b08c4ce3c4c8116c5a04158782 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 6a1d1898d3324c98a24dbd686ca19ffbb9937193 Mon Sep 17 00:00:00 2001
+From 71ffa0d821869928e2ccbdb11caef742734c7a4a 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 79ba3c00fb15445bfc5a7f8c1a44276823a4e2b8 Mon Sep 17 00:00:00 2001
+From f525693a93fb068434d3950f64cea5a8a0a8446d 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 fca50f088077f62f3c33ae606fc06218d66cc269 Mon Sep 17 00:00:00 2001
+From d518c164ce6f66749f3d74e440ce63a595ac0b75 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

drm-vmwgfx-Fix-drm.h-include.patch

@@ -1,4 +1,4 @@
-From b3df526969b0a3f099f6bbf59d00cbc8cb89f50c Mon Sep 17 00:00:00 2001
+From e46ffb46e7f5d09e91b565c0b1d4dbadeccca532 Mon Sep 17 00:00:00 2001
 From: Josh Boyer <jwboyer@fedoraproject.org>
 Date: Fri, 5 Sep 2014 13:19:59 -0400
 Subject: [PATCH] drm/vmwgfx: Fix drm.h include

efi-Add-EFI_SECURE_BOOT-bit.patch

@@ -1,4 +1,4 @@
-From 9a7a163214c94fa6816c24c931086b42ff040ae4 Mon Sep 17 00:00:00 2001
+From 305c2c42f34e4f635a6fb842de7aae5a5c17dbb9 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 2c49d28d56952bd2cadc7a1f01284e6aa44be8d8 Mon Sep 17 00:00:00 2001
+From e377b5c796779bcfbdd776f3e8b984aa54e0e3e3 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 e9b4ee4a05f9ab3c58b3587001bc3485998b9fd8 Mon Sep 17 00:00:00 2001
+From 2939a16985d33e9a95e1f9a3ff8c14f9fbf5d2af 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 653a5808a8bfda25d95ae558206da7955d48b76f Mon Sep 17 00:00:00 2001
+From 720d3f956833c7d2bb8c13dd643496ef42636a0c 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

input-kill-stupid-messages.patch

@@ -1,4 +1,4 @@
-From 5226fa73199d7ffe9c566504ac34df0726669886 Mon Sep 17 00:00:00 2001
+From 68f5b99e1f63c1870802aa76faea0b483aef5501 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 912b682d23940d73d8e6c6d1ac44715b670a727a Mon Sep 17 00:00:00 2001
+From cb7bff00e9f4c7c6fb2cbe96b9083db9eb3394f0 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 a93abe38093393c48de0acb2d5fbf2079e8fda71 Mon Sep 17 00:00:00 2001
+From 6dab4669a443c0adab3ec1a37741cfba33c34350 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

@@ -70,7 +70,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -622,6 +622,9 @@ Patch26022: x86-efi-Delete-misleading-efi_printk-error-message.patch
 #rhbz 1123584
 Patch26028: HID-rmi-check-sanity-of-incoming-report.patch
 
+#rhbz 1145318
+Patch26029: KEYS-Reinstate-EPERM-for-a-key-type-name-beginning-w.patch
+
 # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
 Patch30000: kernel-arm64.patch
 
@@ -1372,6 +1375,9 @@ ApplyPatch x86-efi-Delete-misleading-efi_printk-error-message.patch
 #rhbz 1123584
 ApplyPatch HID-rmi-check-sanity-of-incoming-report.patch
 
+#rhbz 1145318
+ApplyPatch KEYS-Reinstate-EPERM-for-a-key-type-name-beginning-w.patch
+
 %if 0%{?aarch64patches}
 ApplyPatch kernel-arm64.patch
 %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2251,7 +2257,11 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Wed Sep 24 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc6.git2.1
+- Linux v3.17-rc6-180-g452b6361c4d9
+
 * Tue Sep 23 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix return code when adding keys (rhbz 1145318)
 - Add patch to fix XPS 13 touchpad issue (rhbz 1123584)
 
 * Tue Sep 23 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc6.git1.1

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

@@ -1,4 +1,4 @@
-From d04319e1c3888098fc2bbf10d1056b701a72126d Mon Sep 17 00:00:00 2001
+From 4663f10bc1005b82cf1a99419a83bab5ab2e6f80 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 bf421044b56512b764c2755327eeac1a7c73d6da Mon Sep 17 00:00:00 2001
+From 8ac1e39af0a3511ddfdd730cda52f30d0d15e691 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 704f062dbd28150ae22cafe590aaebe9f43d93f9 Mon Sep 17 00:00:00 2001
+From be186dded4be8ffdc36b558e72083eb70e55ea1e 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

no-pcspkr-modalias.patch

@@ -1,4 +1,4 @@
-From 46ae94f0cbffe1127c0fb722a1dba1a3a08ca2fa Mon Sep 17 00:00:00 2001
+From 4567bf4b21dfbfd62384addbe60a32c399372ebe 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 68cc5e1589ccf6d3ba0894a2187f82c38cc4926f Mon Sep 17 00:00:00 2001
+From 2c58cbc0510ac955bffad71efadff30a398dc30f 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 a3312f202419dd890dafc7e17f40aa4aade98626 Mon Sep 17 00:00:00 2001
+From 1988697e1502e16dc01d4cbec0e8f2cb72380c54 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 af587b24831c0d726d56feb4520cc472b934ddbf Mon Sep 17 00:00:00 2001
+From c6ca98a7027b27025540756bdd920e7e2332388d 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 7ffd60e0b0ebd2e10d689dbd7678bda6bc097b07 Mon Sep 17 00:00:00 2001
+From 71a0dab8b317e2b3dd8ae3f39c97ee1cc31c0ad4 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 1d345df6c202948c81f543e8a14ef99eef35fdb6 Mon Sep 17 00:00:00 2001
+From 9af36d1a2d9ad315ed104cde0edd1975b776e24a 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 3ae8633ef90fb6c0da7df88ffc08dc1f74efeb66 Mon Sep 17 00:00:00 2001
+From db240c2d2d68149da3a8921c037c36f97e846080 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 1f7ec8f99f9b0cb1a6753a6c7eb8f982a69ace0a Mon Sep 17 00:00:00 2001
+From 098fc8dfdf6b199478c1d5d93628bb507d07cd63 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
 d3e9581611409e76e00f9391c3b0866c  patch-3.17-rc6.xz
-6ad80b14f2908ea54d5c37954209a467  patch-3.17-rc6-git1.xz
+49093094fba3326530857bd66ddd4aa7  patch-3.17-rc6-git2.xz

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

@@ -1,4 +1,4 @@
-From 74b9840776547293b6dbfb4d58c5e3fdd1cead4b Mon Sep 17 00:00:00 2001
+From d2d1a4dc3994ccdb4d82d1d5310fc2c49279fa43 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 435b69f5e5e418cb2dc5fa565deb66657d6aa765 Mon Sep 17 00:00:00 2001
+From 9fef212b0fa081b86d9e8badee77f08dbe322b5d 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 860ab184bfde12e629a195e25d80cf5e0f2e2441 Mon Sep 17 00:00:00 2001
+From 1975e92ad85bd4ac618e82ca4648f5cb6077cc5c 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

x86-efi-Delete-misleading-efi_printk-error-message.patch

@@ -1,4 +1,4 @@
-From 9c83ec563eb31f88f408a52e0298bb8c2e00def1 Mon Sep 17 00:00:00 2001
+From 47a2577d99c13db7ad5181200cd17229b828a883 Mon Sep 17 00:00:00 2001
 From: Matt Fleming <matt.fleming@intel.com>
 Date: Mon, 15 Sep 2014 16:20:54 +0100
 Subject: [PATCH] x86/efi: Delete misleading efi_printk() error message