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

ACPI-Limit-access-to-custom_method.patch

@@ -1,4 +1,4 @@
-From 9a0524014ff15a4ecf504ae9eb0ca9ff4e22d81a Mon Sep 17 00:00:00 2001
+From c53c58a2063584dc6c9e6c1f86de52b3dd42a5ea 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 522c5e30395af75639baaaf105bbafe84c47e2fb Mon Sep 17 00:00:00 2001
+From 872526af195926f157333cb362b5a414dfd7943b 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 a0cad672db673d76836c7293b832b4c1505ed8bb Mon Sep 17 00:00:00 2001
+From 398af2f1b6a3dadd215e32c2c992147660368f5a 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 6a99c85fe212caec4c19893458c222bac7cd11ab Mon Sep 17 00:00:00 2001
+From 353fd504bfda001ea91bd7e96babad0bedee5355 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 f2447f165fdb5b875f13e5c363675f64b5ace2be Mon Sep 17 00:00:00 2001
+From a31311c93c02cb524a33444130d852422febf65a 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
@@ -55,7 +55,7 @@ index 36327438caf0..61542c282e70 100644
  	def_bool y
  	prompt "Enable seccomp to safely compute untrusted bytecode"
 diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
-index f277184e2ac1..88edd48f03e9 100644
+index dca9842d8f91..baab83bcec44 100644
 --- a/arch/x86/boot/compressed/eboot.c
 +++ b/arch/x86/boot/compressed/eboot.c
 @@ -12,6 +12,7 @@
@@ -104,7 +104,7 @@ index f277184e2ac1..88edd48f03e9 100644
  /*
   * See if we have Graphics Output Protocol
   */
-@@ -1374,6 +1406,10 @@ struct boot_params *efi_main(struct efi_config *c,
+@@ -1378,6 +1410,10 @@ struct boot_params *efi_main(struct efi_config *c,
  	else
  		setup_boot_services32(efi_early);
  

Add-secure_modules-call.patch

@@ -1,4 +1,4 @@
-From 85f1d5055d6b541c6d50b84537029c76d5d9875c Mon Sep 17 00:00:00 2001
+From 8655a08ecf154496df605b71b6d8b19f76e86943 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 56ad2877113a2440ce57079c90e6a750f1f6df7b Mon Sep 17 00:00:00 2001
+From bbafe1192b0b96a205f82d592b1396f2d21b9355 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 e5490f18e53f48930f4852e5f0f9b62f2dad39f4 Mon Sep 17 00:00:00 2001
+From 80ad966952cf9302e5da41ca662b544e81fda772 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 0161ebd611da0771f819fa132a2e11895031a7a1 Mon Sep 17 00:00:00 2001
+From ca86eaa0ba3c5f067290ffcb29632f5d214ecc7f 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

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

@@ -1,4 +1,4 @@
-From 20d15a9684978478d87c351611c97cb8bb1b1757 Mon Sep 17 00:00:00 2001
+From b7a785248769118881e6a53a19f26a4258dbd859 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 a4440ad8ead4131f20cc0671a2936ee03a85c284 Mon Sep 17 00:00:00 2001
+From 4c731d7d92c141166fc13241e0c4a6510b0da96b 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 3ccfc16c29b022bfae03dd3df09d07eed0d979fa Mon Sep 17 00:00:00 2001
+From 3cb32ae73a69d216fc10f45d8f23369e528812e0 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 46efbd1ee33bdbb0aba714e4255c9e4f57f40d70 Mon Sep 17 00:00:00 2001
+From d99ddabd2ef175d8e4ee705216077e0c93719805 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 fc514f5bf8ace4624a8710f0b268a60928ec583e Mon Sep 17 00:00:00 2001
+From a58297a7c62fc970be9339308c56a48f714775a2 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

TODO

@@ -1,6 +1,3 @@
-* Post 3.5:
-- Check if PaulMcK has fixed CONFIG_RCU_FAST_NO_HZ
-
 Config TODOs:
 * review & disable a bunch of the I2C, RTC, DVB, SOUND options.
 
@@ -11,6 +8,3 @@ Spec file TODOs:
   - Don't fail the build if a module is listed but not built (maybe).
   - See if it can be tied into Kconfig instead of module names.
 
-* investigate gzip modules. Everything should support this now?
-  Looks like about 70M savings per kernel installed.
-

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

@@ -1,4 +1,4 @@
-From 95f82733b73c405f02ca4a0b249670c11adaccf7 Mon Sep 17 00:00:00 2001
+From a39a7e3f405ff69280ed9cbcf209a9e997fe4231 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 9c9e0005434106778f8b7896db2a1edb2862d959 Mon Sep 17 00:00:00 2001
+From eab1f5d077fbe502157b2ab2990f0dbff3508736 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 636bb5c51b888ffccf560e8b82b176616739ee51 Mon Sep 17 00:00:00 2001
+From 8319012a6df7afe31a3c464a5e9272eae4886470 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 a5e78d0edf921d1ba786bd90e64ca5e5b3e032c0 Mon Sep 17 00:00:00 2001
+From 8551f49ae79c6576cc7884969d0be51aee518d66 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 e22192c05f5d2023b8cc5a412d52b46f24fe5166 Mon Sep 17 00:00:00 2001
+From b11c3925139aa2be985812a6b10493c23c7d6b13 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 dfb26bfbb4eb74f373623a27b6c862645b62a715 Mon Sep 17 00:00:00 2001
+From 7b5fb8b6d5ac68fd67419f2beedeee0003562e06 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 6828a05494d174fd4e4fa9b9a18eb0dcb81adaf3 Mon Sep 17 00:00:00 2001
+From 278fa7d0889419ca1a6259cbc492d786b5d1ca41 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 eadee0c1a7f78f1cd82d71dbe17465bb6e290ee1 Mon Sep 17 00:00:00 2001
+From f27cdc87f224c190637c6bda0c4bd833ed20699d 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 ae8d1fbf41382f4d74228eda6f8b872cd823ce31 Mon Sep 17 00:00:00 2001
+From 4c6a5b9bc672b0f8ac7f418be4f69a972add794c 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 9bb49c6fdfafaeaf9e0bf8da797c1f211ab5b91b Mon Sep 17 00:00:00 2001
+From 1e3d6aff4f728047d2f808c17ed5784abc083f74 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 4fcf22b9570403fcb9fc3e7a99408cde05a7e5a6 Mon Sep 17 00:00:00 2001
+From bc529faf829e29abc4e4dbb2425d3fadf08b13d9 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 00c327c9b1f43a59c81b1db548b2acd9a0402fa8 Mon Sep 17 00:00:00 2001
+From 33a40d4d38076bd623d9478b705d583d1d10a4a7 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

config-generic

@@ -5203,8 +5203,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
 CONFIG_STRIP_ASM_SYMS=y
 
 # CONFIG_RCU_FANOUT_EXACT is not set
-# FIXME: Revisit FAST_NO_HZ after it's fixed
+CONFIG_RCU_FAST_NO_HZ=y
-# CONFIG_RCU_FAST_NO_HZ is not set
 CONFIG_RCU_NOCB_CPU=y
 CONFIG_RCU_NOCB_CPU_ALL=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60

config-s390x

@@ -235,10 +235,30 @@ CONFIG_SCM_BLOCK=m
 CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 # CONFIG_S390_PTDUMP is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
-# CONFIG_PCI is not set
+
+CONFIG_PCI=y
+CONFIG_PCI_NR_FUNCTIONS=64
+CONFIG_PCI_NR_MSI=256
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_SHPC=y
+CONFIG_HOTPLUG_PCI_S390=y
 
 # CONFIG_NEW_LEDS is not set
 # CONFIG_HID is not set
+# CONFIG_MTD is not set
+
+# CONFIG_PARPORT is not set
+# CONFIG_UWB is not set
+# CONFIG_MMC is not set
+# CONFIG_FB is not set
+# CONFIG_MFD_CORE is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_CB710_CORE is not set
+# CONFIG_FCOE is not set
+# CONFIG_FUSION is not set
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
 
 # CONFIG_INPUT is not set
 # CONFIG_INPUT_JOYDEV is not set
@@ -248,6 +268,8 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
+# CONFIG_GAMEPORT_EMU10K1 is not set
+# CONFIG_GAMEPORT_FM801 is not set
 # CONFIG_SERIO is not set
 
 # CONFIG_ACCESSIBILITY is not set
@@ -269,6 +291,17 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_PTP_1588_CLOCK is not set
 # CONFIG_PPS is not set
+# CONFIG_W1 is not set
+# CONFIG_HWMON is not set
+# CONFIG_SSB is not set
+# CONFIG_BCMA is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_LCD_CLASS_DEVICE is not set
+# CONFIG_LCD_PLATFORM is not set
+# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
+# CONFIG_MFD_RTSX_PCI is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_VX855 is not set
 
 # CONFIG_PHYLIB is not set
 # CONFIG_ATM_DRIVERS is not set
@@ -282,4 +315,15 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 
 # CONFIG_FMC is not set
 
+CONFIG_NETDEV_10000=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+CONFIG_IRQ_DOMAIN_DEBUG=y
+
 CONFIG_CRASH=m

config-x86-generic

@@ -10,10 +10,12 @@ CONFIG_HPET_TIMER=y
 
 CONFIG_I8K=m
 CONFIG_SONYPI_COMPAT=y
-CONFIG_MICROCODE=m
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_EARLY=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_INTEL_EARLY=y
 CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_AMD_EARLY=y
 
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y

config-x86_64-generic

@@ -184,3 +184,8 @@ CONFIG_SFC_MTD=y
 CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLOCK=m
 
+CONFIG_NO_HZ_FULL=y
+# CONFIG_NO_HZ_IDLE is not set
+# CONFIG_NO_HZ_FULL_ALL is not set
+# CONFIG_NO_HZ_FULL_SYSIDLE is not set
+# CONFIG_CONTEXT_TRACKING_FORCE is not set

crash-driver.patch

@@ -1,4 +1,4 @@
-From 1e0fecc62e3b9e9a9ce5cf791a98fb758b76665e Mon Sep 17 00:00:00 2001
+From 9c2eb9d455ad21631f4150a6d07535b64296667f 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 62b8aa06a3aab05ab855793a51608613a5b91e24 Mon Sep 17 00:00:00 2001
+From 8117f102d52a369437cb28bd6c6e1d224139e011 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 e2696fcf03e37e8253a11f3b14d7d822b0dac5b3 Mon Sep 17 00:00:00 2001
+From e54d068f75af3de4cecc6934df22c180ab28d4af 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 53e0d01e8d7ac658bde8a81f7e8ceaf87974b5d2 Mon Sep 17 00:00:00 2001
+From 7e6ed091c27abaa2e0c422ee65e02bd9a07d3c4b 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 b66ea6f3d8fd863e6010542070db582cc8899409 Mon Sep 17 00:00:00 2001
+From 18a370eee0e3d1b4cc5d9808667190590352fcc0 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 738607f7379441ad8c8954bd9590641715f11b8e Mon Sep 17 00:00:00 2001
+From 314e204fe21ff260f4a75036a993331b8c13da1f 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

@@ -0,0 +1,35 @@
+From 939c7aa01b7ff78d20052e907bc22602e912a580 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
+
+The userspace drm.h include doesn't prefix the drm directory.  This can lead
+to compile failures as /usr/include/drm/ isn't in the standard gcc include
+paths.  Fix it to be <drm/drm.h>, which matches the rest of the driver drm
+header files that get installed into /usr/include/drm.
+
+Red Hat Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1138759
+
+Fixes: 1d7a5cbf8f74e
+Reported-by: Jeffrey Bastian <jbastian@redhat.com>
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ include/uapi/drm/vmwgfx_drm.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h
+index 4fc66f6b12ce..c472bedbe38e 100644
+--- a/include/uapi/drm/vmwgfx_drm.h
++++ b/include/uapi/drm/vmwgfx_drm.h
+@@ -29,7 +29,7 @@
+ #define __VMWGFX_DRM_H__
+ 
+ #ifndef __KERNEL__
+-#include <drm.h>
++#include <drm/drm.h>
+ #endif
+ 
+ #define DRM_VMW_MAX_SURFACE_FACES 6
+-- 
+1.9.3
+

efi-Add-EFI_SECURE_BOOT-bit.patch

@@ -1,4 +1,4 @@
-From 5f2969386c63411a01b2a5ad0f0b585bf8fbd67e Mon Sep 17 00:00:00 2001
+From 5bb21031c9674da9f91ddddef68b718e89a7dfb7 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 a04f786b6799ace9a7d42631abc4daf3d8e3bd89 Mon Sep 17 00:00:00 2001
+From 3410b9e21b189627690287ee838bf3892e4fffe0 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
@@ -15,7 +15,7 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
  1 file changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
-index 88edd48f03e9..3b18ef2b534c 100644
+index baab83bcec44..c32bc46bd699 100644
 --- a/arch/x86/boot/compressed/eboot.c
 +++ b/arch/x86/boot/compressed/eboot.c
 @@ -806,8 +806,9 @@ out:

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

@@ -1,4 +1,4 @@
-From 5af5d95a6b1068e4e1c9a20f5fb28fe763265610 Mon Sep 17 00:00:00 2001
+From f27a8f9f4dc6d33adf72cffcb579ddbdeabf9308 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 864f3a13e29d0f86775e337e1398868173af3a14 Mon Sep 17 00:00:00 2001
+From 0481a8d7362eb116a3e8e6e76a548018dfd6cf16 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 2fd9e12020ad2b89222bb44f026400ddec8ef2ce Mon Sep 17 00:00:00 2001
+From 97403cbfb9d78282e0b2c2feb2ffeb02989232ee 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 43b38765023999cb920cf389baaa285e401d2be3 Mon Sep 17 00:00:00 2001
+From 789c3296a47d7dc60a8cf24bc0518bdcde5c8556 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 8411be6a92fe0a9ae0644bcd1d8d4a176798b6ec Mon Sep 17 00:00:00 2001
+From cc33c4691deae54f332b1a525ec32e36d839ad05 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 5
 # The git snapshot level
-%define gitrev 1
+%define gitrev 5
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -614,6 +614,11 @@ Patch26016: HID-wacom-Add-support-for-the-Cintiq-Companion.patch
 Patch26019: psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
 Patch26020: psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
 
+#rhbz 1138759
+Patch26021: drm-vmwgfx-Fix-drm.h-include.patch
+
+Patch26022: x86-efi-Delete-misleading-efi_printk-error-message.patch
+
 # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
 Patch30000: kernel-arm64.patch
 
@@ -1355,6 +1360,11 @@ ApplyPatch HID-wacom-Add-support-for-the-Cintiq-Companion.patch
 ApplyPatch psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
 ApplyPatch psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
 
+#rhbz 1138759
+ApplyPatch drm-vmwgfx-Fix-drm.h-include.patch
+
+ApplyPatch x86-efi-Delete-misleading-efi_printk-error-message.patch
+
 %if 0%{?aarch64patches}
 ApplyPatch kernel-arm64.patch
 %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2233,6 +2243,29 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Fri Sep 19 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git5.1
+- Linux v3.17-rc5-105-g598a0c7d0932
+
+* Fri Sep 19 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Disable NO_HZ_FULL again
+- Enable early microcode loading (rhbz 1083716)
+
+* Fri Sep 19 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git4.1
+- Linux v3.17-rc5-63-gd9773ceabfaf
+- Enable infiniband on s390x
+
+* Thu Sep 18 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git3.1
+- Linux v3.17-rc5-25-g8ba4caf1ee15
+
+* Wed Sep 17 2014 Kyle McMartin <kyle@fedoraproject.org>
+- I also like to live dangerously. (Re-enable RCU_FAST_NO_HZ which has been off
+  since April 2012. Also enable NO_HZ_FULL on x86_64.)
+- I added zipped modules ages ago, remove it from TODO.
+
+* Wed Sep 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git2.1
+- Linux v3.17-rc5-24-g37504a3be90b
+- Fix vmwgfx header include (rhbz 1138759)
+
 * 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.

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

@@ -1,4 +1,4 @@
-From 7d7cf8b5771f0ede7191c69127260db0862bef2e Mon Sep 17 00:00:00 2001
+From e901d04b0a29c56abc29abf197a7f16560173599 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 5f8dab4ab55dfcfde9f2caf33470bb0c232f518b Mon Sep 17 00:00:00 2001
+From 4d51b1c38c4848bc86cdacd63b0a9341fe8be29c 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 b908a0fe3b5e562ef471e777e257da288f96f532 Mon Sep 17 00:00:00 2001
+From efd77e53ccb1cb5c615c10788b7548c59a58fc45 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 5f80ea47e06951b59935000b6bda75af7791a5d8 Mon Sep 17 00:00:00 2001
+From b42506ff4d9cae366b51f0e73a7acafd19989de8 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 1b201edb207a4be37c46b3bba6e13d8f1ad1b566 Mon Sep 17 00:00:00 2001
+From c29ba2d0580ebabbe01cfd63d269f75ac8292804 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 12f91b34148671d7c3c64a3838d8e33f97d813ed Mon Sep 17 00:00:00 2001
+From f77993e26a44dc2a895290b59a92f4d8b554d63f 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 665b19601bddba33e2fed281a8bff00829cf9c89 Mon Sep 17 00:00:00 2001
+From 763ce537fedc607cae30f48f48a75fb67aff839e 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 0b87591a56a41f7aee68991150471ff498b1c4e0 Mon Sep 17 00:00:00 2001
+From 4bcbe082519c8dfec88e038b7a8cdc772614bd6c 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 a4a2042c79c24e5dbefec682af4bbd783deb5c7e Mon Sep 17 00:00:00 2001
+From 213444c6bff4cba137548404b2a6449c797345c7 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 78f2b98263f0f9c487aafa177e48c2f85ad8e40d Mon Sep 17 00:00:00 2001
+From 3003160c966e29a57ce6b9f6c3ed5e65e1267507 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 f2711040b5b853fef948c0f381b7822b2afe4f5c Mon Sep 17 00:00:00 2001
+From 52e404197724ac3584f6b06866f2b621729c0152 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
 b9960a1861ef3acb8b78ee19f9ca7bac  patch-3.17-rc5.xz
-48aa60853a327b5e32098abd6b069ef3  patch-3.17-rc5-git1.xz
+186ad190c669703299a1bcbf50a4dee7  patch-3.17-rc5-git5.xz

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

@@ -1,4 +1,4 @@
-From 7361c690dcee6003a3dfbba146407c117fd88c0f Mon Sep 17 00:00:00 2001
+From 548edc6a72282995e0339cc8e989111dd4df3477 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 8c38df48422ecd8706959ec3f0ba911cf121eeea Mon Sep 17 00:00:00 2001
+From b62db6606dbe28e8b4895982f22a8a3c34ff4b62 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 a3ba1ab7309cadd986eb1ff9ce1842d6aa92c9bb Mon Sep 17 00:00:00 2001
+From 2f12b63cd0930018801a9e605852a96663b847ef 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

@@ -0,0 +1,49 @@
+From 8c9644e12f66fc5f75109689742f641437c34afa 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
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A number of people are reporting seeing the "setup_efi_pci() failed!"
+error message in what used to be a quiet boot,
+
+  https://bugzilla.kernel.org/show_bug.cgi?id=81891
+
+The message isn't all that helpful because setup_efi_pci() can return a
+non-success error code for a variety of reasons, not all of them fatal.
+
+Drop the efi_printk() now that we have more fine-grained, and more
+specific, error messages throughout the *setup_efi_pci*() code paths.
+
+Upstream-status: 3.18
+
+Reported-by: Darren Hart <dvhart@linux.intel.com>
+Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
+Cc: Ulf Winkelvos <ulf@winkelvos.de>
+Cc: Andre Müller <andre.muller@web.de>
+Signed-off-by: Matt Fleming <matt.fleming@intel.com>
+---
+ arch/x86/boot/compressed/eboot.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
+index c32bc46bd699..9705cf1966c2 100644
+--- a/arch/x86/boot/compressed/eboot.c
++++ b/arch/x86/boot/compressed/eboot.c
+@@ -1434,10 +1434,7 @@ struct boot_params *efi_main(struct efi_config *c,
+ 
+ 	setup_graphics(boot_params);
+ 
+-	status = setup_efi_pci(boot_params);
+-	if (status != EFI_SUCCESS) {
+-		efi_printk(sys_table, "setup_efi_pci() failed!\n");
+-	}
++	setup_efi_pci(boot_params);
+ 
+ 	status = efi_call_early(allocate_pool, EFI_LOADER_DATA,
+ 				sizeof(*gdt), (void **)&gdt);
+-- 
+1.9.3
+