3.17.0-0.rc6.git0.1.fc22.gnu

99 files changed, 6731 insertions, 13492 deletions

diff --git a/freed-ora/current/master/0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch b/freed-ora/current/master/0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
deleted file mode 100644
index aab1c4e32..000000000
--- a/freed-ora/current/master/0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1021036
-Upstream-status: Send upstream for 3.17
-
-From 0ad19912cb324f0a356a212433ec0b2a31f61acc Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Fri, 20 Jun 2014 10:29:16 +0200
-Subject: [PATCH] ideapad-laptop: Change Lenovo Yoga 2 series rfkill handling
-
-It seems that the same problems which lead to adding an rfkill blacklist and
-putting the Lenovo Yoga 2 11 on it are also present on the Lenovo Yoga 2 13
-and Lenovo Yoga 2 Pro too:
-https://bugzilla.redhat.com/show_bug.cgi?id=1021036
-https://forums.lenovo.com/t5/Linux-Discussion/Yoga-2-13-not-Pro-Linux-Warning/m-p/1517612
-
-Testing has shown that the firmware rfkill settings are persistent over
-reboots. So blacklisting the driver is not good enough, if the wifi is blocked
-at the firmware level the wifi needs to be explictly unblocked through the
-ideapad-laptop interface.
-
-And at least on the Lenovo Yoga 2 13 the VPCCMD_RF register which on devices
-with hardware kill switch reports the hardware switch state, needs to be
-explictly set to 1 (radio enabled / not blocked).
-
-So this patch does 3 things to get proper rfkill handling on these models:
-
-1) Instead of blacklisting the rfkill functionality, which means that people
-with a firmware blocked wifi get stuck in that situation, ignore the value
-reported by the not present hardware rfkill switch, as this is what is causing
-ideapad-laptop to wrongly report all radios as hardware blocks. But do register
-the rfkill interfaces so that the user can soft [un]block them.
-
-2) On models without a hardware rfkill switch, explictly set VPCCMD_RF to 1
-
-3) Drop the " 11" postfix from the dmi match string, as the entire Yoga 2
-series is affected.
-
-Yoga 2 11:
-Reported-and-tested-by: Vincent Gerris <vgerris@gmail.com>
-
-Yoga 2 13:
-Tested-by: madls05 <http://ubuntuforums.org/showthread.php?t=2215044>
-
-Yoga 2 Pro:
-Reported-and-tested-by: Peter F. Patel-Schneider <pfpschneider@gmail.com>
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/platform/x86/ideapad-laptop.c | 41 +++++++++++++++++++++++------------
- 1 file changed, 27 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
-index b4c495a..b0e3a2e 100644
---- a/drivers/platform/x86/ideapad-laptop.c
-+++ b/drivers/platform/x86/ideapad-laptop.c
-@@ -87,6 +87,7 @@ struct ideapad_private {
- 	struct backlight_device *blightdev;
- 	struct dentry *debug;
- 	unsigned long cfg;
-+	bool has_hw_rfkill_switch;
- };
- 
- static bool no_bt_rfkill;
-@@ -473,12 +474,14 @@ static struct rfkill_ops ideapad_rfk_ops = {
- 
- static void ideapad_sync_rfk_state(struct ideapad_private *priv)
- {
--	unsigned long hw_blocked;
-+	unsigned long hw_blocked = 0;
- 	int i;
- 
--	if (read_ec_data(priv->adev->handle, VPCCMD_R_RF, &hw_blocked))
--		return;
--	hw_blocked = !hw_blocked;
-+	if (priv->has_hw_rfkill_switch) {
-+		if (read_ec_data(priv->adev->handle, VPCCMD_R_RF, &hw_blocked))
-+			return;
-+		hw_blocked = !hw_blocked;
-+	}
- 
- 	for (i = 0; i < IDEAPAD_RFKILL_DEV_NUM; i++)
- 		if (priv->rfk[i])
-@@ -821,14 +824,17 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data)
- 	}
- }
- 
--/* Blacklist for devices where the ideapad rfkill interface does not work */
--static struct dmi_system_id rfkill_blacklist[] = {
--	/* The Lenovo Yoga 2 11 always reports everything as blocked */
-+/*
-+ * Some ideapads don't have a hardware rfkill switch, reading VPCCMD_R_RF
-+ * always results in 0 on these models, causing ideapad_laptop to wrongly
-+ * report all radios as hardware-blocked.
-+ */
-+static struct dmi_system_id no_hw_rfkill_list[] = {
- 	{
--		.ident = "Lenovo Yoga 2 11",
-+		.ident = "Lenovo Yoga 2 11 / 13 / Pro",
- 		.matches = {
- 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
--			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2 11"),
-+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2"),
- 		},
- 	},
- 	{}
-@@ -856,6 +862,7 @@ static int ideapad_acpi_add(struct platform_device *pdev)
- 	priv->cfg = cfg;
- 	priv->adev = adev;
- 	priv->platform_device = pdev;
-+	priv->has_hw_rfkill_switch = !dmi_check_system(no_hw_rfkill_list);
- 
- 	ret = ideapad_sysfs_init(priv);
- 	if (ret)
-@@ -869,11 +876,17 @@ static int ideapad_acpi_add(struct platform_device *pdev)
- 	if (ret)
- 		goto input_failed;
- 
--	if (!dmi_check_system(rfkill_blacklist)) {
--		for (i = 0; i < IDEAPAD_RFKILL_DEV_NUM; i++)
--			if (test_bit(ideapad_rfk_data[i].cfgbit, &priv->cfg))
--				ideapad_register_rfkill(priv, i);
--	}
-+	/*
-+	 * On some models without a hw-switch (the yoga 2 13 at least)
-+	 * VPCCMD_W_RF must be explicitly set to 1 for the wifi to work.
-+	 */
-+	if (!priv->has_hw_rfkill_switch)
-+		write_ec_cmd(priv->adev->handle, VPCCMD_W_RF, 1);
-+
-+	for (i = 0; i < IDEAPAD_RFKILL_DEV_NUM; i++)
-+		if (test_bit(ideapad_rfk_data[i].cfgbit, &priv->cfg))
-+			ideapad_register_rfkill(priv, i);
-+
- 	ideapad_sync_rfk_state(priv);
- 	ideapad_sync_touchpad_state(priv);
- 
--- 
-2.0.0
-
diff --git a/freed-ora/current/master/ACPI-Limit-access-to-custom_method.patch b/freed-ora/current/master/ACPI-Limit-access-to-custom_method.patch
new file mode 100644
index 000000000..abc7e632b
--- /dev/null
+++ b/freed-ora/current/master/ACPI-Limit-access-to-custom_method.patch
@@ -0,0 +1,31 @@
+From 9c4cd012ceae44e986ebfd30f234160d3646850c 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
+
+custom_method effectively allows arbitrary access to system memory, making
+it possible for an attacker to circumvent restrictions on module loading.
+Disable it if any such restrictions have been enabled.
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ drivers/acpi/custom_method.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
+index c68e72414a67..4277938af700 100644
+--- a/drivers/acpi/custom_method.c
++++ b/drivers/acpi/custom_method.c
+@@ -29,6 +29,9 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
+ 	struct acpi_table_header table;
+ 	acpi_status status;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (!(*ppos)) {
+ 		/* parse the table header to get the table length */
+ 		if (count <= sizeof(struct acpi_table_header))
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/ARM-tegra-usb-no-reset.patch b/freed-ora/current/master/ARM-tegra-usb-no-reset.patch
new file mode 100644
index 000000000..871b1fc6b
--- /dev/null
+++ b/freed-ora/current/master/ARM-tegra-usb-no-reset.patch
@@ -0,0 +1,32 @@
+From 85495164fa6363ffb1879d32a030631bd5a912a3 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
+
+Patch for disconnect issues with storage attached to a
+ tegra-ehci controller
+---
+ drivers/usb/core/hub.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
+index d481c99a20d7..6050143ce7ec 100644
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -5036,6 +5036,13 @@ static void hub_events(void)
+ 				(u16) hub->change_bits[0],
+ 				(u16) hub->event_bits[0]);
+ 
++		/* Don't disconnect USB-SATA on TrimSlice */
++		if (strcmp(dev_name(hdev->bus->controller), "tegra-ehci.0") == 0) {
++			if ((hdev->state == 7) && (hub->change_bits[0] == 0) &&
++			    (hub->event_bits[0] == 0x2))
++				hub->event_bits[0] = 0;
++		}
++
+ 		/* Lock the device, then check to see if we were
+ 		 * disconnected while waiting for the lock to succeed. */
+ 		usb_lock_device(hdev);
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/Add-EFI-signature-data-types.patch b/freed-ora/current/master/Add-EFI-signature-data-types.patch
new file mode 100644
index 000000000..29de2d5fc
--- /dev/null
+++ b/freed-ora/current/master/Add-EFI-signature-data-types.patch
@@ -0,0 +1,57 @@
+From dd166a554ecd5d453be4119d120bf0801fb50407 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 the data types that are used for containing hashes, keys and certificates
+for cryptographic verification.
+
+Bugzilla: N/A
+Upstream-status: Fedora mustard for now
+
+Signed-off-by: David Howells <dhowells@redhat.com>
+---
+ include/linux/efi.h | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index ebe6a24cc1e1..5ce40e215f15 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -581,6 +581,12 @@ void efi_native_runtime_setup(void);
+ #define DEVICE_TREE_GUID \
+     EFI_GUID(  0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 )
+ 
++#define EFI_CERT_SHA256_GUID \
++    EFI_GUID(  0xc1c41626, 0x504c, 0x4092, 0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 )
++
++#define EFI_CERT_X509_GUID \
++    EFI_GUID(  0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 )
++
+ typedef struct {
+ 	efi_guid_t guid;
+ 	u64 table;
+@@ -796,6 +802,20 @@ typedef struct _efi_file_io_interface {
+ 
+ #define EFI_INVALID_TABLE_ADDR		(~0UL)
+ 
++typedef struct  {
++	efi_guid_t signature_owner;
++	u8 signature_data[];
++} efi_signature_data_t;
++
++typedef struct {
++	efi_guid_t signature_type;
++	u32 signature_list_size;
++	u32 signature_header_size;
++	u32 signature_size;
++	u8 signature_header[];
++	/* efi_signature_data_t signatures[][] */
++} efi_signature_list_t;
++
+ /*
+  * All runtime access to EFI goes through this structure:
+  */
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/Add-an-EFI-signature-blob-parser-and-key-loader.patch b/freed-ora/current/master/Add-an-EFI-signature-blob-parser-and-key-loader.patch
new file mode 100644
index 000000000..e845a9180
--- /dev/null
+++ b/freed-ora/current/master/Add-an-EFI-signature-blob-parser-and-key-loader.patch
@@ -0,0 +1,179 @@
+From 1078759dbb58b3be93bae3f80b49d370b333b639 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.
+
+X.509 certificates are loaded into the specified keyring as asymmetric type
+keys.
+
+Signed-off-by: David Howells <dhowells@redhat.com>
+---
+ crypto/asymmetric_keys/Kconfig      |   8 +++
+ crypto/asymmetric_keys/Makefile     |   1 +
+ crypto/asymmetric_keys/efi_parser.c | 109 ++++++++++++++++++++++++++++++++++++
+ include/linux/efi.h                 |   4 ++
+ 4 files changed, 122 insertions(+)
+ create mode 100644 crypto/asymmetric_keys/efi_parser.c
+
+diff --git a/crypto/asymmetric_keys/Kconfig b/crypto/asymmetric_keys/Kconfig
+index 4870f28403f5..4a1b50d73b80 100644
+--- a/crypto/asymmetric_keys/Kconfig
++++ b/crypto/asymmetric_keys/Kconfig
+@@ -67,4 +67,12 @@ config SIGNED_PE_FILE_VERIFICATION
+ 	  This option provides support for verifying the signature(s) on a
+ 	  signed PE binary.
+ 
++config EFI_SIGNATURE_LIST_PARSER
++	bool "EFI signature list parser"
++	depends on EFI
++	select X509_CERTIFICATE_PARSER
++	help
++	  This option provides support for parsing EFI signature lists for
++	  X.509 certificates and turning them into keys.
++
+ endif # ASYMMETRIC_KEY_TYPE
+diff --git a/crypto/asymmetric_keys/Makefile b/crypto/asymmetric_keys/Makefile
+index e47fcd9ac5e8..6512f6596785 100644
+--- a/crypto/asymmetric_keys/Makefile
++++ b/crypto/asymmetric_keys/Makefile
+@@ -8,6 +8,7 @@ asymmetric_keys-y := asymmetric_type.o signature.o
+ 
+ obj-$(CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE) += public_key.o
+ obj-$(CONFIG_PUBLIC_KEY_ALGO_RSA) += rsa.o
++obj-$(CONFIG_EFI_SIGNATURE_LIST_PARSER) += efi_parser.o
+ 
+ #
+ # X.509 Certificate handling
+diff --git a/crypto/asymmetric_keys/efi_parser.c b/crypto/asymmetric_keys/efi_parser.c
+new file mode 100644
+index 000000000000..424896a0b169
+--- /dev/null
++++ b/crypto/asymmetric_keys/efi_parser.c
+@@ -0,0 +1,109 @@
++/* EFI signature/key/certificate list parser
++ *
++ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
++ * Written by David Howells (dhowells@redhat.com)
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public Licence
++ * as published by the Free Software Foundation; either version
++ * 2 of the Licence, or (at your option) any later version.
++ */
++
++#define pr_fmt(fmt) "EFI: "fmt
++#include <linux/module.h>
++#include <linux/printk.h>
++#include <linux/err.h>
++#include <linux/efi.h>
++#include <keys/asymmetric-type.h>
++
++static __initdata efi_guid_t efi_cert_x509_guid = EFI_CERT_X509_GUID;
++
++/**
++ * parse_efi_signature_list - Parse an EFI signature list for certificates
++ * @data: The data blob to parse
++ * @size: The size of the data blob
++ * @keyring: The keyring to add extracted keys to
++ */
++int __init parse_efi_signature_list(const void *data, size_t size, struct key *keyring)
++{
++	unsigned offs = 0;
++	size_t lsize, esize, hsize, elsize;
++
++	pr_devel("-->%s(,%zu)\n", __func__, size);
++
++	while (size > 0) {
++		efi_signature_list_t list;
++		const efi_signature_data_t *elem;
++		key_ref_t key;
++
++		if (size < sizeof(list))
++			return -EBADMSG;
++
++		memcpy(&list, data, sizeof(list));
++		pr_devel("LIST[%04x] guid=%pUl ls=%x hs=%x ss=%x\n",
++			 offs,
++			 list.signature_type.b, list.signature_list_size,
++			 list.signature_header_size, list.signature_size);
++
++		lsize = list.signature_list_size;
++		hsize = list.signature_header_size;
++		esize = list.signature_size;
++		elsize = lsize - sizeof(list) - hsize;
++
++		if (lsize > size) {
++			pr_devel("<--%s() = -EBADMSG [overrun @%x]\n",
++				 __func__, offs);
++			return -EBADMSG;
++		}
++		if (lsize < sizeof(list) ||
++		    lsize - sizeof(list) < hsize ||
++		    esize < sizeof(*elem) ||
++		    elsize < esize ||
++		    elsize % esize != 0) {
++			pr_devel("- bad size combo @%x\n", offs);
++			return -EBADMSG;
++		}
++
++		if (efi_guidcmp(list.signature_type, efi_cert_x509_guid) != 0) {
++			data += lsize;
++			size -= lsize;
++			offs += lsize;
++			continue;
++		}
++
++		data += sizeof(list) + hsize;
++		size -= sizeof(list) + hsize;
++		offs += sizeof(list) + hsize;
++
++		for (; elsize > 0; elsize -= esize) {
++			elem = data;
++
++			pr_devel("ELEM[%04x]\n", offs);
++
++			key = key_create_or_update(
++				make_key_ref(keyring, 1),
++				"asymmetric",
++				NULL,
++				&elem->signature_data,
++				esize - sizeof(*elem),
++				(KEY_POS_ALL & ~KEY_POS_SETATTR) |
++				KEY_USR_VIEW,
++				KEY_ALLOC_NOT_IN_QUOTA |
++				KEY_ALLOC_TRUSTED);
++
++			if (IS_ERR(key))
++				pr_err("Problem loading in-kernel X.509 certificate (%ld)\n",
++				       PTR_ERR(key));
++			else
++				pr_notice("Loaded cert '%s' linked to '%s'\n",
++					  key_ref_to_ptr(key)->description,
++					  keyring->description);
++
++			data += esize;
++			size -= esize;
++			offs += esize;
++		}
++	}
++
++	return 0;
++}
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index 5ce40e215f15..41359e548bcb 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -906,6 +906,10 @@ extern bool efi_poweroff_required(void);
+ 	     (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
+ 	     (md) = (void *)(md) + (m)->desc_size)
+ 
++struct key;
++extern int __init parse_efi_signature_list(const void *data, size_t size,
++					   struct key *keyring);
++
+ /**
+  * efi_range_is_wc - check the WC bit on an address range
+  * @start: starting kvirt address
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/Add-option-to-automatically-enforce-module-signature.patch b/freed-ora/current/master/Add-option-to-automatically-enforce-module-signature.patch
new file mode 100644
index 000000000..c1af39625
--- /dev/null
+++ b/freed-ora/current/master/Add-option-to-automatically-enforce-module-signature.patch
@@ -0,0 +1,186 @@
+From 141c9bd1b3fe791132c87a83418ca98811307f99 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
+ Secure Boot mode
+
+UEFI Secure Boot provides a mechanism for ensuring that the firmware will
+only load signed bootloaders and kernels. Certain use cases may also
+require that all kernel modules also be signed. Add a configuration option
+that enforces this automatically when enabled.
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ Documentation/x86/zero-page.txt       |  2 ++
+ arch/x86/Kconfig                      | 10 ++++++++++
+ arch/x86/boot/compressed/eboot.c      | 36 +++++++++++++++++++++++++++++++++++
+ arch/x86/include/uapi/asm/bootparam.h |  3 ++-
+ arch/x86/kernel/setup.c               |  6 ++++++
+ include/linux/module.h                |  6 ++++++
+ kernel/module.c                       |  7 +++++++
+ 7 files changed, 69 insertions(+), 1 deletion(-)
+
+diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt
+index 199f453cb4de..ec38acf00b40 100644
+--- a/Documentation/x86/zero-page.txt
++++ b/Documentation/x86/zero-page.txt
+@@ -30,6 +30,8 @@ Offset	Proto	Name		Meaning
+ 1E9/001	ALL	eddbuf_entries	Number of entries in eddbuf (below)
+ 1EA/001	ALL	edd_mbr_sig_buf_entries	Number of entries in edd_mbr_sig_buffer
+ 				(below)
++1EB/001	ALL     kbd_status      Numlock is enabled
++1EC/001	ALL     secure_boot	Secure boot is enabled in the firmware
+ 1EF/001	ALL	sentinel	Used to detect broken bootloaders
+ 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 36327438caf0..61542c282e70 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -1566,6 +1566,16 @@ config EFI_MIXED
+ 
+ 	   If unsure, say N.
+ 
++config EFI_SECURE_BOOT_SIG_ENFORCE
++        def_bool n
++	prompt "Force module signing when UEFI Secure Boot is enabled"
++	---help---
++	  UEFI Secure Boot provides a mechanism for ensuring that the
++	  firmware will only load signed bootloaders and kernels. Certain
++	  use cases may also require that all kernel modules also be signed.
++	  Say Y here to automatically enable module signature enforcement
++	  when a system boots with UEFI Secure Boot enabled.
++
+ config SECCOMP
+ 	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 dca9842d8f91..baab83bcec44 100644
+--- a/arch/x86/boot/compressed/eboot.c
++++ b/arch/x86/boot/compressed/eboot.c
+@@ -12,6 +12,7 @@
+ #include <asm/efi.h>
+ #include <asm/setup.h>
+ #include <asm/desc.h>
++#include <asm/bootparam_utils.h>
+ 
+ #undef memcpy			/* Use memcpy from misc.c */
+ 
+@@ -803,6 +804,37 @@ out:
+ 	return status;
+ }
+ 
++static int get_secure_boot(void)
++{
++	u8 sb, setup;
++	unsigned long datasize = sizeof(sb);
++	efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID;
++	efi_status_t status;
++
++	status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
++				L"SecureBoot", &var_guid, NULL, &datasize, &sb);
++
++	if (status != EFI_SUCCESS)
++		return 0;
++
++	if (sb == 0)
++		return 0;
++
++
++	status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
++				L"SetupMode", &var_guid, NULL, &datasize,
++				&setup);
++
++	if (status != EFI_SUCCESS)
++		return 0;
++
++	if (setup == 1)
++		return 0;
++
++	return 1;
++}
++
++
+ /*
+  * See if we have Graphics Output Protocol
+  */
+@@ -1378,6 +1410,10 @@ struct boot_params *efi_main(struct efi_config *c,
+ 	else
+ 		setup_boot_services32(efi_early);
+ 
++	sanitize_boot_params(boot_params);
++
++	boot_params->secure_boot = get_secure_boot();
++
+ 	setup_graphics(boot_params);
+ 
+ 	status = setup_efi_pci(boot_params);
+diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
+index 225b0988043a..90dbfb73e11f 100644
+--- a/arch/x86/include/uapi/asm/bootparam.h
++++ b/arch/x86/include/uapi/asm/bootparam.h
+@@ -133,7 +133,8 @@ struct boot_params {
+ 	__u8  eddbuf_entries;				/* 0x1e9 */
+ 	__u8  edd_mbr_sig_buf_entries;			/* 0x1ea */
+ 	__u8  kbd_status;				/* 0x1eb */
+-	__u8  _pad5[3];					/* 0x1ec */
++	__u8  secure_boot;				/* 0x1ec */
++	__u8  _pad5[2];					/* 0x1ed */
+ 	/*
+ 	 * The sentinel is set to a nonzero value (0xff) in header.S.
+ 	 *
+diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
+index 41ead8d3bc0b..5a5cf7395724 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -1142,6 +1142,12 @@ void __init setup_arch(char **cmdline_p)
+ 
+ 	io_delay_init();
+ 
++#ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
++	if (boot_params.secure_boot) {
++		enforce_signed_modules();
++	}
++#endif
++
+ 	/*
+ 	 * Parse the ACPI tables for possible boot-time SMP configuration.
+ 	 */
+diff --git a/include/linux/module.h b/include/linux/module.h
+index 341a73ecea2e..cca08ac450e2 100644
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -188,6 +188,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add);
+ 
+ struct notifier_block;
+ 
++#ifdef CONFIG_MODULE_SIG
++extern void enforce_signed_modules(void);
++#else
++static inline void enforce_signed_modules(void) {};
++#endif
++
+ #ifdef CONFIG_MODULES
+ 
+ extern int modules_disabled; /* for sysctl */
+diff --git a/kernel/module.c b/kernel/module.c
+index 1f7b4664300e..866417ecc76a 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -3843,6 +3843,13 @@ void module_layout(struct module *mod,
+ EXPORT_SYMBOL(module_layout);
+ #endif
+ 
++#ifdef CONFIG_MODULE_SIG
++void enforce_signed_modules(void)
++{
++	sig_enforce = true;
++}
++#endif
++
+ bool secure_modules(void)
+ {
+ #ifdef CONFIG_MODULE_SIG
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/Add-secure_modules-call.patch b/freed-ora/current/master/Add-secure_modules-call.patch
new file mode 100644
index 000000000..9292861db
--- /dev/null
+++ b/freed-ora/current/master/Add-secure_modules-call.patch
@@ -0,0 +1,64 @@
+From 44bd38bb66b400110d962e57d808360fa1d02dab 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
+
+Provide a single call to allow kernel code to determine whether the system
+has been configured to either disable module loading entirely or to load
+only modules signed with a trusted key.
+
+Bugzilla: N/A
+Upstream-status: Fedora mustard.  Replaced by securelevels, but that was nak'd
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ include/linux/module.h |  7 +++++++
+ kernel/module.c        | 10 ++++++++++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/include/linux/module.h b/include/linux/module.h
+index 71f282a4e307..341a73ecea2e 100644
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -516,6 +516,8 @@ int unregister_module_notifier(struct notifier_block *nb);
+ 
+ extern void print_modules(void);
+ 
++extern bool secure_modules(void);
++
+ #else /* !CONFIG_MODULES... */
+ 
+ /* Given an address, look for it in the exception tables. */
+@@ -626,6 +628,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
+ static inline void print_modules(void)
+ {
+ }
++
++static inline bool secure_modules(void)
++{
++	return false;
++}
+ #endif /* CONFIG_MODULES */
+ 
+ #ifdef CONFIG_SYSFS
+diff --git a/kernel/module.c b/kernel/module.c
+index 03214bd288e9..1f7b4664300e 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -3842,3 +3842,13 @@ void module_layout(struct module *mod,
+ }
+ EXPORT_SYMBOL(module_layout);
+ #endif
++
++bool secure_modules(void)
++{
++#ifdef CONFIG_MODULE_SIG
++	return (sig_enforce || modules_disabled);
++#else
++	return modules_disabled;
++#endif
++}
++EXPORT_SYMBOL(secure_modules);
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/sysrq-secure-boot.patch b/freed-ora/current/master/Add-sysrq-option-to-disable-secure-boot-mode.patch
index 1b1399340..e1a677016 100644
--- a/freed-ora/current/master/sysrq-secure-boot.patch
+++ b/freed-ora/current/master/Add-sysrq-option-to-disable-secure-boot-mode.patch
@@ -1,11 +1,10 @@
-Bugzilla: N/A
-Upstream-status: Fedora mustard
-
-From 603230771bdbca78e6530d29dbe8b239cdcc8473 Mon Sep 17 00:00:00 2001
+From 00351ad407bca8aed16ff547bda183bb11c63acf 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
 
+Bugzilla: N/A
+Upstream-status: Fedora mustard
 ---
  arch/x86/kernel/setup.c     | 36 ++++++++++++++++++++++++++++++++++++
  drivers/input/misc/uinput.c |  1 +
@@ -17,7 +16,7 @@ Subject: [PATCH] Add sysrq option to disable secure boot mode
  7 files changed, 65 insertions(+), 10 deletions(-)
 
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 5ce785fc9f05..2024cbb7169b 100644
+index fb282ff6a802..d291d16ba257 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
 @@ -70,6 +70,11 @@
@@ -71,10 +70,10 @@ index 5ce785fc9f05..2024cbb7169b 100644
  	.notifier_call = dump_kernel_offset
  };
 diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
-index 856936247500..1e87a1ea704b 100644
+index 421e29e4cd81..61c1eb97806c 100644
 --- a/drivers/input/misc/uinput.c
 +++ b/drivers/input/misc/uinput.c
-@@ -353,6 +353,7 @@ static int uinput_allocate_device(struct uinput_device *udev)
+@@ -366,6 +366,7 @@ static int uinput_allocate_device(struct uinput_device *udev)
  	if (!udev->dev)
  		return -ENOMEM;
  
@@ -83,7 +82,7 @@ index 856936247500..1e87a1ea704b 100644
  	input_set_drvdata(udev->dev, udev);
  
 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
-index 454b65898e2c..19d67594a3b8 100644
+index 42bad18c66c9..496e073b09d7 100644
 --- a/drivers/tty/sysrq.c
 +++ b/drivers/tty/sysrq.c
 @@ -463,6 +463,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
@@ -217,7 +216,7 @@ index 387fa7d05c98..4b07e30b3279 100644
  int unregister_sysrq_key(int key, struct sysrq_key_op *op);
  struct sysrq_key_op *__sysrq_get_key_op(int key);
 diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
-index 2f7c760305ca..abb29d9811af 100644
+index 379650b984f8..070f29fefdc2 100644
 --- a/kernel/debug/kdb/kdb_main.c
 +++ b/kernel/debug/kdb/kdb_main.c
 @@ -1924,7 +1924,7 @@ static int kdb_sr(int argc, const char **argv)
@@ -230,10 +229,10 @@ index 2f7c760305ca..abb29d9811af 100644
  
  	return 0;
 diff --git a/kernel/module.c b/kernel/module.c
-index 452079124fb7..37dabbc1e902 100644
+index 866417ecc76a..d7ca95c5a349 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -109,9 +109,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
+@@ -108,9 +108,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
  
  #ifdef CONFIG_MODULE_SIG
  #ifdef CONFIG_MODULE_SIG_FORCE
diff --git a/freed-ora/current/master/HID-wacom-Add-support-for-the-Cintiq-Companion.patch b/freed-ora/current/master/HID-wacom-Add-support-for-the-Cintiq-Companion.patch
new file mode 100644
index 000000000..21c229300
--- /dev/null
+++ b/freed-ora/current/master/HID-wacom-Add-support-for-the-Cintiq-Companion.patch
@@ -0,0 +1,47 @@
+From ca7af404bd89fc867e3a7a5c75def70b1360b925 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
+
+The Wacom Cintiq Companion shares the same sensor than the Cintiq
+Companion Hybrid, with the exception of the different PIDs.
+
+Bugzilla: 1134969
+Upstream-status: Queued for 3.18
+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+---
+ drivers/hid/wacom_wac.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
+index aa6a08eb7ad6..c3cbbfb5811f 100644
+--- a/drivers/hid/wacom_wac.c
++++ b/drivers/hid/wacom_wac.c
+@@ -2573,6 +2573,14 @@ static const struct wacom_features wacom_features_0x309 =
+ 	{ "Wacom ISDv5 309", .type = WACOM_24HDT, /* Touch */
+ 	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x0307, .touch_max = 10,
+ 	  .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
++static const struct wacom_features wacom_features_0x30A =
++	{ "Wacom ISDv5 30A", 59352, 33648, 2047, 63,
++	  CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
++	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30C };
++static const struct wacom_features wacom_features_0x30C =
++	{ "Wacom ISDv5 30C", .type = WACOM_24HDT, /* Touch */
++	  .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30A, .touch_max = 10,
++	  .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
+ 
+ #define USB_DEVICE_WACOM(prod)						\
+ 	HID_DEVICE(BUS_USB, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\
+@@ -2708,6 +2716,8 @@ const struct hid_device_id wacom_ids[] = {
+ 	{ USB_DEVICE_WACOM(0x304) },
+ 	{ USB_DEVICE_WACOM(0x307) },
+ 	{ USB_DEVICE_WACOM(0x309) },
++	{ USB_DEVICE_WACOM(0x30A) },
++	{ USB_DEVICE_WACOM(0x30C) },
+ 	{ USB_DEVICE_WACOM(0x30E) },
+ 	{ USB_DEVICE_WACOM(0x314) },
+ 	{ USB_DEVICE_WACOM(0x315) },
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/KEYS-Add-a-system-blacklist-keyring.patch b/freed-ora/current/master/KEYS-Add-a-system-blacklist-keyring.patch
new file mode 100644
index 000000000..b92cbe26b
--- /dev/null
+++ b/freed-ora/current/master/KEYS-Add-a-system-blacklist-keyring.patch
@@ -0,0 +1,112 @@
+From 20b708721bcff64259c17eeec68da1ebe43eff74 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
+
+This adds an additional keyring that is used to store certificates that
+are blacklisted.  This keyring is searched first when loading signed modules
+and if the module's certificate is found, it will refuse to load.  This is
+useful in cases where third party certificates are used for module signing.
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ include/keys/system_keyring.h |  4 ++++
+ init/Kconfig                  |  9 +++++++++
+ kernel/module_signing.c       | 12 ++++++++++++
+ kernel/system_keyring.c       | 17 +++++++++++++++++
+ 4 files changed, 42 insertions(+)
+
+diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h
+index 72665eb80692..2c7b80d31366 100644
+--- a/include/keys/system_keyring.h
++++ b/include/keys/system_keyring.h
+@@ -28,4 +28,8 @@ static inline struct key *get_system_trusted_keyring(void)
+ }
+ #endif
+ 
++#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
++extern struct key *system_blacklist_keyring;
++#endif
++
+ #endif /* _KEYS_SYSTEM_KEYRING_H */
+diff --git a/init/Kconfig b/init/Kconfig
+index e84c6423a2e5..223b1a32bbcb 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1720,6 +1720,15 @@ config SYSTEM_TRUSTED_KEYRING
+ 
+ 	  Keys in this keyring are used by module signature checking.
+ 
++config SYSTEM_BLACKLIST_KEYRING
++	bool "Provide system-wide ring of blacklisted keys"
++	depends on KEYS
++	help
++	  Provide a system keyring to which blacklisted keys can be added.
++	  Keys in the keyring are considered entirely untrusted.  Keys in this
++	  keyring are used by the module signature checking to reject loading
++	  of modules signed with a blacklisted key.
++
+ config PROFILING
+ 	bool "Profiling support"
+ 	help
+diff --git a/kernel/module_signing.c b/kernel/module_signing.c
+index be5b8fac4bd0..fed815fcdaf2 100644
+--- a/kernel/module_signing.c
++++ b/kernel/module_signing.c
+@@ -158,6 +158,18 @@ static struct key *request_asymmetric_key(const char *signer, size_t signer_len,
+ 
+ 	pr_debug("Look up: \"%s\"\n", id);
+ 
++#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
++	key = keyring_search(make_key_ref(system_blacklist_keyring, 1),
++				   &key_type_asymmetric, id);
++	if (!IS_ERR(key)) {
++		/* module is signed with a cert in the blacklist.  reject */
++		pr_err("Module key '%s' is in blacklist\n", id);
++		key_ref_put(key);
++		kfree(id);
++		return ERR_PTR(-EKEYREJECTED);
++	}
++#endif
++
+ 	key = keyring_search(make_key_ref(system_trusted_keyring, 1),
+ 			     &key_type_asymmetric, id);
+ 	if (IS_ERR(key))
+diff --git a/kernel/system_keyring.c b/kernel/system_keyring.c
+index 875f64e8935b..c15e93f5a418 100644
+--- a/kernel/system_keyring.c
++++ b/kernel/system_keyring.c
+@@ -20,6 +20,9 @@
+ 
+ struct key *system_trusted_keyring;
+ EXPORT_SYMBOL_GPL(system_trusted_keyring);
++#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
++struct key *system_blacklist_keyring;
++#endif
+ 
+ extern __initconst const u8 system_certificate_list[];
+ extern __initconst const unsigned long system_certificate_list_size;
+@@ -41,6 +44,20 @@ static __init int system_trusted_keyring_init(void)
+ 		panic("Can't allocate system trusted keyring\n");
+ 
+ 	set_bit(KEY_FLAG_TRUSTED_ONLY, &system_trusted_keyring->flags);
++
++#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
++	system_blacklist_keyring = keyring_alloc(".system_blacklist_keyring",
++				    KUIDT_INIT(0), KGIDT_INIT(0),
++				    current_cred(),
++				    (KEY_POS_ALL & ~KEY_POS_SETATTR) |
++				    KEY_USR_VIEW | KEY_USR_READ,
++				    KEY_ALLOC_NOT_IN_QUOTA, NULL);
++	if (IS_ERR(system_blacklist_keyring))
++		panic("Can't allocate system blacklist keyring\n");
++
++	set_bit(KEY_FLAG_TRUSTED_ONLY, &system_blacklist_keyring->flags);
++#endif
++
+ 	return 0;
+ }
+ 
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch b/freed-ora/current/master/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
new file mode 100644
index 000000000..f1f7f0df7
--- /dev/null
+++ b/freed-ora/current/master/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
@@ -0,0 +1,186 @@
+From cb174c6066a174ca17442bebbb14e5464819c8ee 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
+
+Secure Boot stores a list of allowed certificates in the 'db' variable.
+This imports those certificates into the system trusted keyring.  This
+allows for a third party signing certificate to be used in conjunction
+with signed modules.  By importing the public certificate into the 'db'
+variable, a user can allow a module signed with that certificate to
+load.  The shim UEFI bootloader has a similar certificate list stored
+in the 'MokListRT' variable.  We import those as well.
+
+In the opposite case, Secure Boot maintains a list of disallowed
+certificates in the 'dbx' variable.  We load those certificates into
+the newly introduced system blacklist keyring and forbid any module
+signed with those from loading.
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ include/linux/efi.h   |  6 ++++
+ init/Kconfig          |  9 +++++
+ kernel/Makefile       |  3 ++
+ kernel/modsign_uefi.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 110 insertions(+)
+ create mode 100644 kernel/modsign_uefi.c
+
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index 41359e548bcb..db9e6118575e 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -587,6 +587,12 @@ void efi_native_runtime_setup(void);
+ #define EFI_CERT_X509_GUID \
+     EFI_GUID(  0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 )
+ 
++#define EFI_IMAGE_SECURITY_DATABASE_GUID \
++    EFI_GUID(  0xd719b2cb, 0x3d3a, 0x4596, 0xa3, 0xbc, 0xda, 0xd0, 0x0e, 0x67, 0x65, 0x6f )
++
++#define EFI_SHIM_LOCK_GUID \
++    EFI_GUID(  0x605dab50, 0xe046, 0x4300, 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 )
++
+ typedef struct {
+ 	efi_guid_t guid;
+ 	u64 table;
+diff --git a/init/Kconfig b/init/Kconfig
+index 223b1a32bbcb..3bad458f1c68 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1874,6 +1874,15 @@ config MODULE_SIG_ALL
+ comment "Do not forget to sign required modules with scripts/sign-file"
+ 	depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL
+ 
++config MODULE_SIG_UEFI
++	bool "Allow modules signed with certs stored in UEFI"
++	depends on MODULE_SIG && SYSTEM_BLACKLIST_KEYRING && EFI
++	select EFI_SIGNATURE_LIST_PARSER
++	help
++	  This will import certificates stored in UEFI and allow modules
++	  signed with those to be loaded.  It will also disallow loading
++	  of modules stored in the UEFI dbx variable.
++
+ choice
+ 	prompt "Which hash algorithm should modules be signed with?"
+ 	depends on MODULE_SIG
+diff --git a/kernel/Makefile b/kernel/Makefile
+index dc5c77544fd6..95bdf3398880 100644
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -45,6 +45,7 @@ obj-$(CONFIG_UID16) += uid16.o
+ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o
+ obj-$(CONFIG_MODULES) += module.o
+ obj-$(CONFIG_MODULE_SIG) += module_signing.o
++obj-$(CONFIG_MODULE_SIG_UEFI) += modsign_uefi.o
+ obj-$(CONFIG_KALLSYMS) += kallsyms.o
+ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
+ obj-$(CONFIG_KEXEC) += kexec.o
+@@ -99,6 +100,8 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o
+ 
+ $(obj)/configs.o: $(obj)/config_data.h
+ 
++$(obj)/modsign_uefi.o: KBUILD_CFLAGS += -fshort-wchar
++
+ # config_data.h contains the same information as ikconfig.h but gzipped.
+ # Info from config_data can be extracted from /proc/config*
+ targets += config_data.gz
+diff --git a/kernel/modsign_uefi.c b/kernel/modsign_uefi.c
+new file mode 100644
+index 000000000000..94b0eb38a284
+--- /dev/null
++++ b/kernel/modsign_uefi.c
+@@ -0,0 +1,92 @@
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/cred.h>
++#include <linux/err.h>
++#include <linux/efi.h>
++#include <linux/slab.h>
++#include <keys/asymmetric-type.h>
++#include <keys/system_keyring.h>
++#include "module-internal.h"
++
++static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, unsigned long *size)
++{
++	efi_status_t status;
++	unsigned long lsize = 4;
++	unsigned long tmpdb[4];
++	void *db = NULL;
++
++	status = efi.get_variable(name, guid, NULL, &lsize, &tmpdb);
++	if (status != EFI_BUFFER_TOO_SMALL) {
++		pr_err("Couldn't get size: 0x%lx\n", status);
++		return NULL;
++	}
++
++	db = kmalloc(lsize, GFP_KERNEL);
++	if (!db) {
++		pr_err("Couldn't allocate memory for uefi cert list\n");
++		goto out;
++	}
++
++	status = efi.get_variable(name, guid, NULL, &lsize, db);
++	if (status != EFI_SUCCESS) {
++		kfree(db);
++		db = NULL;
++		pr_err("Error reading db var: 0x%lx\n", status);
++	}
++out:
++	*size = lsize;
++	return db;
++}
++
++/*
++ *  * Load the certs contained in the UEFI databases
++ *   */
++static int __init load_uefi_certs(void)
++{
++	efi_guid_t secure_var = EFI_IMAGE_SECURITY_DATABASE_GUID;
++	efi_guid_t mok_var = EFI_SHIM_LOCK_GUID;
++	void *db = NULL, *dbx = NULL, *mok = NULL;
++	unsigned long dbsize = 0, dbxsize = 0, moksize = 0;
++	int rc = 0;
++
++	/* Check if SB is enabled and just return if not */
++	if (!efi_enabled(EFI_SECURE_BOOT))
++		return 0;
++
++	/* Get db, MokListRT, and dbx.  They might not exist, so it isn't
++	 * an error if we can't get them.
++	 */
++	db = get_cert_list(L"db", &secure_var, &dbsize);
++	if (!db) {
++		pr_err("MODSIGN: Couldn't get UEFI db list\n");
++	} else {
++		rc = parse_efi_signature_list(db, dbsize, system_trusted_keyring);
++		if (rc)
++			pr_err("Couldn't parse db signatures: %d\n", rc);
++		kfree(db);
++	}
++
++	mok = get_cert_list(L"MokListRT", &mok_var, &moksize);
++	if (!mok) {
++		pr_info("MODSIGN: Couldn't get UEFI MokListRT\n");
++	} else {
++		rc = parse_efi_signature_list(mok, moksize, system_trusted_keyring);
++		if (rc)
++			pr_err("Couldn't parse MokListRT signatures: %d\n", rc);
++		kfree(mok);
++	}
++
++	dbx = get_cert_list(L"dbx", &secure_var, &dbxsize);
++	if (!dbx) {
++		pr_info("MODSIGN: Couldn't get UEFI dbx list\n");
++	} else {
++		rc = parse_efi_signature_list(dbx, dbxsize,
++			system_blacklist_keyring);
++		if (rc)
++			pr_err("Couldn't parse dbx signatures: %d\n", rc);
++		kfree(dbx);
++	}
++
++	return rc;
++}
++late_initcall(load_uefi_certs);
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/MODSIGN-Support-not-importing-certs-from-db.patch b/freed-ora/current/master/MODSIGN-Support-not-importing-certs-from-db.patch
new file mode 100644
index 000000000..0c36474b5
--- /dev/null
+++ b/freed-ora/current/master/MODSIGN-Support-not-importing-certs-from-db.patch
@@ -0,0 +1,84 @@
+From 025c09fdcdb575e4690dd9b84787e134c2ae92c4 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
+
+If a user tells shim to not use the certs/hashes in the UEFI db variable
+for verification purposes, shim will set a UEFI variable called MokIgnoreDB.
+Have the uefi import code look for this and not import things from the db
+variable.
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ kernel/modsign_uefi.c | 40 +++++++++++++++++++++++++++++++---------
+ 1 file changed, 31 insertions(+), 9 deletions(-)
+
+diff --git a/kernel/modsign_uefi.c b/kernel/modsign_uefi.c
+index 94b0eb38a284..ae28b974d49a 100644
+--- a/kernel/modsign_uefi.c
++++ b/kernel/modsign_uefi.c
+@@ -8,6 +8,23 @@
+ #include <keys/system_keyring.h>
+ #include "module-internal.h"
+ 
++static __init int check_ignore_db(void)
++{
++	efi_status_t status;
++	unsigned int db = 0;
++	unsigned long size = sizeof(db);
++	efi_guid_t guid = EFI_SHIM_LOCK_GUID;
++
++	/* Check and see if the MokIgnoreDB variable exists.  If that fails
++	 * then we don't ignore DB.  If it succeeds, we do.
++	 */
++	status = efi.get_variable(L"MokIgnoreDB", &guid, NULL, &size, &db);
++	if (status != EFI_SUCCESS)
++		return 0;
++
++	return 1;
++}
++
+ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, unsigned long *size)
+ {
+ 	efi_status_t status;
+@@ -47,23 +64,28 @@ static int __init load_uefi_certs(void)
+ 	efi_guid_t mok_var = EFI_SHIM_LOCK_GUID;
+ 	void *db = NULL, *dbx = NULL, *mok = NULL;
+ 	unsigned long dbsize = 0, dbxsize = 0, moksize = 0;
+-	int rc = 0;
++	int ignore_db, rc = 0;
+ 
+ 	/* Check if SB is enabled and just return if not */
+ 	if (!efi_enabled(EFI_SECURE_BOOT))
+ 		return 0;
+ 
++	/* See if the user has setup Ignore DB mode */
++	ignore_db = check_ignore_db();
++
+ 	/* Get db, MokListRT, and dbx.  They might not exist, so it isn't
+ 	 * an error if we can't get them.
+ 	 */
+-	db = get_cert_list(L"db", &secure_var, &dbsize);
+-	if (!db) {
+-		pr_err("MODSIGN: Couldn't get UEFI db list\n");
+-	} else {
+-		rc = parse_efi_signature_list(db, dbsize, system_trusted_keyring);
+-		if (rc)
+-			pr_err("Couldn't parse db signatures: %d\n", rc);
+-		kfree(db);
++	if (!ignore_db) {
++		db = get_cert_list(L"db", &secure_var, &dbsize);
++		if (!db) {
++			pr_err("MODSIGN: Couldn't get UEFI db list\n");
++		} else {
++			rc = parse_efi_signature_list(db, dbsize, system_trusted_keyring);
++			if (rc)
++				pr_err("Couldn't parse db signatures: %d\n", rc);
++			kfree(db);
++		}
+ 	}
+ 
+ 	mok = get_cert_list(L"MokListRT", &mok_var, &moksize);
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/Makefile b/freed-ora/current/master/Makefile
index e63bbf299..274ae2a8a 100644
--- a/freed-ora/current/master/Makefile
+++ b/freed-ora/current/master/Makefile
@@ -30,7 +30,6 @@ debug:
 	@perl -pi -e 's/# CONFIG_DEBUG_STACK_USAGE is not set/CONFIG_DEBUG_STACK_USAGE=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_SLAB is not set/CONFIG_DEBUG_SLAB=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_MUTEXES is not set/CONFIG_DEBUG_MUTEXES=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set/CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_RT_MUTEXES is not set/CONFIG_DEBUG_RT_MUTEXES=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_LOCK_ALLOC is not set/CONFIG_DEBUG_LOCK_ALLOC=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_LOCK_TORTURE_TEST is not set/CONFIG_LOCK_TORTURE_TEST=m/' config-nodebug
diff --git a/freed-ora/current/master/Makefile.config b/freed-ora/current/master/Makefile.config
index 348396828..63549f642 100644
--- a/freed-ora/current/master/Makefile.config
+++ b/freed-ora/current/master/Makefile.config
@@ -11,11 +11,10 @@ CONFIGFILES	= \
 	$(CFG)-s390x.config \
 	$(CFG)-armv7hl.config $(CFG)-armv7hl-lpae.config \
 	$(CFG)-aarch64.config \
-	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64p7.config $(CFG)-ppc64-debug.config \
 	$(CFG)-ppc64le.config
 
-PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390x arm arm64
+PLATFORMS	= x86 x86_64 powerpc powerpc64 s390x arm arm64
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
 
 configs: $(CONFIGFILES)
@@ -81,9 +80,6 @@ temp-powerpc-generic: config-powerpc-generic temp-generic
 temp-powerpc-debug-generic: config-powerpc-generic temp-debug-generic
 	perl merge.pl $^  > $@
 
-temp-powerpc32-generic: config-powerpc32-generic temp-powerpc-generic
-	perl merge.pl $^  > $@
-
 temp-powerpc64-generic: config-powerpc64 temp-powerpc-generic
 	perl merge.pl $^ > $@
 
@@ -134,9 +130,3 @@ $(CFG)-armv7hl-lpae.config: /dev/null temp-armv7-lpae
 
 $(CFG)-aarch64.config: /dev/null temp-arm64
 	perl merge.pl $^ arm64 > $@
-
-$(CFG)-ppc.config: /dev/null temp-powerpc32-generic
-	perl merge.pl $^ powerpc > $@
-
-$(CFG)-ppc-smp.config: config-powerpc32-smp temp-powerpc32-generic
-	perl merge.pl $^ powerpc > $@
diff --git a/freed-ora/current/master/Makefile.release b/freed-ora/current/master/Makefile.release
index 58a011758..6c79d4ef3 100644
--- a/freed-ora/current/master/Makefile.release
+++ b/freed-ora/current/master/Makefile.release
@@ -10,7 +10,6 @@ config-release:
 	@perl -pi -e 's/CONFIG_DEBUG_STACK_USAGE=y/# CONFIG_DEBUG_STACK_USAGE is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_SLAB=y/# CONFIG_DEBUG_SLAB is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_MUTEXES=y/# CONFIG_DEBUG_MUTEXES is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y/# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_RT_MUTEXES=y/# CONFIG_DEBUG_RT_MUTEXES is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_LOCK_ALLOC=y/# CONFIG_DEBUG_LOCK_ALLOC is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_LOCK_TORTURE_TEST=m/# CONFIG_LOCK_TORTURE_TEST is not set/' config-nodebug
diff --git a/freed-ora/current/master/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch b/freed-ora/current/master/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
new file mode 100644
index 000000000..cfcfd9525
--- /dev/null
+++ b/freed-ora/current/master/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
@@ -0,0 +1,117 @@
+From 2c733f041fb3784918730138043a6538b07ede58 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
+
+Any hardware that can potentially generate DMA has to be locked down from
+userspace in order to avoid it being possible for an attacker to modify
+kernel code, allowing them to circumvent disabled module loading or module
+signing. Default to paranoid - in future we can potentially relax this for
+sufficiently IOMMU-isolated devices.
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ drivers/pci/pci-sysfs.c | 10 ++++++++++
+ drivers/pci/proc.c      |  8 +++++++-
+ drivers/pci/syscall.c   |  3 ++-
+ 3 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
+index 9ff0a901ecf7..8d0d5d92b8d9 100644
+--- a/drivers/pci/pci-sysfs.c
++++ b/drivers/pci/pci-sysfs.c
+@@ -30,6 +30,7 @@
+ #include <linux/vgaarb.h>
+ #include <linux/pm_runtime.h>
+ #include <linux/of.h>
++#include <linux/module.h>
+ #include "pci.h"
+ 
+ static int sysfs_initialized;	/* = 0 */
+@@ -704,6 +705,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj,
+ 	loff_t init_off = off;
+ 	u8 *data = (u8 *) buf;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (off > dev->cfg_size)
+ 		return 0;
+ 	if (off + count > dev->cfg_size) {
+@@ -998,6 +1002,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
+ 	resource_size_t start, end;
+ 	int i;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	for (i = 0; i < PCI_ROM_RESOURCE; i++)
+ 		if (res == &pdev->resource[i])
+ 			break;
+@@ -1099,6 +1106,9 @@ static ssize_t pci_write_resource_io(struct file *filp, struct kobject *kobj,
+ 				     struct bin_attribute *attr, char *buf,
+ 				     loff_t off, size_t count)
+ {
++	if (secure_modules())
++		return -EPERM;
++
+ 	return pci_resource_io(filp, kobj, attr, buf, off, count, true);
+ }
+ 
+diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
+index 3f155e78513f..4265ea07e3b0 100644
+--- a/drivers/pci/proc.c
++++ b/drivers/pci/proc.c
+@@ -116,6 +116,9 @@ static ssize_t proc_bus_pci_write(struct file *file, const char __user *buf,
+ 	int size = dev->cfg_size;
+ 	int cnt;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (pos >= size)
+ 		return 0;
+ 	if (nbytes >= size)
+@@ -195,6 +198,9 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
+ #endif /* HAVE_PCI_MMAP */
+ 	int ret = 0;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	switch (cmd) {
+ 	case PCIIOC_CONTROLLER:
+ 		ret = pci_domain_nr(dev->bus);
+@@ -233,7 +239,7 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
+ 	struct pci_filp_private *fpriv = file->private_data;
+ 	int i, ret;
+ 
+-	if (!capable(CAP_SYS_RAWIO))
++	if (!capable(CAP_SYS_RAWIO) || secure_modules())
+ 		return -EPERM;
+ 
+ 	/* Make sure the caller is mapping a real resource for this device */
+diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
+index b91c4da68365..98f5637304d1 100644
+--- a/drivers/pci/syscall.c
++++ b/drivers/pci/syscall.c
+@@ -10,6 +10,7 @@
+ #include <linux/errno.h>
+ #include <linux/pci.h>
+ #include <linux/syscalls.h>
++#include <linux/module.h>
+ #include <asm/uaccess.h>
+ #include "pci.h"
+ 
+@@ -92,7 +93,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn,
+ 	u32 dword;
+ 	int err = 0;
+ 
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!capable(CAP_SYS_ADMIN) || secure_modules())
+ 		return -EPERM;
+ 
+ 	dev = pci_get_bus_and_slot(bus, dfn);
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch b/freed-ora/current/master/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
new file mode 100644
index 000000000..f45f440da
--- /dev/null
+++ b/freed-ora/current/master/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
@@ -0,0 +1,42 @@
+From 7b19c175662e3a6cedac77774d67c0b1d1f7b684 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
+ restricted
+
+Allowing users to write to address space makes it possible for the kernel
+to be subverted, avoiding module loading restrictions. Prevent this when
+any restrictions have been imposed on loading modules.
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ drivers/char/mem.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/char/mem.c b/drivers/char/mem.c
+index cdf839f9defe..c63cf93b00eb 100644
+--- a/drivers/char/mem.c
++++ b/drivers/char/mem.c
+@@ -164,6 +164,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
+ 	if (p != *ppos)
+ 		return -EFBIG;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (!valid_phys_addr_range(p, count))
+ 		return -EFAULT;
+ 
+@@ -502,6 +505,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
+ 	char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
+ 	int err = 0;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (p < (unsigned long) high_memory) {
+ 		unsigned long to_write = min_t(unsigned long, count,
+ 					       (unsigned long)high_memory - p);
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/freed-ora/current/master/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
index 2f44032c8..b51c29f14 100644
--- a/freed-ora/current/master/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
+++ b/freed-ora/current/master/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
@@ -1,23 +1,25 @@
-Bugzilla: N/A
-Upstream-status: Sigh.  We almost got to drop this.
-
-From 20e3f1e1b9341d233a11734c07c076caac9936ef Mon Sep 17 00:00:00 2001
+From 8d5aaeaf75a282ca4153c4c48eb416959aff239e 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
  brightness_switch_enabled default to 0""
 
 This reverts commit 2843768b701971ab10e62c77d5c75ad7c306f1bd.
+
+Bugzilla: N/A
+Upstream-status: Sigh.  We almost got to drop this.
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
 ---
  Documentation/kernel-parameters.txt | 2 +-
  drivers/acpi/video.c                | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index b7fa2f599459..e8db409a7e3a 100644
+index 10d51c2f10d7..5b6ebe8b519e 100644
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
-@@ -3532,7 +3532,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.
@@ -27,7 +29,7 @@ index b7fa2f599459..e8db409a7e3a 100644
  	virtio_mmio.device=
  			[VMMIO] Memory mapped virtio (platform) device.
 diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index 350d52a8f781..44c89f705018 100644
+index fcbda105616e..2e0236af78b9 100644
 --- a/drivers/acpi/video.c
 +++ b/drivers/acpi/video.c
 @@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot");
diff --git a/freed-ora/current/master/Revert-userns-Allow-unprivileged-users-to-create-use.patch b/freed-ora/current/master/Revert-userns-Allow-unprivileged-users-to-create-use.patch
deleted file mode 100644
index cea6bff01..000000000
--- a/freed-ora/current/master/Revert-userns-Allow-unprivileged-users-to-create-use.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Bugzilla: 917708
-Upstream-status: Fedora mustard
-
-From e3da68be55914bfeedb8866f191cc0958579611d Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Wed, 13 Nov 2013 10:21:18 -0500
-Subject: [PATCH] Revert "userns: Allow unprivileged users to create user
- namespaces."
-
-This reverts commit 5eaf563e53294d6696e651466697eb9d491f3946.
-
-Conflicts:
-	kernel/fork.c
----
- kernel/fork.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/kernel/fork.c b/kernel/fork.c
-index f6d11fc..e04c9a7 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -1573,6 +1573,19 @@ long do_fork(unsigned long clone_flags,
- 	long nr;
- 
- 	/*
-+	 * Do some preliminary argument and permissions checking before we
-+	 * actually start allocating stuff
-+	 */
-+	if (clone_flags & CLONE_NEWUSER) {
-+		/* hopefully this check will go away when userns support is
-+		 * complete
-+		 */
-+		if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
-+				!capable(CAP_SETGID))
-+			return -EPERM;
-+	}
-+
-+	/*
- 	 * Determine whether and which event to report to ptracer.  When
- 	 * called from kernel_thread or CLONE_UNTRACED is explicitly
- 	 * requested, no event is reported; otherwise, report if the event
--- 
-1.8.3.1
-
diff --git a/freed-ora/current/master/Revert-x86-efi-Fixup-GOT-in-all-boot-code-paths.patch b/freed-ora/current/master/Revert-x86-efi-Fixup-GOT-in-all-boot-code-paths.patch
new file mode 100644
index 000000000..842901a6d
--- /dev/null
+++ b/freed-ora/current/master/Revert-x86-efi-Fixup-GOT-in-all-boot-code-paths.patch
@@ -0,0 +1,209 @@
+From 6b57872f1ef945b97044a7fbbd75dfb526cd6aff Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Mon, 22 Sep 2014 14:45:11 -0400
+Subject: [PATCH] Revert "x86/efi: Fixup GOT in all boot code paths"
+
+This reverts commit 9cb0e394234d244fe5a97e743ec9dd7ddff7e64b.
+---
+ arch/x86/boot/compressed/head_32.S | 54 ++++++++++--------------------------
+ arch/x86/boot/compressed/head_64.S | 56 ++++++++++----------------------------
+ 2 files changed, 29 insertions(+), 81 deletions(-)
+
+diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
+index d6b8aa4c986c..cbed1407a5cd 100644
+--- a/arch/x86/boot/compressed/head_32.S
++++ b/arch/x86/boot/compressed/head_32.S
+@@ -30,33 +30,6 @@
+ #include <asm/boot.h>
+ #include <asm/asm-offsets.h>
+ 
+-/*
+- * Adjust our own GOT
+- *
+- * The relocation base must be in %ebx
+- *
+- * It is safe to call this macro more than once, because in some of the
+- * code paths multiple invocations are inevitable, e.g. via the efi*
+- * entry points.
+- *
+- * Relocation is only performed the first time.
+- */
+-.macro FIXUP_GOT
+-	cmpb	$1, got_fixed(%ebx)
+-	je	2f
+-
+-	leal	_got(%ebx), %edx
+-	leal	_egot(%ebx), %ecx
+-1:
+-	cmpl	%ecx, %edx
+-	jae	2f
+-	addl	%ebx, (%edx)
+-	addl	$4, %edx
+-	jmp	1b
+-2:
+-	movb	$1, got_fixed(%ebx)
+-.endm
+-
+ 	__HEAD
+ ENTRY(startup_32)
+ #ifdef CONFIG_EFI_STUB
+@@ -83,9 +56,6 @@ ENTRY(efi_pe_entry)
+ 	add	%esi, 88(%eax)
+ 	pushl	%eax
+ 
+-	movl	%esi, %ebx
+-	FIXUP_GOT
+-
+ 	call	make_boot_params
+ 	cmpl	$0, %eax
+ 	je	fail
+@@ -111,10 +81,6 @@ ENTRY(efi32_stub_entry)
+ 	leal	efi32_config(%esi), %eax
+ 	add	%esi, 88(%eax)
+ 	pushl	%eax
+-
+-	movl	%esi, %ebx
+-	FIXUP_GOT
+-
+ 2:
+ 	call	efi_main
+ 	cmpl	$0, %eax
+@@ -224,7 +190,19 @@ relocated:
+ 	shrl	$2, %ecx
+ 	rep	stosl
+ 
+-	FIXUP_GOT
++/*
++ * Adjust our own GOT
++ */
++	leal	_got(%ebx), %edx
++	leal	_egot(%ebx), %ecx
++1:
++	cmpl	%ecx, %edx
++	jae	2f
++	addl	%ebx, (%edx)
++	addl	$4, %edx
++	jmp	1b
++2:
++
+ /*
+  * Do the decompression, and jump to the new kernel..
+  */
+@@ -247,12 +225,8 @@ relocated:
+ 	xorl	%ebx, %ebx
+ 	jmp	*%eax
+ 
+-	.data
+-/* Have we relocated the GOT? */
+-got_fixed:
+-	.byte 0
+-
+ #ifdef CONFIG_EFI_STUB
++	.data
+ efi32_config:
+ 	.fill 11,8,0
+ 	.long efi_call_phys
+diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
+index 50f69c7eaaf4..2884e0c3e8a5 100644
+--- a/arch/x86/boot/compressed/head_64.S
++++ b/arch/x86/boot/compressed/head_64.S
+@@ -32,33 +32,6 @@
+ #include <asm/processor-flags.h>
+ #include <asm/asm-offsets.h>
+ 
+-/*
+- * Adjust our own GOT
+- *
+- * The relocation base must be in %rbx
+- *
+- * It is safe to call this macro more than once, because in some of the
+- * code paths multiple invocations are inevitable, e.g. via the efi*
+- * entry points.
+- *
+- * Relocation is only performed the first time.
+- */
+-.macro FIXUP_GOT
+-	cmpb	$1, got_fixed(%rip)
+-	je	2f
+-
+-	leaq	_got(%rip), %rdx
+-	leaq	_egot(%rip), %rcx
+-1:
+-	cmpq	%rcx, %rdx
+-	jae	2f
+-	addq	%rbx, (%rdx)
+-	addq	$8, %rdx
+-	jmp	1b
+-2:
+-	movb	$1, got_fixed(%rip)
+-.endm
+-
+ 	__HEAD
+ 	.code32
+ ENTRY(startup_32)
+@@ -279,13 +252,10 @@ ENTRY(efi_pe_entry)
+ 	subq	$1b, %rbp
+ 
+ 	/*
+-	 * Relocate efi_config->call() and the GOT entries.
++	 * Relocate efi_config->call().
+ 	 */
+ 	addq	%rbp, efi64_config+88(%rip)
+ 
+-	movq	%rbp, %rbx
+-	FIXUP_GOT
+-
+ 	movq	%rax, %rdi
+ 	call	make_boot_params
+ 	cmpq	$0,%rax
+@@ -301,13 +271,10 @@ handover_entry:
+ 	subq	$1b, %rbp
+ 
+ 	/*
+-	 * Relocate efi_config->call() and the GOT entries.
++	 * Relocate efi_config->call().
+ 	 */
+ 	movq	efi_config(%rip), %rax
+ 	addq	%rbp, 88(%rax)
+-
+-	movq	%rbp, %rbx
+-	FIXUP_GOT
+ 2:
+ 	movq	efi_config(%rip), %rdi
+ 	call	efi_main
+@@ -418,8 +385,19 @@ relocated:
+ 	shrq	$3, %rcx
+ 	rep	stosq
+ 
+-	FIXUP_GOT
+-
++/*
++ * Adjust our own GOT
++ */
++	leaq	_got(%rip), %rdx
++	leaq	_egot(%rip), %rcx
++1:
++	cmpq	%rcx, %rdx
++	jae	2f
++	addq	%rbx, (%rdx)
++	addq	$8, %rdx
++	jmp	1b
++2:
++	
+ /*
+  * Do the decompression, and jump to the new kernel..
+  */
+@@ -459,10 +437,6 @@ gdt:
+ 	.quad   0x0000000000000000	/* TS continued */
+ gdt_end:
+ 
+-/* Have we relocated the GOT? */
+-got_fixed:
+-	.byte	0
+-
+ #ifdef CONFIG_EFI_STUB
+ efi_config:
+ 	.quad	0
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/TODO b/freed-ora/current/master/TODO
index b730fd591..4ef797a12 100644
--- a/freed-ora/current/master/TODO
+++ b/freed-ora/current/master/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.
-
diff --git a/freed-ora/current/master/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch b/freed-ora/current/master/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
new file mode 100644
index 000000000..8bb1d2370
--- /dev/null
+++ b/freed-ora/current/master/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
@@ -0,0 +1,39 @@
+From 299ee4f4f7235e2413fa6dca1d699c1d5c654cff 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
+ is restricted
+
+This option allows userspace to pass the RSDP address to the kernel, which
+makes it possible for a user to circumvent any restrictions imposed on
+loading modules. Disable it in that case.
+
+Signed-off-by: Josh Boyer <jwboyer@redhat.com>
+---
+ drivers/acpi/osl.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
+index 3abe9b223ba7..ee8f11cf65da 100644
+--- a/drivers/acpi/osl.c
++++ b/drivers/acpi/osl.c
+@@ -44,6 +44,7 @@
+ #include <linux/list.h>
+ #include <linux/jiffies.h>
+ #include <linux/semaphore.h>
++#include <linux/module.h>
+ 
+ #include <asm/io.h>
+ #include <asm/uaccess.h>
+@@ -245,7 +246,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
+ acpi_physical_address __init acpi_os_get_root_pointer(void)
+ {
+ #ifdef CONFIG_KEXEC
+-	if (acpi_rsdp)
++	if (acpi_rsdp && !secure_modules())
+ 		return acpi_rsdp;
+ #endif
+ 
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch b/freed-ora/current/master/acpi-video-Add-4-new-models-to-the-use_native_backli.patch
index dd7f27367..32d6b9181 100644
--- a/freed-ora/current/master/0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch
+++ b/freed-ora/current/master/acpi-video-Add-4-new-models-to-the-use_native_backli.patch
@@ -1,8 +1,8 @@
-From 5573624261ab5d54f2dea2a3e09a98729db9ecd9 Mon Sep 17 00:00:00 2001
+From f88cb8ef976a328960c25bf402839505640d92bf 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 1/2] acpi-video: Add 4 new models to the use_native_backlight
- dmi list
+Subject: [PATCH] acpi-video: Add 4 new models to the use_native_backlight dmi
+ list
 
 Acer Aspire V5-171
 https://bugzilla.redhat.com/show_bug.cgi?id=983342
@@ -21,10 +21,10 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  1 file changed, 32 insertions(+)
 
 diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index 8b6990e..48146fc 100644
+index 2e0236af78b9..df1626d2ba10 100644
 --- a/drivers/acpi/video.c
 +++ b/drivers/acpi/video.c
-@@ -488,6 +488,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+@@ -556,6 +556,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
  		},
  	},
  	{
@@ -39,7 +39,7 @@ index 8b6990e..48146fc 100644
  	.callback = video_set_use_native_backlight,
  	.ident = "Thinkpad Helix",
  	.matches = {
-@@ -513,6 +521,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+@@ -597,6 +605,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
  	},
  	{
  	 .callback = video_set_use_native_backlight,
@@ -54,7 +54,7 @@ index 8b6990e..48146fc 100644
  	 .ident = "Acer Aspire V5-431",
  	 .matches = {
  		DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-@@ -520,6 +536,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+@@ -644,6 +660,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
  		},
  	},
  	{
@@ -69,7 +69,7 @@ index 8b6990e..48146fc 100644
  	.callback = video_set_use_native_backlight,
  	.ident = "HP ProBook 4340s",
  	.matches = {
-@@ -571,6 +595,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+@@ -720,6 +744,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
  	},
  	{
  	.callback = video_set_use_native_backlight,
@@ -85,5 +85,5 @@ index 8b6990e..48146fc 100644
  	.matches = {
  		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
 -- 
-1.9.0
+1.9.3
 
diff --git a/freed-ora/current/master/acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch b/freed-ora/current/master/acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
index f3d36889f..1b2ac20e2 100644
--- a/freed-ora/current/master/acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
+++ b/freed-ora/current/master/acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch
@@ -1,11 +1,8 @@
-Bugzilla: 1093171
-Upstream-status: Queued for 3.16
-
-From 7ac976d0109433d1ad0812f4f6889a904d9a0c40 Mon Sep 17 00:00:00 2001
+From d7ed46e9937173f2e745f223237f69554eb8f4f5 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 13/14] acpi-video: Add use native backlight quirk for the
- ThinkPad W530
+Subject: [PATCH] acpi-video: Add use native backlight quirk for the ThinkPad
+ W530
 
 Like all of the other *30 ThinkPad models, the W530 has a broken acpi-video
 backlight control. Note in order for this to actually fix things on the
@@ -15,6 +12,9 @@ is also needed.
 
 https://bugzilla.redhat.com/show_bug.cgi?id=1093171
 
+Bugzilla: 1093171
+Upstream-status: Queued for 3.16
+
 Cc: stable@vger.kernel.org
 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
 ---
@@ -22,10 +22,10 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index ab7cd65ce21e..dcb0ef4c22f6 100644
+index df1626d2ba10..caa4d8fc3458 100644
 --- a/drivers/acpi/video.c
 +++ b/drivers/acpi/video.c
-@@ -468,6 +468,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+@@ -469,6 +469,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
  	},
  	{
  	 .callback = video_set_use_native_backlight,
@@ -41,5 +41,5 @@ index ab7cd65ce21e..dcb0ef4c22f6 100644
  	 .matches = {
  		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
 -- 
-1.9.0
+1.9.3
 
diff --git a/freed-ora/current/master/acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch b/freed-ora/current/master/acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
index c8c1f7aa2..4ed5fc6dc 100644
--- a/freed-ora/current/master/acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
+++ b/freed-ora/current/master/acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
@@ -1,16 +1,16 @@
-Bugzilla: 1025690
-Upstream-status: Waiting for feedback from reporter
-
-From dfe2c6722a6f6cb45f6b336b094b26a77acd8393 Mon Sep 17 00:00:00 2001
+From fef61f02a47c3293302d0f5983c8014e0746c140 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 14/14] acpi-video: Add use_native_backlight quirk for HP
- ProBook 4540s
+Subject: [PATCH] acpi-video: Add use_native_backlight quirk for HP ProBook
+ 4540s
 
 As reported here:
 https://bugzilla.redhat.com/show_bug.cgi?id=1025690
 This is yet another model which needs this quirk.
 
+Bugzilla: 1025690
+Upstream-status: Waiting for feedback from reporter
+
 Cc: stable@vger.kernel.org
 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
 ---
@@ -18,10 +18,10 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index dcb0ef4c22f6..3db16753f88a 100644
+index caa4d8fc3458..7e86097f7c2b 100644
 --- a/drivers/acpi/video.c
 +++ b/drivers/acpi/video.c
-@@ -548,6 +548,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+@@ -693,6 +693,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
  	},
  	{
  	.callback = video_set_use_native_backlight,
@@ -37,5 +37,5 @@ index dcb0ef4c22f6..3db16753f88a 100644
  	.matches = {
  		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
 -- 
-1.9.0
+1.9.3
 
diff --git a/freed-ora/current/master/arm-beagle.patch b/freed-ora/current/master/arm-beagle.patch
deleted file mode 100644
index 5e2d8abdc..000000000
--- a/freed-ora/current/master/arm-beagle.patch
+++ /dev/null
@@ -1,460 +0,0 @@
-Bugzilla: 1012025
-Upstream-status: In beagle github repository https://github.com/beagleboard/kernel
-
-From b5a2528c89fc8049b2a6a750634c14983e33d00f 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
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/boot/dts/am335x-boneblack.dts | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-index 6b71ad9..09ffbd8 100644
---- a/arch/arm/boot/dts/am335x-boneblack.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -74,5 +74,18 @@
- 		pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
- 		pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
- 		status = "okay";
-+
-+		panel-info {
-+			bpp = <16>;
-+			ac-bias = <255>;
-+			ac-bias-intrpt = <0>;
-+			dma-burst-sz = <16>;
-+			fdd = <16>;
-+			sync-edge = <1>;
-+			sync-ctrl = <1>;
-+			raster-order = <0>;
-+			fifo-th = <0>;
-+			invert-pxl-clk;
-+		};
- 	};
- };
--- 
-1.8.5.1
-
-From 1da083a002581520dd358b8b8e097078000d12b9 Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 27 Dec 2013 13:14:19 -0600
-Subject: [PATCH 2/2] arm: dts: am335x-boneblack: add cpu0 opp points
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/boot/dts/am335x-boneblack.dts | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-index 09ffbd8..f213ccd 100644
---- a/arch/arm/boot/dts/am335x-boneblack.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -67,6 +67,24 @@
- };
- 
- / {
-+	cpus {
-+		cpu@0 {
-+			cpu0-supply = <&dcdc2_reg>;
-+			/*
-+			 * To consider voltage drop between PMIC and SoC,
-+			 * tolerance value is reduced to 2% from 4% and
-+			 * voltage value is increased as a precaution.
-+			 */
-+			operating-points = <
-+				/* kHz    uV */
-+				1000000	1325000
-+				800000	1300000
-+				600000  1112000
-+				300000   969000
-+			>;
-+		};
-+	};
-+
- 	hdmi {
- 		compatible = "ti,tilcdc,slave";
- 		i2c = <&i2c0>;
--- 
-1.8.5.1
-
-From 8551d8aa7d3e002da2097e7e902fb96fceb8694e Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 31 Dec 2013 11:17:45 -0600
-Subject: [PATCH 3/3] arm: dts: am335x-bone-common: enable and use i2c2
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/boot/dts/am335x-bone-common.dtsi | 39 +++++++++++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index e3f27ec..54366b6 100644
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -84,6 +84,13 @@
- 		>;
- 	};
- 
-+	i2c2_pins: pinmux_i2c2_pins {
-+		pinctrl-single,pins = <
-+			0x178 0x73 /* (SLEWCTRL_SLOW | PIN_INPUT_PULLUP | MUX_MODE3) uart1_ctsn.i2c2_sda */
-+			0x17c 0x73 /* (SLEWCTRL_SLOW | PIN_INPUT_PULLUP | MUX_MODE3) uart1_rtsn.i2c2_scl */
-+		>;
-+	};
-+
- 	uart0_pins: pinmux_uart0_pins {
- 		pinctrl-single,pins = <
- 			0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
-@@ -220,6 +227,38 @@
- 		reg = <0x24>;
- 	};
- 
-+	baseboard_eeprom: baseboard_eeprom@50 {
-+		compatible = "at,24c256";
-+		reg = <0x50>;
-+	};
-+};
-+
-+&i2c2 {
-+	status = "okay";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c2_pins>;
-+
-+	clock-frequency = <100000>;
-+
-+	cape_eeprom0: cape_eeprom0@54 {
-+		compatible = "at,24c256";
-+		reg = <0x54>;
-+	};
-+
-+	cape_eeprom1: cape_eeprom1@55 {
-+		compatible = "at,24c256";
-+		reg = <0x55>;
-+	};
-+
-+	cape_eeprom2: cape_eeprom2@56 {
-+		compatible = "at,24c256";
-+		reg = <0x56>;
-+	};
-+
-+	cape_eeprom3: cape_eeprom3@57 {
-+		compatible = "at,24c256";
-+		reg = <0x57>;
-+	};
- };
- 
- /include/ "tps65217.dtsi"
--- 
-1.8.5.2
-
-From a3099dc53a47d1694a5b575580ec3406dc429bf8 Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 31 Dec 2013 14:18:00 -0600
-Subject: [PATCH 4/4] arm: dts: am335x-bone-common: setup default pinmux
- http://elinux.org/Basic_Proto_Cape
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/boot/dts/am335x-bone-common.dtsi | 130 ++++++++++++++++++++++++++++++
- 1 file changed, 130 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index e4571af..f85cabc 100644
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -98,6 +98,13 @@
- 		>;
- 	};
- 
-+	uart1_pins: pinmux_uart1_pins {
-+		pinctrl-single,pins = <
-+			0x180 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart1_rxd.uart1_rxd */
-+			0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart1_txd.uart1_txd */
-+		>;
-+	};
-+
- 	clkout2_pin: pinmux_clkout2_pin {
- 		pinctrl-single,pins = <
- 			0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
-@@ -178,6 +185,33 @@
- 			0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */
- 		>;
- 	};
-+
-+	spi0_pins: pinmux_spi0_pins {
-+		pinctrl-single,pins = <
-+			0x150 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_sclk.spi0_sclk */
-+			0x154 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_d0.spi0_d0 */
-+			0x158 (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_d1.spi0_d1 */
-+			0x15c (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_cs0.spi0_cs0 */
-+		>;
-+	};
-+
-+	ehrpwm1_pin_p9_14: pinmux_ehrpwm1_pin_p9_14 {
-+		pinctrl-single,pins = <
-+			0x048 0x6	/* P9_14 (ZCZ ball U14) | MODE 6 */
-+		>;
-+	};
-+
-+	ehrpwm1_pin_p9_16: pinmux_ehrpwm1_pin_p9_16 {
-+		pinctrl-single,pins = <
-+			0x04c 0x6	/* P9_16 (ZCZ ball T14) | MODE 6 */
-+		>;
-+	};
-+
-+	ecap0_pin_p9_42: pinmux_ecap0_pin_p9_42 {
-+		pinctrl-single,pins = <
-+			0x164 0x0	/* P9_42 (ZCZ ball C18) | MODE 0 */
-+		>;
-+	};
- };
- 
- &uart0 {
-@@ -187,6 +221,13 @@
- 	status = "okay";
- };
- 
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+
-+	status = "okay";
-+};
-+
- &usb {
- 	status = "okay";
- 
-@@ -261,6 +302,56 @@
- 	};
- };
- 
-+&epwmss0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&ecap0_pin_p9_42>;
-+	status = "okay";
-+
-+	ecap@48300100 {
-+		status = "okay";
-+	};
-+};
-+
-+&epwmss1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <
-+		&ehrpwm1_pin_p9_14
-+		&ehrpwm1_pin_p9_16
-+	>;
-+
-+	status = "okay";
-+
-+	ehrpwm@48302200 {
-+		status = "okay";
-+	};
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins>;
-+	status = "okay";
-+
-+	spidev0: spi@0 {
-+		compatible = "spidev";
-+		reg = <0>;
-+		spi-max-frequency = <16000000>;
-+		spi-cpha;
-+	};
-+
-+	spidev1: spi@1 {
-+		compatible = "spidev";
-+		reg = <1>;
-+		spi-max-frequency = <16000000>;
-+	};
-+};
-+
-+&tscadc {
-+	status = "okay";
-+	adc {
-+		ti,adc-channels = <4 5 6>;
-+	};
-+};
-+
- /include/ "tps65217.dtsi"
- 
- &tps {
-@@ -336,3 +427,42 @@
- 	cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
- 	cd-inverted;
- };
-+
-+/ {
-+	ocp {
-+		//FIXME: these pwm's still need work, this guild isn't working..
-+		//http://elinux.org/EBC_Exercise_13_Pulse_Width_Modulation
-+		pwm_test_P9_14@0 {
-+			compatible = "pwm_test";
-+			pwms = <&ehrpwm1 0 500000 1>;
-+			pwm-names = "PWM_P9_14";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&ehrpwm1_pin_p9_14>;
-+			enabled = <1>;
-+			duty = <0>;
-+			status = "okay";
-+		};
-+
-+		pwm_test_P9_16@0 {
-+			compatible = "pwm_test";
-+			pwms = <&ehrpwm1 0 500000 1>;
-+			pwm-names = "PWM_P9_16";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&ehrpwm1_pin_p9_16>;
-+			enabled = <1>;
-+			duty = <0>;
-+			status = "okay";
-+		};
-+
-+		pwm_test_P9_42 {
-+			compatible = "pwm_test";
-+			pwms = <&ecap0 0 500000 1>;
-+			pwm-names = "PWM_P9_42";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&ecap0_pin_p9_42>;
-+			enabled = <1>;
-+			duty = <0>;
-+			status = "okay";
-+		};
-+	};
-+};
--- 
-1.8.5.2
-
-From b6e2c817edfc6d73874cf833daffe1be6c7ed8bb 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
- uart2_pins/uart4_pins/uart5_pins
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/boot/dts/am335x-bone-common.dtsi | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index f85cabc..5270d18 100644
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -105,6 +105,27 @@
- 		>;
- 	};
- 
-+	uart2_pins: pinmux_uart2_pins {
-+		pinctrl-single,pins = <
-+			0x150 0x21	/* spi0_sclk.uart2_rxd | MODE1 */
-+			0x154 0x01	/* spi0_d0.uart2_txd | MODE1 */
-+		>;
-+	};
-+
-+	uart4_pins: pinmux_uart4_pins {
-+		pinctrl-single,pins = <
-+			0x070 0x26	/* gpmc_wait0.uart4_rxd | MODE6 */
-+			0x074 0x06	/* gpmc_wpn.uart4_txd | MODE6 */
-+		>;
-+	};
-+
-+	uart5_pins: pinmux_uart5_pins {
-+		pinctrl-single,pins = <
-+			0x0C4 0x24	/* lcd_data9.uart5_rxd | MODE4 */
-+			0x0C0 0x04	/* lcd_data8.uart5_txd | MODE4 */
-+		>;
-+	};
-+
- 	clkout2_pin: pinmux_clkout2_pin {
- 		pinctrl-single,pins = <
- 			0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
--- 
-1.9.0
-
-From 72567452d5d6007010597158f6afd00e2bf07579 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.
-
-When using pinctrl-single to handle i2c initialization, it has
-to be done early. Whether this is the best way to do so, is an
-exercise left to the reader.
----
- drivers/pinctrl/pinctrl-single.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
-index 829b98c..5107dcf 100644
---- a/drivers/pinctrl/pinctrl-single.c
-+++ b/drivers/pinctrl/pinctrl-single.c
-@@ -2039,7 +2039,17 @@ static struct platform_driver pcs_driver = {
- #endif
- };
- 
--module_platform_driver(pcs_driver);
-+static int __init pcs_init(void)
-+{
-+	return platform_driver_register(&pcs_driver);
-+}
-+postcore_initcall(pcs_init);
-+
-+static void __exit pcs_exit(void)
-+{
-+	platform_driver_unregister(&pcs_driver);
-+}
-+module_exit(pcs_exit);
- 
- MODULE_AUTHOR("Tony Lindgren <tony@atomide.com>");
- MODULE_DESCRIPTION("One-register-per-pin type device tree based pinctrl driver");
--- 
-1.8.5.2
-
-From b6e2c817edfc6d73874cf833daffe1be6c7ed8bb 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
- uart2_pins/uart4_pins/uart5_pins
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/boot/dts/am335x-bone-common.dtsi | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index f85cabc..5270d18 100644
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -105,6 +105,27 @@
- 		>;
- 	};
- 
-+	uart2_pins: pinmux_uart2_pins {
-+		pinctrl-single,pins = <
-+			0x150 0x21	/* spi0_sclk.uart2_rxd | MODE1 */
-+			0x154 0x01	/* spi0_d0.uart2_txd | MODE1 */
-+		>;
-+	};
-+
-+	uart4_pins: pinmux_uart4_pins {
-+		pinctrl-single,pins = <
-+			0x070 0x26	/* gpmc_wait0.uart4_rxd | MODE6 */
-+			0x074 0x06	/* gpmc_wpn.uart4_txd | MODE6 */
-+		>;
-+	};
-+
-+	uart5_pins: pinmux_uart5_pins {
-+		pinctrl-single,pins = <
-+			0x0C4 0x24	/* lcd_data9.uart5_rxd | MODE4 */
-+			0x0C0 0x04	/* lcd_data8.uart5_txd | MODE4 */
-+		>;
-+	};
-+
- 	clkout2_pin: pinmux_clkout2_pin {
- 		pinctrl-single,pins = <
- 			0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
--- 
-1.9.0
diff --git a/freed-ora/current/master/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch b/freed-ora/current/master/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
new file mode 100644
index 000000000..a845ea699
--- /dev/null
+++ b/freed-ora/current/master/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
@@ -0,0 +1,46 @@
+From c392266c8a4eff31c1cb5d7d30ad27fe17bd7956 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
+ uart2_pins/uart4_pins/uart5_pins
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
+index 86cdb52dbf8a..db4518ef755d 100644
+--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
+@@ -105,6 +105,27 @@
+ 		>;
+ 	};
+ 
++	uart2_pins: pinmux_uart2_pins {
++		pinctrl-single,pins = <
++			0x150 0x21	/* spi0_sclk.uart2_rxd | MODE1 */
++			0x154 0x01	/* spi0_d0.uart2_txd | MODE1 */
++		>;
++	};
++
++	uart4_pins: pinmux_uart4_pins {
++		pinctrl-single,pins = <
++			0x070 0x26	/* gpmc_wait0.uart4_rxd | MODE6 */
++			0x074 0x06	/* gpmc_wpn.uart4_txd | MODE6 */
++		>;
++	};
++
++	uart5_pins: pinmux_uart5_pins {
++		pinctrl-single,pins = <
++			0x0C4 0x24	/* lcd_data9.uart5_rxd | MODE4 */
++			0x0C0 0x04	/* lcd_data8.uart5_txd | MODE4 */
++		>;
++	};
++
+ 	clkout2_pin: pinmux_clkout2_pin {
+ 		pinctrl-single,pins = <
+ 			0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch b/freed-ora/current/master/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
new file mode 100644
index 000000000..653227c1c
--- /dev/null
+++ b/freed-ora/current/master/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
@@ -0,0 +1,70 @@
+From 7ce243eb369be6a1d43f391dbbf8e1cfdd927ca7 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
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 39 +++++++++++++++++++++++++++++++
+ 1 file changed, 39 insertions(+)
+
+diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
+index bde1777b62be..c7357bcc7d5c 100644
+--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
+@@ -84,6 +84,13 @@
+ 		>;
+ 	};
+ 
++	i2c2_pins: pinmux_i2c2_pins {
++		pinctrl-single,pins = <
++			0x178 0x73 /* (SLEWCTRL_SLOW | PIN_INPUT_PULLUP | MUX_MODE3) uart1_ctsn.i2c2_sda */
++			0x17c 0x73 /* (SLEWCTRL_SLOW | PIN_INPUT_PULLUP | MUX_MODE3) uart1_rtsn.i2c2_scl */
++		>;
++	};
++
+ 	uart0_pins: pinmux_uart0_pins {
+ 		pinctrl-single,pins = <
+ 			0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
+@@ -220,6 +227,38 @@
+ 		reg = <0x24>;
+ 	};
+ 
++	baseboard_eeprom: baseboard_eeprom@50 {
++		compatible = "at,24c256";
++		reg = <0x50>;
++	};
++};
++
++&i2c2 {
++	status = "okay";
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c2_pins>;
++
++	clock-frequency = <100000>;
++
++	cape_eeprom0: cape_eeprom0@54 {
++		compatible = "at,24c256";
++		reg = <0x54>;
++	};
++
++	cape_eeprom1: cape_eeprom1@55 {
++		compatible = "at,24c256";
++		reg = <0x55>;
++	};
++
++	cape_eeprom2: cape_eeprom2@56 {
++		compatible = "at,24c256";
++		reg = <0x56>;
++	};
++
++	cape_eeprom3: cape_eeprom3@57 {
++		compatible = "at,24c256";
++		reg = <0x57>;
++	};
+ };
+ 
+ /include/ "tps65217.dtsi"
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch b/freed-ora/current/master/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
new file mode 100644
index 000000000..f13b82f51
--- /dev/null
+++ b/freed-ora/current/master/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
@@ -0,0 +1,180 @@
+From df2a80b1255c56dfb04aaf5f2e48883d1ae91670 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
+ http://elinux.org/Basic_Proto_Cape
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 130 ++++++++++++++++++++++++++++++
+ 1 file changed, 130 insertions(+)
+
+diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
+index c7357bcc7d5c..86cdb52dbf8a 100644
+--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
+@@ -98,6 +98,13 @@
+ 		>;
+ 	};
+ 
++	uart1_pins: pinmux_uart1_pins {
++		pinctrl-single,pins = <
++			0x180 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart1_rxd.uart1_rxd */
++			0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart1_txd.uart1_txd */
++		>;
++	};
++
+ 	clkout2_pin: pinmux_clkout2_pin {
+ 		pinctrl-single,pins = <
+ 			0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
+@@ -178,6 +185,33 @@
+ 			0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */
+ 		>;
+ 	};
++
++	spi0_pins: pinmux_spi0_pins {
++		pinctrl-single,pins = <
++			0x150 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_sclk.spi0_sclk */
++			0x154 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_d0.spi0_d0 */
++			0x158 (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_d1.spi0_d1 */
++			0x15c (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_cs0.spi0_cs0 */
++		>;
++	};
++
++	ehrpwm1_pin_p9_14: pinmux_ehrpwm1_pin_p9_14 {
++		pinctrl-single,pins = <
++			0x048 0x6	/* P9_14 (ZCZ ball U14) | MODE 6 */
++		>;
++	};
++
++	ehrpwm1_pin_p9_16: pinmux_ehrpwm1_pin_p9_16 {
++		pinctrl-single,pins = <
++			0x04c 0x6	/* P9_16 (ZCZ ball T14) | MODE 6 */
++		>;
++	};
++
++	ecap0_pin_p9_42: pinmux_ecap0_pin_p9_42 {
++		pinctrl-single,pins = <
++			0x164 0x0	/* P9_42 (ZCZ ball C18) | MODE 0 */
++		>;
++	};
+ };
+ 
+ &uart0 {
+@@ -187,6 +221,13 @@
+ 	status = "okay";
+ };
+ 
++&uart1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart1_pins>;
++
++	status = "okay";
++};
++
+ &usb {
+ 	status = "okay";
+ };
+@@ -261,6 +302,56 @@
+ 	};
+ };
+ 
++&epwmss0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&ecap0_pin_p9_42>;
++	status = "okay";
++
++	ecap@48300100 {
++		status = "okay";
++	};
++};
++
++&epwmss1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <
++		&ehrpwm1_pin_p9_14
++		&ehrpwm1_pin_p9_16
++	>;
++
++	status = "okay";
++
++	ehrpwm@48302200 {
++		status = "okay";
++	};
++};
++
++&spi0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&spi0_pins>;
++	status = "okay";
++
++	spidev0: spi@0 {
++		compatible = "spidev";
++		reg = <0>;
++		spi-max-frequency = <16000000>;
++		spi-cpha;
++	};
++
++	spidev1: spi@1 {
++		compatible = "spidev";
++		reg = <1>;
++		spi-max-frequency = <16000000>;
++	};
++};
++
++&tscadc {
++	status = "okay";
++	adc {
++		ti,adc-channels = <4 5 6>;
++	};
++};
++
+ /include/ "tps65217.dtsi"
+ 
+ &tps {
+@@ -337,3 +428,42 @@
+ 	cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+ 	cd-inverted;
+ };
++
++/ {
++	ocp {
++		//FIXME: these pwm's still need work, this guild isn't working..
++		//http://elinux.org/EBC_Exercise_13_Pulse_Width_Modulation
++		pwm_test_P9_14@0 {
++			compatible = "pwm_test";
++			pwms = <&ehrpwm1 0 500000 1>;
++			pwm-names = "PWM_P9_14";
++			pinctrl-names = "default";
++			pinctrl-0 = <&ehrpwm1_pin_p9_14>;
++			enabled = <1>;
++			duty = <0>;
++			status = "okay";
++		};
++
++		pwm_test_P9_16@0 {
++			compatible = "pwm_test";
++			pwms = <&ehrpwm1 0 500000 1>;
++			pwm-names = "PWM_P9_16";
++			pinctrl-names = "default";
++			pinctrl-0 = <&ehrpwm1_pin_p9_16>;
++			enabled = <1>;
++			duty = <0>;
++			status = "okay";
++		};
++
++		pwm_test_P9_42 {
++			compatible = "pwm_test";
++			pwms = <&ecap0 0 500000 1>;
++			pwm-names = "PWM_P9_42";
++			pinctrl-names = "default";
++			pinctrl-0 = <&ecap0_pin_p9_42>;
++			enabled = <1>;
++			duty = <0>;
++			status = "okay";
++		};
++	};
++};
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch b/freed-ora/current/master/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
new file mode 100644
index 000000000..d4dca29e0
--- /dev/null
+++ b/freed-ora/current/master/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
@@ -0,0 +1,42 @@
+From 936d999b68e34d25e59bf71699dee239e04df775 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
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-boneblack.dts | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
+index bf5349165542..acfff3befff5 100644
+--- a/arch/arm/boot/dts/am335x-boneblack.dts
++++ b/arch/arm/boot/dts/am335x-boneblack.dts
+@@ -66,6 +66,24 @@
+ };
+ 
+ / {
++	cpus {
++		cpu@0 {
++			cpu0-supply = <&dcdc2_reg>;
++			/*
++			 * To consider voltage drop between PMIC and SoC,
++			 * tolerance value is reduced to 2% from 4% and
++			 * voltage value is increased as a precaution.
++			 */
++			operating-points = <
++				/* kHz    uV */
++				1000000	1325000
++				800000	1300000
++				600000  1112000
++				300000   969000
++			>;
++		};
++	};
++
+ 	hdmi {
+ 		compatible = "ti,tilcdc,slave";
+ 		i2c = <&i2c0>;
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch b/freed-ora/current/master/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
new file mode 100644
index 000000000..d2d347f77
--- /dev/null
+++ b/freed-ora/current/master/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
@@ -0,0 +1,39 @@
+From 7b29b26e2b5c76ed65795710e12c31fa4d1e2f69 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
+
+Bugzilla: 1012025
+Upstream-status: In beagle github repository https://github.com/beagleboard/kernel
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-boneblack.dts | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
+index 305975d3f531..bf5349165542 100644
+--- a/arch/arm/boot/dts/am335x-boneblack.dts
++++ b/arch/arm/boot/dts/am335x-boneblack.dts
+@@ -73,5 +73,18 @@
+ 		pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
+ 		pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
+ 		status = "okay";
++
++		panel-info {
++			bpp = <16>;
++			ac-bias = <255>;
++			ac-bias-intrpt = <0>;
++			dma-burst-sz = <16>;
++			fdd = <16>;
++			sync-edge = <1>;
++			sync-ctrl = <1>;
++			raster-order = <0>;
++			fifo-th = <0>;
++			invert-pxl-clk;
++		};
+ 	};
+ };
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/arm-imx6-utilite.patch b/freed-ora/current/master/arm-i.MX6-Utilite-device-dtb.patch
index bb0747202..68483877f 100644
--- a/freed-ora/current/master/arm-imx6-utilite.patch
+++ b/freed-ora/current/master/arm-i.MX6-Utilite-device-dtb.patch
@@ -1,5 +1,14 @@
+From 57d44976960411c14678a9054c07924557711bb7 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
+
+---
+ arch/arm/boot/dts/imx6q-cm-fx6.dts | 38 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 38 insertions(+)
+
 diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
-index 99b46f8..8b6ddd1 100644
+index 99b46f8030ad..8b6ddd16dcc5 100644
 --- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
 +++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
 @@ -97,11 +97,49 @@
@@ -52,3 +61,6 @@ index 99b46f8..8b6ddd1 100644
 +	pinctrl-0 = <&pinctrl_usdhc3>;
 +	status = "okay";
 +};
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/arm-tegra-drmdetection.patch b/freed-ora/current/master/arm-tegra-drmdetection.patch
deleted file mode 100644
index d84040513..000000000
--- a/freed-ora/current/master/arm-tegra-drmdetection.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From: Stephen Warren <swarren@xxxxxxxxxx>
-
-When tegra-drm.ko is built as a module, these MODULE_DEVICE_TABLEs allow
-the module to be auto-loaded since the module will match the devices
-instantiated from device tree.
-
-(Notes for stable: in 3.14+, just git rm any conflicting file, since they
-are added in later kernels. For 3.13 and below, manual merging will be
-needed)
-
-Cc: <stable@xxxxxxxxxxxxxxx>
-Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx>
----
-v2: Remove change to drm.c, since the match table there isn't used for
-probing.
----
- drivers/gpu/drm/tegra/dc.c    | 1 +
- drivers/gpu/drm/tegra/dpaux.c | 1 +
- drivers/gpu/drm/tegra/dsi.c   | 1 +
- drivers/gpu/drm/tegra/gr2d.c  | 1 +
- drivers/gpu/drm/tegra/gr3d.c  | 1 +
- drivers/gpu/drm/tegra/hdmi.c  | 1 +
- drivers/gpu/drm/tegra/sor.c   | 1 +
- 7 files changed, 7 insertions(+)
-
-diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
-index ef40381f3909..48c3bc460eef 100644
---- a/drivers/gpu/drm/tegra/dc.c
-+++ b/drivers/gpu/drm/tegra/dc.c
-@@ -1303,6 +1303,7 @@ static const struct of_device_id tegra_dc_of_match[] = {
- 		/* sentinel */
- 	}
- };
-+MODULE_DEVICE_TABLE(of, tegra_dc_of_match);
- 
- static int tegra_dc_parse_dt(struct tegra_dc *dc)
- {
-diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c
-index 3f132e356e9c..708f783ead47 100644
---- a/drivers/gpu/drm/tegra/dpaux.c
-+++ b/drivers/gpu/drm/tegra/dpaux.c
-@@ -382,6 +382,7 @@ static const struct of_device_id tegra_dpaux_of_match[] = {
- 	{ .compatible = "nvidia,tegra124-dpaux", },
- 	{ },
- };
-+MODULE_DEVICE_TABLE(of, tegra_dpaux_of_match);
- 
- struct platform_driver tegra_dpaux_driver = {
- 	.driver = {
-diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
-index bd56f2affa78..97c409f10456 100644
---- a/drivers/gpu/drm/tegra/dsi.c
-+++ b/drivers/gpu/drm/tegra/dsi.c
-@@ -982,6 +982,7 @@ static const struct of_device_id tegra_dsi_of_match[] = {
- 	{ .compatible = "nvidia,tegra114-dsi", },
- 	{ },
- };
-+MODULE_DEVICE_TABLE(of, tegra_dsi_of_match);
- 
- struct platform_driver tegra_dsi_driver = {
- 	.driver = {
-diff --git a/drivers/gpu/drm/tegra/gr2d.c b/drivers/gpu/drm/tegra/gr2d.c
-index 7c53941f2a9e..02cd3e37a6ec 100644
---- a/drivers/gpu/drm/tegra/gr2d.c
-+++ b/drivers/gpu/drm/tegra/gr2d.c
-@@ -121,6 +121,7 @@ static const struct of_device_id gr2d_match[] = {
- 	{ .compatible = "nvidia,tegra20-gr2d" },
- 	{ },
- };
-+MODULE_DEVICE_TABLE(of, gr2d_match);
- 
- static const u32 gr2d_addr_regs[] = {
- 	GR2D_UA_BASE_ADDR,
-diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c
-index 30f5ba9bd6d0..2bea2b2d204e 100644
---- a/drivers/gpu/drm/tegra/gr3d.c
-+++ b/drivers/gpu/drm/tegra/gr3d.c
-@@ -130,6 +130,7 @@ static const struct of_device_id tegra_gr3d_match[] = {
- 	{ .compatible = "nvidia,tegra20-gr3d" },
- 	{ }
- };
-+MODULE_DEVICE_TABLE(of, tegra_gr3d_match);
- 
- static const u32 gr3d_addr_regs[] = {
- 	GR3D_IDX_ATTRIBUTE( 0),
-diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
-index a0b8d8539d07..84ea0c8b47f7 100644
---- a/drivers/gpu/drm/tegra/hdmi.c
-+++ b/drivers/gpu/drm/tegra/hdmi.c
-@@ -1370,6 +1370,7 @@ static const struct of_device_id tegra_hdmi_of_match[] = {
- 	{ .compatible = "nvidia,tegra20-hdmi", .data = &tegra20_hdmi_config },
- 	{ },
- };
-+MODULE_DEVICE_TABLE(of, tegra_hdmi_of_match);
- 
- static int tegra_hdmi_probe(struct platform_device *pdev)
- {
-diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
-index 27c979b50111..061a5c501124 100644
---- a/drivers/gpu/drm/tegra/sor.c
-+++ b/drivers/gpu/drm/tegra/sor.c
-@@ -1455,6 +1455,7 @@ static const struct of_device_id tegra_sor_of_match[] = {
- 	{ .compatible = "nvidia,tegra124-sor", },
- 	{ },
- };
-+MODULE_DEVICE_TABLE(of, tegra_sor_of_match);
- 
- struct platform_driver tegra_sor_driver = {
- 	.driver = {
--- 
-1.8.1.5
diff --git a/freed-ora/current/master/arm-tegra-usb-no-reset-linux33.patch b/freed-ora/current/master/arm-tegra-usb-no-reset-linux33.patch
deleted file mode 100644
index 342e80f5a..000000000
--- a/freed-ora/current/master/arm-tegra-usb-no-reset-linux33.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- linux-3.3.4-3.fc17.x86_64_orig/drivers/usb/core/hub.c	2012-05-02 20:08:18.421685932 -0400

-+++ linux-3.3.4-3.fc17.x86_64/drivers/usb/core/hub.c	2012-05-02 20:30:36.565865425 -0400

-@@ -3484,6 +3484,13 @@ static void hub_events(void)

- 				(u16) hub->change_bits[0],

- 				(u16) hub->event_bits[0]);

- 

-+		/* Don't disconnect USB-SATA on TrimSlice */

-+		if (strcmp(dev_name(hdev->bus->controller), "tegra-ehci.0") == 0) {

-+			if ((hdev->state == 7) && (hub->change_bits[0] == 0) &&

-+			    (hub->event_bits[0] == 0x2))

-+				hub->event_bits[0] = 0;

-+		}

-+

- 		/* Lock the device, then check to see if we were

- 		 * disconnected while waiting for the lock to succeed. */

- 		usb_lock_device(hdev);

diff --git a/freed-ora/current/master/asus-wmi-Add-a-no-backlight-quirk.patch b/freed-ora/current/master/asus-wmi-Add-a-no-backlight-quirk.patch
deleted file mode 100644
index 3a99afef9..000000000
--- a/freed-ora/current/master/asus-wmi-Add-a-no-backlight-quirk.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Bugzilla: 1097436
-Upstream-status: Sent upstream for 3.16
-
-From f6fad201a0e4584e9826a2deb8ebbfccdb8cb13b Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Mon, 2 Jun 2014 17:41:01 +0200
-Subject: [PATCH 04/14] asus-wmi: Add a no backlight quirk
-
-Some Asus motherboards for desktop PC-s export an acpi-video and
-an asus-wmi interface advertising backlight support. Add a quirk to allow
-to blacklist these so that desktop environments such as gnome don't start
-showing nonsense brightness controls.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1097436
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/platform/x86/asus-wmi.c | 8 ++++++--
- drivers/platform/x86/asus-wmi.h | 1 +
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
-index c5e082fb82fa..6f73dc5125ca 100644
---- a/drivers/platform/x86/asus-wmi.c
-+++ b/drivers/platform/x86/asus-wmi.c
-@@ -1272,6 +1272,9 @@ static int asus_wmi_backlight_init(struct asus_wmi *asus)
- 	int max;
- 	int power;
- 
-+	if (asus->driver->quirks->no_backlight)
-+		return -ENODEV;
-+
- 	max = read_brightness_max(asus);
- 
- 	if (max == -ENODEV)
-@@ -1370,7 +1373,7 @@ static void asus_wmi_notify(u32 value, void *context)
- 		code = ASUS_WMI_BRN_DOWN;
- 
- 	if (code == ASUS_WMI_BRN_DOWN || code == ASUS_WMI_BRN_UP) {
--		if (!acpi_video_backlight_support()) {
-+		if (asus->backlight_device) {
- 			asus_wmi_backlight_notify(asus, orig_code);
- 			goto exit;
- 		}
-@@ -1773,7 +1776,8 @@ static int asus_wmi_add(struct platform_device *pdev)
- 	if (err)
- 		goto fail_rfkill;
- 
--	if (asus->driver->quirks->wmi_backlight_power)
-+	if (asus->driver->quirks->wmi_backlight_power ||
-+			asus->driver->quirks->no_backlight)
- 		acpi_video_dmi_promote_vendor();
- 	if (!acpi_video_backlight_support()) {
- 		pr_info("Disabling ACPI video driver\n");
-diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h
-index 4da4c8bafe70..cc47efe14974 100644
---- a/drivers/platform/x86/asus-wmi.h
-+++ b/drivers/platform/x86/asus-wmi.h
-@@ -42,6 +42,7 @@ struct quirk_entry {
- 	bool scalar_panel_brightness;
- 	bool store_backlight_power;
- 	bool wmi_backlight_power;
-+	bool no_backlight;
- 	int wapf;
- 	/*
- 	 * For machines with AMD graphic chips, it will send out WMI event
--- 
-1.9.0
-
diff --git a/freed-ora/current/master/asus-wmi-Restrict-debugfs-interface-when-module-load.patch b/freed-ora/current/master/asus-wmi-Restrict-debugfs-interface-when-module-load.patch
new file mode 100644
index 000000000..d12c373d9
--- /dev/null
+++ b/freed-ora/current/master/asus-wmi-Restrict-debugfs-interface-when-module-load.patch
@@ -0,0 +1,54 @@
+From 3e379167b10eaf3f62688d713071c0d379145b86 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
+ restricted
+
+We have no way of validating what all of the Asus WMI methods do on a
+given machine, and there's a risk that some will allow hardware state to
+be manipulated in such a way that arbitrary code can be executed in the
+kernel, circumventing module loading restrictions. Prevent that if any of
+these features are enabled.
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ drivers/platform/x86/asus-wmi.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
+index 21fc932da3a1..c6d42ad95c08 100644
+--- a/drivers/platform/x86/asus-wmi.c
++++ b/drivers/platform/x86/asus-wmi.c
+@@ -1590,6 +1590,9 @@ static int show_dsts(struct seq_file *m, void *data)
+ 	int err;
+ 	u32 retval = -1;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
+ 
+ 	if (err < 0)
+@@ -1606,6 +1609,9 @@ static int show_devs(struct seq_file *m, void *data)
+ 	int err;
+ 	u32 retval = -1;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
+ 				    &retval);
+ 
+@@ -1630,6 +1636,9 @@ static int show_call(struct seq_file *m, void *data)
+ 	union acpi_object *obj;
+ 	acpi_status status;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
+ 				     1, asus->debug.method_id,
+ 				     &input, &output);
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/ath9k_rx_dma_stop_check.patch b/freed-ora/current/master/ath9k-rx-dma-stop-check.patch
index 606eb1c63..678f94759 100644
--- a/freed-ora/current/master/ath9k_rx_dma_stop_check.patch
+++ b/freed-ora/current/master/ath9k-rx-dma-stop-check.patch
@@ -1,6 +1,17 @@
+From fd90e088b28003019f7829db286de0affcb1de26 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
+
+---
+ drivers/net/wireless/ath/ath9k/mac.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
+index 275205ab5f15..bb842623bdf6 100644
 --- a/drivers/net/wireless/ath/ath9k/mac.c
 +++ b/drivers/net/wireless/ath/ath9k/mac.c
-@@ -689,7 +689,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw 
+@@ -700,7 +700,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
  {
  #define AH_RX_STOP_DMA_TIMEOUT 10000   /* usec */
  	struct ath_common *common = ath9k_hw_common(ah);
@@ -9,7 +20,7 @@
  	int i;
  
  	/* Enable access to the DMA observation bus */
-@@ -719,6 +719,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw 
+@@ -730,6 +730,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
  	}
  
  	if (i == 0) {
@@ -26,3 +37,6 @@
  		ath_err(common,
  			"DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n",
  			AH_RX_STOP_DMA_TIMEOUT / 1000,
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/config-arm-generic b/freed-ora/current/master/config-arm-generic
index 0c5242c69..9ddb1f0cc 100644
--- a/freed-ora/current/master/config-arm-generic
+++ b/freed-ora/current/master/config-arm-generic
@@ -8,6 +8,7 @@ CONFIG_HW_PERF_EVENTS=y
 CONFIG_NFS_FS=y
 
 CONFIG_CRASH=m
+CONFIG_CC_STACKPROTECTOR=y
 
 # CONFIG_PID_IN_CONTEXTIDR is not set
 
@@ -42,9 +43,11 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 # ARM AMBA generic HW
 CONFIG_ARM_AMBA=y
 CONFIG_ARM_CCI=y
+CONFIG_ARM_CCN=y
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_GIC=y
+CONFIG_KVM_ARM_VGIC=y
 CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_ARM_SMMU=y
 CONFIG_MMC_ARMMMCI=y
@@ -103,6 +106,7 @@ CONFIG_EXTCON=m
 CONFIG_OF_EXTCON=m
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_ADC_JACK=m
+# CONFIG_EXTCON_SM5502 is not set
 
 # MTD
 CONFIG_MTD_BLKDEVS=m
@@ -142,6 +146,9 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 
+# spi
+CONFIG_SPI_PL022=m
+
 # Sensors
 CONFIG_SENSORS_IIO_HWMON=m
 CONFIG_IIO_SYSFS_TRIGGER=m
@@ -246,10 +253,17 @@ CONFIG_CMA_AREAS=7
 # CONFIG_SCSI_MPT3SAS is not set
 
 # serial
-# CONFIG_SERIAL_SH_SCI is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_IFX6X60 is not set
 
 # drm
 # CONFIG_DRM_VMWGFX is not set
 # CONFIG_IMX_IPUV3_CORE is not set
 
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
+
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_BMP085_SPI is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_SPI_ROCKCHIP is not set
diff --git a/freed-ora/current/master/config-arm64 b/freed-ora/current/master/config-arm64
index 082ceda8d..f6c244ef6 100644
--- a/freed-ora/current/master/config-arm64
+++ b/freed-ora/current/master/config-arm64
@@ -30,7 +30,6 @@ CONFIG_GENERIC_ACL=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CSUM=y
-CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_PCI_IOMAP=y
@@ -81,6 +80,11 @@ CONFIG_CRYPTO_AES_ARM64_CE=m
 CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
 CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+
+CONFIG_I2C_ACPI=y
 
 # APM Xgene
 CONFIG_POWER_RESET_XGENE=y
@@ -111,3 +115,5 @@ CONFIG_PCI_XGENE=y
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
+
+# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
diff --git a/freed-ora/current/master/config-armv7 b/freed-ora/current/master/config-armv7
index 03f43354f..489c3f828 100644
--- a/freed-ora/current/master/config-armv7
+++ b/freed-ora/current/master/config-armv7
@@ -10,7 +10,6 @@ CONFIG_ARCH_OMAP4=y
 CONFIG_ARCH_PICOXCELL=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_ROCKCHIP=y
-# CONFIG_ARCH_SOCFPGA is not set
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_U8500=y
 # CONFIG_ARCH_VIRT is not set
@@ -39,7 +38,7 @@ CONFIG_MV643XX_ETH=m
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_ARMADA_370=y
 CONFIG_PINCTRL_ARMADA_XP=y
-# CONFIG_ARM_ARMADA_370_XP_CPUIDLE is not set
+# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
 CONFIG_PINCTRL_DOVE=y
 CONFIG_EDAC_MV64X60=m
 CONFIG_RTC_DRV_S35390A=m
@@ -67,6 +66,7 @@ CONFIG_SND_KIRKWOOD_SOC=m
 CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_MMC_SDHCI_PXAV3=m
+CONFIG_MVPP2=m
 # CONFIG_CACHE_FEROCEON_L2 is not set
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 
@@ -109,13 +109,11 @@ CONFIG_OMAP_PACKAGE_CUS=y
 
 CONFIG_OMAP_MCBSP=y
 CONFIG_OMAP2PLUS_MBOX=m
-CONFIG_OMAP_MBOX_FWK=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_PM_NOOP=y
 CONFIG_DMA_OMAP=y
 CONFIG_OMAP_IOMMU=y
-CONFIG_OMAP_IOVMM=m
 CONFIG_HWSPINLOCK_OMAP=m
 CONFIG_OMAP3_EMU=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
@@ -136,6 +134,7 @@ CONFIG_BATTERY_TWL4030_MADC=m
 CONFIG_OMAP_USB2=m
 CONFIG_OMAP_CONTROL_PHY=m
 CONFIG_TI_PIPE3=m
+CONFIG_PCI_DRA7XX=y
 CONFIG_TWL4030_USB=m
 CONFIG_TWL6030_USB=m
 CONFIG_TWL6030_PWM=m
@@ -173,6 +172,7 @@ CONFIG_REGULATOR_PBIAS=m
 CONFIG_RTC_DRV_PALMAS=m
 CONFIG_OMAP5_DSS_HDMI=y
 CONFIG_OMAP5_DSS_HDMI_AUDIO=y
+CONFIG_COMMON_CLK_PALMAS=m
 
 CONFIG_WL_TI=y
 CONFIG_WLCORE_SDIO=m
@@ -301,16 +301,6 @@ CONFIG_RADIO_WL128X=m
 
 CONFIG_OMAP_REMOTEPROC=m
 
-# CONFIG_TIDSPBRIDGE is not set
-# CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000
-# CONFIG_TIDSPBRIDGE_DEBUG is not set
-# CONFIG_TIDSPBRIDGE_RECOVERY=y
-# CONFIG_TIDSPBRIDGE_CACHE_LINE_CHECK is not set
-# CONFIG_TIDSPBRIDGE_WDT3=y
-# CONFIG_TIDSPBRIDGE_WDT_TIMEOUT=5
-# CONFIG_TIDSPBRIDGE_NTFY_PWRERR is not set
-# CONFIG_TIDSPBRIDGE_BACKTRACE is not set
-
 # CONFIG_OMAP2_DSS_DEBUGFS is not set
 # CONFIG_OMAP_IOMMU_DEBUG is not set
 # CONFIG_OMAP_MUX_DEBUG is not set
@@ -343,6 +333,7 @@ CONFIG_SND_DAVINCI_SOC_I2S=m
 CONFIG_SND_DAVINCI_SOC_MCASP=m
 CONFIG_SND_DAVINCI_SOC_VCIF=m
 CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
+CONFIG_SND_EDMA_SOC=m
 CONFIG_SND_AM33XX_SOC_EVM=m
 CONFIG_REGULATOR_TI_ABB=m
 CONFIG_TI_ADC081C=m
@@ -359,6 +350,16 @@ CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_PINCTRL_APQ8064=m
 CONFIG_PINCTRL_IPQ8064=m
+CONFIG_PINCTRL_MSM8960=m
+CONFIG_COMMON_CLK_QCOM=m
+CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_MMCC_8084=m
+CONFIG_IPQ_GCC_806X=m
+CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_MMCC_8960=m
+CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_MMCC_8974=m
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_I2C_QUP=m
 CONFIG_SPI_QUP=m
@@ -368,6 +369,9 @@ CONFIG_USB_MSM_OTG=m
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_QCOM_BAM_DMA=m
 CONFIG_QCOM_GSBI=m
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_QCOM_IPQ806X_SATA=m
+CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_MSM_IOMMU=y
 CONFIG_DRM_MSM=m
 CONFIG_DRM_MSM_FBDEV=y
@@ -378,17 +382,20 @@ CONFIG_USB_EHCI_MSM=m
 CONFIG_MXC_IRQ_PRIOR=y
 # CONFIG_MXC_DEBUG_BOARD is not set
 CONFIG_SOC_IMX50=y
+CONFIG_SOC_IMX51=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_IMX6SX=y
 # CONFIG_SOC_VF610 is not set
-CONFIG_MACH_IMX51_DT=y
-# CONFIG_MACH_MX51_BABBAGE is not set
 CONFIG_ARM_IMX6Q_CPUFREQ=m
+CONFIG_PCI_IMX6=y
 CONFIG_IMX_THERMAL=m
+CONFIG_IMX_SDMA=m
+CONFIG_IMX_DMA=m
+CONFIG_MXS_DMA=y
+CONFIG_AHCI_IMX=m
 CONFIG_PATA_IMX=m
-CONFIG_PCI_IMX6=y
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
@@ -406,10 +413,12 @@ CONFIG_PINCTRL_IMX6SL=y
 CONFIG_I2C_IMX=m
 CONFIG_STMPE_I2C=y
 CONFIG_SPI_IMX=m
+CONFIG_SPI_FSL_QUADSPI=m
 CONFIG_STMPE_SPI=y
 CONFIG_MFD_MC13783=m
 CONFIG_MFD_MC13XXX_SPI=m
 CONFIG_MFD_STMPE=y
+CONFIG_MTD_NAND_GPMI_NAND=m
 CONFIG_W1_MASTER_MXC=m
 CONFIG_IMX_WEIM=y
 CONFIG_IMX2_WDT=m
@@ -420,6 +429,7 @@ CONFIG_RTC_DRV_SNVS=m
 # CONFIG_FB_IMX is not set
 
 CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_FSL_ASRC=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
@@ -435,6 +445,7 @@ CONFIG_SND_SOC_IMX_MC13783=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_EUKREA_TLV320=m
 CONFIG_SND_SOC_TVL320AIC32X4=m
+CONFIG_SND_SOC_WM8731=m
 
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_MXS_PHY=m
@@ -445,10 +456,6 @@ CONFIG_RTC_DRV_IMXDI=m
 CONFIG_RTC_DRV_MXC=m
 # CONFIG_MX3_IPU is not set
 # CONFIG_MX3_IPU_IRQS is not set
-CONFIG_IMX_SDMA=m
-CONFIG_IMX_DMA=m
-CONFIG_AHCI_IMX=m
-# CONFIG_MXS_DMA is not set
 
 CONFIG_PWM_IMX=m
 CONFIG_DRM_IMX=m
@@ -502,6 +509,9 @@ CONFIG_REGULATOR_DA9055=m
 
 # Rockchips
 CONFIG_I2C_RK3X=m
+CONFIG_SPI_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_PWM_ROCKCHIP=m
 
 # ST Ericsson
 CONFIG_MACH_HREFV60=y
@@ -552,45 +562,19 @@ CONFIG_IIO_ST_SENSORS_I2C=m
 CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
-# tegra
+# Allwinner
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+
+# Tegra (non A15)
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
-CONFIG_ARCH_TEGRA_114_SOC=y
-CONFIG_ARCH_TEGRA_124_SOC=y
-CONFIG_ARM_TEGRA_CPUFREQ=y
 CONFIG_TEGRA20_MC=y
-CONFIG_TEGRA30_MC=y
-CONFIG_TRUSTED_FOUNDATIONS=y
-
-CONFIG_SERIAL_TEGRA=y
-
-CONFIG_PCI_TEGRA=y
 CONFIG_TEGRA_IOMMU_GART=y
-CONFIG_TEGRA_IOMMU_SMMU=y
-CONFIG_MMC_SDHCI_TEGRA=m
-CONFIG_TEGRA_WATCHDOG=m
-CONFIG_I2C_TEGRA=m
-CONFIG_TEGRA_SYSTEM_DMA=y
-CONFIG_TEGRA_EMC_SCALING_ENABLE=y
-CONFIG_TEGRA_AHB=y
-CONFIG_TEGRA20_APB_DMA=y
-CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_TEGRA20_SLINK=m
-CONFIG_PWM_TEGRA=m
 CONFIG_MFD_MAX8907=m
-CONFIG_KEYBOARD_TEGRA=m
-CONFIG_PINCTRL_TEGRA=y
-CONFIG_PINCTRL_TEGRA20=y
-CONFIG_PINCTRL_TEGRA30=y
-CONFIG_USB_EHCI_TEGRA=m
-CONFIG_RTC_DRV_TEGRA=m
-CONFIG_CRYPTO_DEV_TEGRA_AES=m
-
-CONFIG_SND_SOC_TEGRA=m
 CONFIG_SND_SOC_TEGRA_ALC5632=m
-CONFIG_SND_SOC_TEGRA_MAX98090=m
-CONFIG_SND_SOC_TEGRA_RT5640=m
 CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
 CONFIG_SND_SOC_TEGRA_WM8753=m
 CONFIG_SND_SOC_TEGRA_WM8903=m
@@ -598,9 +582,6 @@ CONFIG_SND_SOC_TEGRA_WM9712=m
 CONFIG_SND_SOC_TEGRA20_AC97=m
 CONFIG_SND_SOC_TEGRA20_DAS=m
 CONFIG_SND_SOC_TEGRA20_SPDIF=m
-CONFIG_SND_SOC_TEGRA30_AHUB=m
-CONFIG_SND_SOC_TEGRA30_I2S=m
-CONFIG_SND_HDA_TEGRA=m
 
 # AC100 (PAZ00)
 CONFIG_MFD_NVEC=y
@@ -614,24 +595,6 @@ CONFIG_MFD_TPS6586X=y
 CONFIG_GPIO_TPS6586X=y
 CONFIG_RTC_DRV_TPS6586X=m
 
-# Jetson TK1
-CONFIG_PINCTRL_AS3722=y
-CONFIG_POWER_RESET_AS3722=y
-CONFIG_MFD_AS3722=y
-CONFIG_REGULATOR_AS3722=m
-CONFIG_RTC_DRV_AS3722=y
-
-CONFIG_TEGRA_HOST1X=m
-CONFIG_TEGRA_HOST1X_FIREWALL=y
-CONFIG_DRM_TEGRA=m
-CONFIG_DRM_TEGRA_FBDEV=y
-# CONFIG_DRM_TEGRA_DEBUG is not set
-CONFIG_DRM_TEGRA_STAGING=y
-CONFIG_DRM_PANEL=y
-CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_PANEL_LD9040=m
-CONFIG_DRM_PANEL_S6E8AA0=m
-
 # OLPC XO
 CONFIG_SERIO_OLPC_APSP=m
 
@@ -647,6 +610,8 @@ CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=m
 CONFIG_GPIO_XILINX=y
+# Broken
+# CONFIG_GPIO_ZYNQ is not set
 CONFIG_I2C_XILINX=m
 CONFIG_SPI_XILINX=m
 CONFIG_SPI_CADENCE=m
@@ -661,6 +626,7 @@ CONFIG_SND_SOC_ADI_AXI_SPDIF=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
+CONFIG_GS_FPGABOOT=m
 
 # Multi function devices
 CONFIG_MFD_88PM800=m
diff --git a/freed-ora/current/master/config-armv7-generic b/freed-ora/current/master/config-armv7-generic
index 058b9514b..8bcf7843b 100644
--- a/freed-ora/current/master/config-armv7-generic
+++ b/freed-ora/current/master/config-armv7-generic
@@ -54,15 +54,19 @@ CONFIG_IRQ_CROSSBAR=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_VEXPRESS_CA9X4=y
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 # CONFIG_ARCH_BCM is not set
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_HI3xxx is not set
-# CONFIG_ARCH_MSM_DT is not set
+# CONFIG_ARCH_HISI is not set
+# CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_SHMOBILE_MULTI is not set
 # CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_STI is not set
 # CONFIG_ARCH_U8500 is not set
@@ -122,12 +126,14 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768
 CONFIG_XZ_DEC_ARM=y
 
 CONFIG_UACCESS_WITH_MEMCPY=y
-CONFIG_CC_STACKPROTECTOR=y
 
 CONFIG_PCI_HOST_GENERIC=y
 
 CONFIG_LBDAF=y
 
+# GRR, needed for MFD_AS3722
+CONFIG_I2C=y
+
 # Device tree
 CONFIG_USE_OF=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
@@ -158,17 +164,15 @@ CONFIG_ARM_HIGHBANK_CPUFREQ=m
 # CONFIG_ARM_HIGHBANK_CPUIDLE is not set
 
 # Allwinner
-CONFIG_MACH_SUN4I=y
-CONFIG_MACH_SUN5I=y
+# CONFIG_MACH_SUN4I is not set
+# CONFIG_MACH_SUN5I is not set
 CONFIG_MACH_SUN6I=y
 CONFIG_MACH_SUN7I=y
-CONFIG_PINCTRL_SUNXI=y
+# CONFIG_MACH_SUN8I is not set
+CONFIG_DMA_SUN6I=m
 CONFIG_SUNXI_WATCHDOG=m
-CONFIG_MDIO_SUN4I=m
 CONFIG_NET_VENDOR_ALLWINNER=y
-CONFIG_SUN4I_EMAC=m
 CONFIG_STMMAC_PLATFORM=y
-CONFIG_DWMAC_SOCFPGA=y
 CONFIG_DWMAC_SUNXI=y
 CONFIG_EEPROM_SUNXI_SID=m
 CONFIG_RTC_DRV_SUNXI=m
@@ -183,6 +187,9 @@ CONFIG_POWER_RESET_SUN6I=y
 CONFIG_TOUCHSCREEN_SUN4I=m
 CONFIG_MFD_AXP20X=y
 CONFIG_REGULATOR_AXP20X=m
+CONFIG_IR_SUNXI=m
+CONFIG_MDIO_SUN4I=m
+CONFIG_SUN4I_EMAC=m
 
 # Exynos
 CONFIG_ARCH_EXYNOS3=y
@@ -205,6 +212,7 @@ CONFIG_ARM_EXYNOS5250_CPUFREQ=y
 CONFIG_ARM_EXYNOS5440_CPUFREQ=y
 CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW=y
 CONFIG_ARM_EXYNOS_CPUIDLE=y
+# CONFIG_EXYNOS5420_MCPM not set
 
 CONFIG_I2C_EXYNOS5=m
 CONFIG_I2C_S3C2410=m
@@ -248,6 +256,7 @@ CONFIG_DRM_EXYNOS_IOMMU=y
 CONFIG_DRM_EXYNOS_IPP=y
 CONFIG_DRM_EXYNOS_ROTATOR=y
 CONFIG_DRM_EXYNOS_VIDI=y
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
 # CONFIG_FB_S3C is not set
 # CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
 CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
@@ -261,6 +270,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
+CONFIG_SND_SOC_ODROIDX2=m
 # CONFIG_GPIO_WM8994 is not set
 # CONFIG_REGULATOR_WM8994 is not set
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -283,6 +293,55 @@ CONFIG_RTC_DRV_MAX8997=m
 CONFIG_RTC_DRV_MAX77686=m
 CONFIG_EXTCON_MAX8997=m
 
+# Tegra
+CONFIG_ARCH_TEGRA_114_SOC=y
+CONFIG_ARCH_TEGRA_124_SOC=y
+CONFIG_ARM_TEGRA_CPUFREQ=y
+CONFIG_TRUSTED_FOUNDATIONS=y
+CONFIG_SERIAL_TEGRA=y
+CONFIG_TEGRA30_MC=y
+CONFIG_PCI_TEGRA=y
+CONFIG_AHCI_TEGRA=m
+CONFIG_TEGRA_IOMMU_SMMU=y
+CONFIG_MMC_SDHCI_TEGRA=m
+CONFIG_TEGRA_WATCHDOG=m
+CONFIG_I2C_TEGRA=m
+CONFIG_TEGRA_SYSTEM_DMA=y
+CONFIG_TEGRA_EMC_SCALING_ENABLE=y
+CONFIG_TEGRA_AHB=y
+CONFIG_TEGRA20_APB_DMA=y
+CONFIG_SPI_TEGRA114=m
+CONFIG_PWM_TEGRA=m
+CONFIG_KEYBOARD_TEGRA=m
+CONFIG_USB_EHCI_TEGRA=m
+CONFIG_RTC_DRV_TEGRA=m
+CONFIG_SND_SOC_TEGRA=m
+CONFIG_SND_SOC_TEGRA_MAX98090=m
+CONFIG_SND_SOC_TEGRA_RT5640=m
+CONFIG_SND_SOC_TEGRA30_AHUB=m
+CONFIG_SND_SOC_TEGRA30_I2S=m
+CONFIG_SND_HDA_TEGRA=m
+CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HOST1X_FIREWALL=y
+CONFIG_DRM_TEGRA=m
+CONFIG_DRM_TEGRA_FBDEV=y
+# CONFIG_DRM_TEGRA_DEBUG is not set
+CONFIG_DRM_TEGRA_STAGING=y
+CONFIG_NOUVEAU_PLATFORM_DRIVER=m
+
+# Jetson TK1
+CONFIG_PINCTRL_AS3722=y
+CONFIG_POWER_RESET_AS3722=y
+CONFIG_MFD_AS3722=y
+CONFIG_REGULATOR_AS3722=m
+CONFIG_RTC_DRV_AS3722=y
+
+# DRM panels
+CONFIG_DRM_PANEL=y
+CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_LD9040=m
+CONFIG_DRM_PANEL_S6E8AA0=m
+
 # regmap
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
@@ -299,15 +358,14 @@ CONFIG_GENERIC_CPUFREQ_CPU0=m
 # usb
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_ULPI=y
 CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
-CONFIG_USB_ISP1760_HCD=m
 
 # usb gadget 
+CONFIG_USB_OTG=y
 CONFIG_USB_GADGET=m
 CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_GADGET_VBUS_DRAW=100
@@ -316,19 +374,6 @@ CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_GPIO_VBUS=m
-CONFIG_USB_G_ACM_MS=m
-CONFIG_USB_G_DBGP=m
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_CDC=y
-# CONFIG_USB_G_MULTI_RNDIS is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_ETH_EEM=y
-# CONFIG_USB_ETH_RNDIS is not set
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_USB_GADGET_TARGET=m
-CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_CONFIGFS=m
 CONFIG_USB_CONFIGFS_ACM=y
 CONFIG_USB_CONFIGFS_ECM=y
@@ -376,7 +421,15 @@ CONFIG_MFD_TPS65912_SPI=y
 # CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_MC13XXX_SPI is not set
 # CONFIG_MFD_PM8921_CORE is not set
-# CONFIG_MFD_AXP20X is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+# 
 
 # Pin stuff
 CONFIG_PINMUX=y
@@ -390,6 +443,7 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_BCM281XX is not set
 # CONFIG_PINCTRL_APQ8064 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
+# CONFIG_PINCTRL_MSM8960 is not set
 
 # GPIO
 # CONFIG_GPIO_EM is not set
@@ -425,11 +479,9 @@ CONFIG_SPI_BUTTERFLY=m
 CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_OC_TINY=m
-CONFIG_SPI_PL022=m
 CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_XCOMM=m
-CONFIG_SPI_XILINX=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_CADENCE is not set
 
@@ -439,12 +491,13 @@ CONFIG_NFC_NCI_SPI=y
 CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 CONFIG_I2C_MV64XXX=m
-# CONFIG_I2C_CROS_EC_TUNNEL is not set
 
 # HW crypto and rng
 CONFIG_CRYPTO_SHA1_ARM=m
 CONFIG_CRYPTO_AES_ARM=m
 # CONFIG_CRYPTO_AES_ARM_BS is not set
+CONFIG_CRYPTO_SHA1_ARM_NEON=m
+CONFIG_CRYPTO_SHA512_ARM_NEON=m
 
 # DMA
 CONFIG_TI_PRIV_EDMA=y
@@ -485,6 +538,7 @@ CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_NAND_PXA3xx=m
 CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_TMIO=m
+CONFIG_MTD_SPI_NOR=m
 CONFIG_MTD_SPINAND_MT29F=m
 CONFIG_MTD_SPINAND_ONDIEECC=y
 CONFIG_MTD_SST25L=m
@@ -501,7 +555,6 @@ CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_PCI=m
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
-# CONFIG_MMC_DW_SOCFPGA is not set
 # CONFIG_MMC_DW_IDMAC is not set
 # CONFIG_MMC_DW_K3 is not set
 CONFIG_USB_DWC2=y
@@ -516,6 +569,7 @@ CONFIG_USB_DWC3_OMAP=m
 CONFIG_USB_DWC3_PCI=m
 # CONFIG_USB_DWC3_DEBUG is not set
 # CONFIG_USB_DWC3_KEYSTONE is not set
+# CONFIG_DWC3_HOST_USB3_LPM_ENABLE is not set
 CONFIG_DW_WATCHDOG=m
 CONFIG_PCIE_DW=y
 
@@ -569,15 +623,21 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_WM8903 is not set
 # CONFIG_SND_SOC_WM8962 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
+# CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_SOC_FSL_ESAI is not set
 # CONFIG_SND_SOC_FSL_SAI is not set
-# CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
-# CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_STA350 is not set
 # CONFIG_SND_ATMEL_SOC is not set
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_EDMA_SOC is not set
+# CONFIG_SND_SOC_ROCKCHIP is not set
 
 # Displays
 CONFIG_BACKLIGHT_TPS65217=m
@@ -636,6 +696,7 @@ CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_TPS80031=m
 CONFIG_REGULATOR_LTC3589=m
 CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_DA9211=m
 
 CONFIG_CHARGER_MANAGER=y
 CONFIG_CHARGER_BQ2415X=m
@@ -732,6 +793,7 @@ CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_I2C=m
 CONFIG_MFD_CROS_EC_SPI=m
 CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_I2C_CROS_EC_TUNNEL=m
 
 # Should be in generic
 CONFIG_BPF_JIT=y
@@ -742,6 +804,7 @@ CONFIG_BPF_JIT=y
 # HW Enabled in armv7 not lpae
 # CONFIG_DRM_TILCDC is not set
 # CONFIG_DRM_IMX is not set
+# CONFIG_DRM_STI is not set
 # CONFIG_AHCI_IMX is not set
 # CONFIG_IMX_THERMAL is not set
 # CONFIG_TI_DAC7512 is not set
@@ -778,6 +841,8 @@ CONFIG_BPF_JIT=y
 # CONFIG_MMC_TMIO is not set
 # CONFIG_PINCTRL_IMX35 is not set
 # CONFIG_DVB_USB_PCTV452E is not set
+# CONFIG_DWMAC_SOCFPGA is not set
+# CONFIG_MMC_DW_SOCFPGA is not set
 
 # CONFIG_MFD_LP8788 is not set
 # CONFIG_MFD_MAX77693 is not set
diff --git a/freed-ora/current/master/config-armv7-lpae b/freed-ora/current/master/config-armv7-lpae
index e86aaad26..661ce3685 100644
--- a/freed-ora/current/master/config-armv7-lpae
+++ b/freed-ora/current/master/config-armv7-lpae
@@ -8,12 +8,9 @@ CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_OMAP4 is not set
 # CONFIG_SOC_OMAP5 is not set
 # CONFIG_SOC_AM33XX is not set
-# CONFIG_SND_AM33XX_SOC_EVM is not set
 # CONFIG_SOC_AM43XX is not set
 # CONFIG_SOC_DRA7XX is not set
 # CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_ZYNQ is not set
 # CONFIG_ARCH_AXXIA is not set
 
@@ -24,6 +21,9 @@ CONFIG_ARM_VIRT_EXT=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+CONFIG_CMA_SIZE_MBYTES=64
+
 # Cortex-A15
 CONFIG_ARM_ERRATA_798181=y
 CONFIG_ARM_ERRATA_773022=y
@@ -31,7 +31,6 @@ CONFIG_ARM_ERRATA_773022=y
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
 CONFIG_KVM_ARM_MAX_VCPUS=8
-CONFIG_KVM_ARM_VGIC=y
 CONFIG_KVM_ARM_TIMER=y
 
 # CONFIG_XEN is not set
@@ -62,10 +61,23 @@ CONFIG_TI_AEMIF=m
 CONFIG_POWER_RESET_KEYSTONE=y
 CONFIG_DAVINCI_WATCHDOG=m
 CONFIG_SPI_DAVINCI=m
-# CONFIG_SND_DAVINCI_SOC is not set
+CONFIG_TI_DAVINCI_MDIO=m
 # CONFIG_TI_SOC_THERMAL is not set
 
-# CONFIG_TEGRA_HOST1X is not set
-# CONFIG_DRM_PANEL_SIMPLE is not set
-# CONFIG_DRM_PANEL_LD9040 is not set
-# CONFIG_DRM_PANEL_S6E8AA0 is not set
+# Tegra (non A15 device options)
+# CONFIG_ARCH_TEGRA_2x_SOC is not set
+# CONFIG_ARCH_TEGRA_3x_SOC is not set
+# CONFIG_TEGRA20_MC is not set
+# CONFIG_TEGRA_IOMMU_GART is not set
+# CONFIG_SPI_TEGRA20_SFLASH is not set
+# CONFIG_SPI_TEGRA20_SLINK is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_NVEC is not set
+# CONFIG_SND_SOC_TEGRA_ALC5632 is not set
+# CONFIG_SND_SOC_TEGRA_TRIMSLICE is not set
+# CONFIG_SND_SOC_TEGRA_WM8753 is not set
+# CONFIG_SND_SOC_TEGRA_WM8903 is not set
+# CONFIG_SND_SOC_TEGRA_WM9712 is not set
+# CONFIG_SND_SOC_TEGRA20_AC97 is not set
+# CONFIG_SND_SOC_TEGRA20_DAS is not set
+# CONFIG_SND_SOC_TEGRA20_SPDIF is not set
diff --git a/freed-ora/current/master/config-debug b/freed-ora/current/master/config-debug
index 302280b6f..d866d8013 100644
--- a/freed-ora/current/master/config-debug
+++ b/freed-ora/current/master/config-debug
@@ -5,7 +5,6 @@ CONFIG_SND_PCM_XRUN_DEBUG=y
 CONFIG_DEBUG_ATOMIC_SLEEP=y
 
 CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_LOCK_ALLOC=y
 CONFIG_LOCK_TORTURE_TEST=m
@@ -124,6 +123,8 @@ CONFIG_MAC80211_MESSAGE_TRACING=y
 
 CONFIG_EDAC_DEBUG=y
 
+CONFIG_SPI_DEBUG=y
+
 CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
 CONFIG_LATENCYTOP=y
 CONFIG_SCHEDSTATS=y
diff --git a/freed-ora/current/master/config-generic b/freed-ora/current/master/config-generic
index bd0ea5710..67e928261 100644
--- a/freed-ora/current/master/config-generic
+++ b/freed-ora/current/master/config-generic
@@ -44,6 +44,7 @@ CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_SYSCTL=y
 CONFIG_LOG_BUF_SHIFT=18
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 # CONFIG_IKCONFIG is not set
 # CONFIG_EMBEDDED is not set
 # CONFIG_EXPERT is not set
@@ -149,6 +150,7 @@ CONFIG_MMC_USHC=m
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_VUB300=m
+# CONFIG_MMC_SPI is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
@@ -208,16 +210,34 @@ CONFIG_BINFMT_MISC=m
 # Generic Driver Options
 #
 CONFIG_FW_LOADER=y
+# CONFIG_TEST_FIRMWARE is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_EXTRA_FIRMWARE=""
 
 # Give this a try in rawhide for now
 # CONFIG_FW_LOADER_USER_HELPER is not set
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 
 # CONFIG_CMA is not set
 # CONFIG_DMA_CMA is not set
+# CONFIG_FENCE_TRACE is not set
 
 # CONFIG_SPI is not set
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_FSL_SPI is not set
 
 # CONFIG_SPMI is not set
 
@@ -272,6 +292,8 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_TS5500 is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_DATAFLASH is not set
 
 # Self-contained MTD device drivers
 # CONFIG_MTD_PMC551 is not set
@@ -860,10 +882,13 @@ CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
@@ -954,6 +979,11 @@ CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NF_CT_PROTO_UDPLITE=m
 
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_NF_LOG_BRIDGE=m
+
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_RPFILTER=m
@@ -967,7 +997,7 @@ CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_ARPTABLES=m
@@ -1001,7 +1031,7 @@ CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_TARGET_SYNPROXY=m
 CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 # CONFIG_IP6_NF_TARGET_NPT is not set
 
@@ -1058,6 +1088,7 @@ CONFIG_BRIDGE_EBT_T_NAT=m
 CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_BRIDGE_EBT_VLAN=m
 CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
 CONFIG_XFRM=y
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_SUB_POLICY=y
@@ -1347,6 +1378,7 @@ CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=m
 CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
+# CONFIG_CHELSIO_T4_DCB is not set
 
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
@@ -1398,7 +1430,6 @@ CONFIG_E1000E=m
 CONFIG_IGB=m
 CONFIG_IGB_HWMON=y
 CONFIG_IGB_DCA=y
-CONFIG_IGB_PTP=y
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBEVF=m
@@ -1425,8 +1456,11 @@ CONFIG_SKY2=m
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KSZ884X_PCI=m
 # CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
 # CONFIG_KS8851_MLL is not set
 
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_ENC28J60 is not set
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_MYRI10GE_DCA=y
@@ -1550,6 +1584,7 @@ CONFIG_SMSC_PHY=m
 CONFIG_STE10XP=m
 CONFIG_VITESSE_PHY=m
 CONFIG_MICREL_PHY=m
+# CONFIG_MICREL_KS8995MA is not set
 # CONFIG_OMAP_CONTROL_PHY is not set
 # CONFIG_PHY_SAMSUNG_USB2 is not set
 
@@ -1699,6 +1734,7 @@ CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_HT=y
+# CONFIG_B43_PHY_G is not set
 # CONFIG_B43_FORCE_PIO is not set
 CONFIG_B43LEGACY=m
 # CONFIG_B43LEGACY_DEBUG is not set
@@ -1712,6 +1748,7 @@ CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
 CONFIG_BRCMFMAC_SDIO_OOB=y
 CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMISCAN is not set
 # CONFIG_BRCMDBG is not set
@@ -1741,6 +1778,7 @@ CONFIG_LIBERTAS_CS=m
 CONFIG_LIBERTAS_SDIO=m
 # CONFIG_LIBERTAS_DEBUG is not set
 # CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_LIBERTAS_SPI is not set
 CONFIG_LIBERTAS_MESH=y
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
@@ -1764,6 +1802,7 @@ CONFIG_MAC80211_HWSIM=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
 CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
 CONFIG_MWL8K=m
 # CONFIG_PRISM54 is not set
 # CONFIG_PCMCIA_WL3501 is not set
@@ -1888,6 +1927,9 @@ CONFIG_NFC_MICROREAD_I2C=m
 CONFIG_NFC_TRF7970A=m
 CONFIG_NFC_ST21NFCA=m
 CONFIG_NFC_ST21NFCA_I2C=m
+# CONFIG_NFC_ST21NFCB is not set
+# CONFIG_NFC_ST21NFCB_I2C is not set
+# CONFIG_NFC_NCI_SPI is not set
 
 
 #
@@ -2118,6 +2160,7 @@ CONFIG_TABLET_USB_GTCO=m
 CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
 CONFIG_TABLET_USB_WACOM=m
+CONFIG_TABLET_SERIAL_WACOM4=m
 
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
@@ -2180,6 +2223,7 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_TCA6416 is not set
 # CONFIG_KEYBOARD_TCA8418 is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_CAP1106 is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
@@ -2267,6 +2311,9 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
 
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
@@ -2365,6 +2412,9 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
 # CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_SERIAL_ST_ASC is not set
 # CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_IFX6X60 is not set
 
 CONFIG_UNIX98_PTYS=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
@@ -2420,6 +2470,8 @@ CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_MAX6875=m
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_93XX46 is not set
 
 CONFIG_I2C_NFORCE2=m
 # CONFIG_I2C_OCORES is not set
@@ -2494,6 +2546,7 @@ CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_K10TEMP=m
 CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_SENSORS_LIS3_I2C=m
+# CONFIG_SENSORS_LIS3_SPI is not set
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM77=m
@@ -2585,6 +2638,15 @@ CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_ZL6100=m
 CONFIG_SENSORS_EMC6W201=m
 
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_PWM_FAN=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_AD7314=m
+
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_MAX16064=m
@@ -2594,6 +2656,7 @@ CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_TPS40422=m
 
 # Industrial I/O subsystem configuration
 CONFIG_IIO=m
@@ -2639,6 +2702,7 @@ CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_ADJD_S311 is not set
 # CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_VCNL4000 is not set
 # CONFIG_AK8975 is not set
 # CONFIG_MAG3110 is not set
@@ -2682,6 +2746,13 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_MPL115 is not set
 # CONFIG_SI7005 is not set
 # CONFIG_AS3935 is not set
+# CONFIG_KXCJK1013 is not set
+# CONFIG_ISL29125 is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_AK09911 is not set
+# CONFIG_T5403 is not set
+# CONFIG_MCP4922 is not set
+# CONFIG_MAX1027 is not set
 
 # staging IIO drivers
 # CONFIG_AD7291 is not set
@@ -2696,6 +2767,7 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_SENSORS_ISL29018 is not set
 # CONFIG_SENSORS_ISL29028 is not set
 # CONFIG_SENSORS_HMC5843 is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
 # CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_ADIS16201 is not set
@@ -2734,6 +2806,9 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_PCH_PHUB is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_SRAM is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_BMP085_SPI is not set
+# CONFIG_LATTICE_ECP3_CONFIG is not set
 
 CONFIG_W1=m
 CONFIG_W1_CON=y
@@ -2755,6 +2830,7 @@ CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_W1_SLAVE_DS2406=m
 
 #
 # Mice
@@ -2876,6 +2952,20 @@ CONFIG_RTC_DRV_RV3029C2=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_DS3234=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_PCF85063=m
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_MOXART is not set
 # CONFIG_RTC_DRV_ISL12057 is not set
@@ -2966,6 +3056,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
+# CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
@@ -3032,6 +3123,7 @@ CONFIG_VIDEO_SAA7134=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SOLO6X10=m
 CONFIG_VIDEO_USBVISION=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
@@ -3056,6 +3148,7 @@ CONFIG_VIDEO_TLG2300=m
 # CONFIG_VIDEO_M5MOLS is not set
 # CONFIG_EXYNOS_VIDEO is not set
 CONFIG_VIDEO_USBTV=m
+# CONFIG_VIDEO_AU0828_RC is not set
 
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -3211,6 +3304,7 @@ CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_IGUANA=m
 CONFIG_IR_TTUSBIR=m
 CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_XMP_DECODER=m
 
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
@@ -3354,6 +3448,7 @@ CONFIG_SND_RTCTIMER=y
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_MAX_CARDS=32
 # CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_SPI is not set
 
 #
 # Generic devices
@@ -3657,6 +3752,7 @@ CONFIG_HID_ROCCAT_KOVAPLUS=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
 CONFIG_HID_HUION=m
+CONFIG_HID_GT683R=m
 CONFIG_HID_SPEEDLINK=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_WIIMOTE_EXT=y
@@ -3667,6 +3763,7 @@ CONFIG_HID_GENERIC=y
 CONFIG_HID_AUREAL=m
 CONFIG_HID_APPLEIR=m
 # CONFIG_HID_CP2112 is not set
+CONFIG_HID_LENOVO=m
 
 
 #
@@ -3741,6 +3838,7 @@ CONFIG_USB_ZR364XX=m
 #
 # USB Network adaptors
 #
+CONFIG_USB_NET_DRIVERS=y
 CONFIG_USB_CATC=m
 CONFIG_USB_HSO=m
 CONFIG_USB_KAWETH=m
@@ -3895,6 +3993,8 @@ CONFIG_USB_PHY=y
 # CONFIG_GENERIC_PHY is not set
 # CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
 # CONFIG_PHY_EXYNOS_DP_VIDEO is not set
+# CONFIG_PHY_ST_SPEAR1310_MIPHY is not set
+# CONFIG_PHY_ST_SPEAR1340_MIPHY is not set
 # CONFIG_AM335X_PHY_USB is not set
 # CONFIG_SAMSUNG_USBPHY is not set
 # CONFIG_SAMSUNG_USB2PHY is not set
@@ -3906,7 +4006,6 @@ CONFIG_USB_CXACRU=m
 # CONFIG_USB_C67X00_HCD is not set
 # CONFIG_USB_CYTHERM is not set
 CONFIG_USB_EMI26=m
-CONFIG_USB_ETH=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
@@ -3919,6 +4018,7 @@ CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
 CONFIG_USB_HSIC_USB3503=m
+# CONFIG_USB_LINK_LAYER_TEST is not set
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LEGOTOWER=m
@@ -3944,16 +4044,13 @@ CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_XUSBATM=m
-CONFIG_USB_ZERO=m
 
 # CONFIG_USB_DWC2 is not set
-
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
 # CONFIG_USB_ISP1301 is not set
-
 # CONFIG_USB_OTG is not set
 
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
 #
 # Sonics Silicon Backplane
 #
@@ -4024,6 +4121,13 @@ CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_LP3943 is not set
 # CONFIG_MFD_BCM590XX is not set
 # CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_INTEL_SOC_PMIC is not set
 
 
 #
@@ -4345,6 +4449,9 @@ CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_DEBUG_INFO=y
+# Revisit both of these options
+# CONFIG_DEBUG_INFO_SPLIT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_DEBUG_DRIVER is not set
@@ -4354,6 +4461,7 @@ CONFIG_HEADERS_CHECK=y
 # CONFIG_READABLE_ASM is not set
 
 # CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 
@@ -4513,6 +4621,7 @@ CONFIG_LIBCRC32C=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_GHASH=m
 CONFIG_CRYPTO_ANSI_CPRNG=m
+# CONFIG_CRYPTO_DRBG_MENU is not set
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_PCRYPT=m
@@ -4575,6 +4684,19 @@ CONFIG_BACKLIGHT_LP855X=m
 
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_LCD_PLATFORM=m
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+
 
 CONFIG_SCHED_DEBUG=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -4607,6 +4729,7 @@ CONFIG_BLK_CGROUP=y
 
 CONFIG_RELAY=y
 CONFIG_PRINTK_TIME=y
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
@@ -4752,6 +4875,7 @@ CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_WM8350=m
 CONFIG_LEDS_WM831X_STATUS=m
+# CONFIG_LEDS_DAC124S085 is not set
 
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
@@ -4762,6 +4886,7 @@ CONFIG_DW_DMAC_PCI=m
 # CONFIG_TIMB_DMA is not set
 # CONFIG_DMATEST is not set
 # CONFIG_FSL_EDMA is not set
+# CONFIG_NBPFAXI_DMA is not set
 CONFIG_ASYNC_TX_DMA=y
 
 CONFIG_UNUSED_SYMBOLS=y
@@ -4928,6 +5053,8 @@ CONFIG_NET_DSA_MV88E6123_61_65=m
 # Used by Maemo, we don't care.
 # CONFIG_PHONET is not set
 
+# CONFIG_6LOWPAN is not set
+
 # CONFIG_ICS932S401 is not set
 # CONFIG_ATMEL_SSC is not set
 
@@ -5074,8 +5201,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 is not set
+CONFIG_RCU_FAST_NO_HZ=y
 CONFIG_RCU_NOCB_CPU=y
 CONFIG_RCU_NOCB_CPU_ALL=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
@@ -5097,6 +5223,9 @@ CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_IEEE802154_FAKELB=m
+# CONFIG_IEEE802154_AT86RF230 is not set
+# CONFIG_IEEE802154_MRF24J40 is not set
+# CONFIG_IEEE802154_CC2520 is not set
 
 CONFIG_MAC802154=m
 CONFIG_NET_MPLS_GSO=m
@@ -5122,6 +5251,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
 CONFIG_ZSWAP=y
+# CONFIG_ZBUD is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_PGTABLE_MAPPING is not set
 
@@ -5166,6 +5296,9 @@ CONFIG_GPIO_VIPERBOARD=m
 # CONFIG_GPIO_BCM_KONA is not set
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_DWAPB is not set
+# CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MC33880 is not set
 
 # FIXME: Why?
 CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
@@ -5201,6 +5334,8 @@ CONFIG_PSTORE_RAM=m
 # CONFIG_TEST_MODULE is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_UDELAY is not set
+# CONFIG_TEST_RHASHTABLE is not set
 
 # CONFIG_AVERAGE is not set
 # CONFIG_VMXNET3 is not set
@@ -5235,6 +5370,7 @@ CONFIG_FMC_CHARDEV=m
 # CONFIG_GENWQE is not set
 
 # CONFIG_POWERCAP is not set
+# CONFIG_THUNDERBOLT is not set
 
 # CONFIG_HSI is not set
 
@@ -5253,3 +5389,5 @@ CONFIG_FMC_CHARDEV=m
 
 # CONFIG_RTC_DRV_EFI is not set
 # CONFIG_NET_XGENE is not set
+
+# CONFIG_GLOB_SELFTEST is not set
diff --git a/freed-ora/current/master/config-nodebug b/freed-ora/current/master/config-nodebug
index e16a37b57..299016139 100644
--- a/freed-ora/current/master/config-nodebug
+++ b/freed-ora/current/master/config-nodebug
@@ -5,7 +5,6 @@ CONFIG_SND_PCM_XRUN_DEBUG=y
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
diff --git a/freed-ora/current/master/config-powerpc-generic b/freed-ora/current/master/config-powerpc-generic
index 9c0ad6011..b11dcd0c8 100644
--- a/freed-ora/current/master/config-powerpc-generic
+++ b/freed-ora/current/master/config-powerpc-generic
@@ -61,7 +61,6 @@ CONFIG_CAPI_EICON=y
 
 CONFIG_NVRAM=y
 
-# CONFIG_PCMCIA_M8XX is not set
 # CONFIG_SCSI_AHA1542 is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_SCSI_IPS is not set
diff --git a/freed-ora/current/master/config-powerpc32-generic b/freed-ora/current/master/config-powerpc32-generic
deleted file mode 100644
index 10e02fb7b..000000000
--- a/freed-ora/current/master/config-powerpc32-generic
+++ /dev/null
@@ -1,180 +0,0 @@
-# CONFIG_SMP is not set
-CONFIG_PPC32=y
-# CONFIG_PPC64 is not set
-# CONFIG_RTAS_PROC is not set
-# CONFIG_PCMCIA_M8XX is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_CPU_FREQ_PMAC=y
-CONFIG_PPC_CHRP=y
-CONFIG_PPC_PMAC=y
-# CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PREP=y
-
-# CONFIG_PPC_MPC5200_SIMPLE is not set
-# CONFIG_SATA_FSL is not set
-# CONFIG_SATA_NV is not set
-
-# busted in .28git1
-# ERROR: "cacheable_memzero" [drivers/net/gianfar_driver.ko] undefined!
-# CONFIG_GIANFAR is not set
-# CONFIG_USB_EHCI_FSL is not set
-
-CONFIG_PMAC_APM_EMU=y
-CONFIG_PMAC_BACKLIGHT=y
-
-CONFIG_HIGHMEM=y
-# CONFIG_HIGHMEM_START_BOOL is not set
-# CONFIG_LOWMEM_SIZE_BOOL is not set
-# CONFIG_TASK_SIZE_BOOL is not set
-# CONFIG_KERNEL_START_BOOL is not set
-# CONFIG_PPC601_SYNC_FIX is not set
-CONFIG_ADVANCED_OPTIONS=y
-CONFIG_SCSI_MESH=m
-CONFIG_SCSI_MESH_SYNC_RATE=5
-CONFIG_SCSI_MESH_RESET_DELAY_MS=4000
-
-CONFIG_LBDAF=y
-
-CONFIG_SCSI_MAC53C94=m
-CONFIG_ADB_CUDA=y
-CONFIG_ADB_MACIO=y
-CONFIG_INPUT_ADBHID=y
-CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_IDE=y
-
-CONFIG_PMAC_MEDIABAY=y
-CONFIG_NET_VENDOR_APPLE=y
-CONFIG_BMAC=m
-CONFIG_MACE=m
-# CONFIG_MACE_AAUI_PORT is not set
-# CONFIG_MV643XX_ETH is not set
-CONFIG_I2C_HYDRA=m
-CONFIG_I2C_MPC=m
-CONFIG_THERM_WINDTUNNEL=m
-CONFIG_THERM_ADT746X=m
-# CONFIG_ANSLCD is not set
-
-CONFIG_FB_PLATINUM=y
-CONFIG_FB_VALKYRIE=y
-CONFIG_FB_CT65550=y
-# CONFIG_BDI_SWITCH is not set
-
-CONFIG_MAC_FLOPPY=m
-# CONFIG_BLK_DEV_FD is not set
-
-CONFIG_FB_ATY128=y
-CONFIG_FB_ATY=y
-CONFIG_FB_MATROX=y
-# CONFIG_KEXEC is not set
-
-# CONFIG_HVC_RTAS is not set
-
-# CONFIG_UDBG_RTAS_CONSOLE is not set
-CONFIG_BRIQ_PANEL=m
-
-# CONFIG_ATA_PIIX is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_MPC52xx is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_SERVERWORKS is not set
-
-# CONFIG_SERIAL_MPC52xx is not set
-# CONFIG_MPC5200_WDT is not set
-CONFIG_8xxx_WDT=m
-CONFIG_GEF_WDT=m
-
-# CONFIG_PPC_MPC5200_BUGFIX is not set
-# CONFIG_NET_VENDOR_FREESCALE is not set
-#CHECK: This may later become a tristate.
-CONFIG_MDIO_GPIO=m
-
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-
-# CONFIG_EMBEDDED6xx is not set
-
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
-
-# CONFIG_VIRQ_DEBUG is not set
-
-CONFIG_PPC_BESTCOMM_ATA=m
-CONFIG_PPC_BESTCOMM_FEC=m
-CONFIG_PPC_BESTCOMM_GEN_BD=m
-
-CONFIG_FORCE_MAX_ZONEORDER=11
-# CONFIG_PAGE_OFFSET_BOOL is not set
-# CONFIG_FB_FSL_DIU is not set
-CONFIG_IRQSTACKS=y
-CONFIG_VIRTUALIZATION=y
-
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_HTC_EGPIO is not set
-
-# CONFIG_TIFM_CORE is not set
-
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_CISS_SCSI_TAPE is not set
-
-# CONFIG_I2C_NFORCE2 is not set
-
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-
-# CONFIG_MEMSTICK is not set
-
-# CONFIG_IPMI_HANDLER is not set
-
-# PPC gets sad with debug alloc (bz 448598)
-# CONFIG_DEBUG_PAGEALLOC is not set
-
-CONFIG_CRYPTO_DEV_TALITOS=m
-
-# CONFIG_FSL_EMB_PERFMON is not set
-# CONFIG_MPC8272_ADS is not set
-# CONFIG_PQ2FADS is not set
-# CONFIG_EP8248E is not set
-# CONFIG_MPC830x_RDB is not set
-# CONFIG_MPC831x_RDB is not set
-# CONFIG_MPC832x_MDS is not set
-# CONFIG_MPC832x_RDB is not set
-# CONFIG_MPC834x_MDS is not set
-# CONFIG_MPC834x_ITX is not set
-# CONFIG_MPC836x_MDS is not set
-# CONFIG_MPC836x_RDK is not set
-# CONFIG_MPC837x_MDS is not set
-# CONFIG_MPC837x_RDB is not set
-# CONFIG_SBC834x is not set
-# CONFIG_ASP834x is not set
-# CONFIG_KMETER1 is not set
-# CONFIG_MPC8641_HPCN is not set
-# CONFIG_SBC8641D is not set
-# CONFIG_MPC8610_HPCD is not set
-# CONFIG_FSL_LBC is not set
-# CONFIG_MTD_NAND_FSL_UPM is not set
-
-# CONFIG_USB_MUSB_HDRC is not set
-
-# busted in 2.6.27
-# drivers/mtd/maps/sbc8240.c: In function 'init_sbc8240_mtd':
-# drivers/mtd/maps/sbc8240.c:172: warning: passing argument 1 of 'simple_map_init' from incompatible pointer type
-# drivers/mtd/maps/sbc8240.c:177: error: 'struct mtd_info' has no member named 'module'
-
-CONFIG_RCU_FANOUT=32
-
-CONFIG_KVM_BOOK3S_32=m
-
-# CONFIG_SCSI_QLA_ISCSI is not set
-
-CONFIG_BATTERY_PMU=m
-
diff --git a/freed-ora/current/master/config-powerpc32-smp b/freed-ora/current/master/config-powerpc32-smp
deleted file mode 100644
index 5dbe87f7f..000000000
--- a/freed-ora/current/master/config-powerpc32-smp
+++ /dev/null
@@ -1,3 +0,0 @@
-# CONFIG_HOTPLUG_CPU is not set
-CONFIG_NR_CPUS=4
-# CONFIG_BATTERY_PMU is not set
diff --git a/freed-ora/current/master/config-powerpc64 b/freed-ora/current/master/config-powerpc64
index 7f4133593..44c2c51db 100644
--- a/freed-ora/current/master/config-powerpc64
+++ b/freed-ora/current/master/config-powerpc64
@@ -146,6 +146,7 @@ CONFIG_RCU_FANOUT=64
 
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_AREAS=7
 CONFIG_KVM_BOOK3S_64=m
 CONFIG_KVM_BOOK3S_64_HV=m
 CONFIG_KVM_BOOK3S_64_PR=m
diff --git a/freed-ora/current/master/config-powerpc64p7 b/freed-ora/current/master/config-powerpc64p7
index d8ce7e0b1..4021f7dc5 100644
--- a/freed-ora/current/master/config-powerpc64p7
+++ b/freed-ora/current/master/config-powerpc64p7
@@ -137,6 +137,7 @@ CONFIG_RCU_FANOUT=64
 
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_AREAS=7
 CONFIG_KVM_BOOK3S_64=m
 CONFIG_KVM_BOOK3S_64_HV=m
 CONFIG_KVM_BOOK3S_64_PR=m
diff --git a/freed-ora/current/master/config-s390x b/freed-ora/current/master/config-s390x
index 874f80847..fe0df614b 100644
--- a/freed-ora/current/master/config-s390x
+++ b/freed-ora/current/master/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
diff --git a/freed-ora/current/master/config-x86-generic b/freed-ora/current/master/config-x86-generic
index 7968fdaea..fb687bb2f 100644
--- a/freed-ora/current/master/config-x86-generic
+++ b/freed-ora/current/master/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
@@ -119,6 +121,7 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 
 CONFIG_GENERIC_ISA_DMA=y
 
@@ -142,6 +145,9 @@ CONFIG_IPW2200_QOS=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 
+# I2C_ACPI casues I2C to be built in.  This should probably be fixed.
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
@@ -183,6 +189,7 @@ CONFIG_EDAC_X38=m
 CONFIG_EDAC_MCE_INJ=m
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_LEGACY_SYSFS=y
+CONFIG_EDAC_IE31200=m
 
 CONFIG_SCHED_MC=y
 
@@ -367,6 +374,7 @@ CONFIG_X86_DECODER_SELFTEST=y
 CONFIG_ACPI_CMPC=m
 CONFIG_MSI_WMI=m
 CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
 
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_LPC_SCH=m
@@ -377,6 +385,33 @@ CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_F7188X is not set
 
+# These should all go away with IC2_ACPI is fixed
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_AXP20X is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+
 
 CONFIG_PCI_CNB20LE_QUIRK=y
 
@@ -467,6 +502,9 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_MPILIB=y
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+CONFIG_SIGNED_PE_FILE_VERIFICATION=y
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_MODULE_SIG=y
@@ -477,6 +515,9 @@ CONFIG_MODULE_SIG_SHA256=y
 CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE=y
 CONFIG_EFI_SIGNATURE_LIST_PARSER=y
 
+# CONFIG_KEXEC_FILE is not set
+# CONFIG_KEXEC_VERIFY_SIG is not set
+
 CONFIG_MODULE_SIG_UEFI=y
 
 CONFIG_VMXNET3=m
diff --git a/freed-ora/current/master/config-x86_64-generic b/freed-ora/current/master/config-x86_64-generic
index 2f098161f..2f6155f66 100644
--- a/freed-ora/current/master/config-x86_64-generic
+++ b/freed-ora/current/master/config-x86_64-generic
@@ -42,6 +42,9 @@ CONFIG_CGROUP_HUGETLB=y
 CONFIG_MEM_SOFT_DIRTY=y
 
 CONFIG_KEXEC_JUMP=y
+CONFIG_KEXEC_FILE=y
+CONFIG_KEXEC_VERIFY_SIG=y
+CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
 
 CONFIG_ACPI_HOTPLUG_MEMORY=y
 
@@ -49,6 +52,8 @@ CONFIG_ACPI_HOTPLUG_MEMORY=y
 
 CONFIG_INTEL_MIC_HOST=m
 CONFIG_INTEL_MIC_CARD=m
+CONFIG_INTEL_MIC_BUS=m
+CONFIG_INTEL_MIC_X100_DMA=m
 
 # SHPC has half-arsed PCI probing, which makes it load on too many systems
 CONFIG_HOTPLUG_PCI_SHPC=m
@@ -74,6 +79,7 @@ CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
 CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 CONFIG_CRYPTO_TWOFISH_AVX2_X86_64=m
+CONFIG_CRYPTO_DES3_EDE_X86_64=m
 # staging crypto
 # CONFIG_CRYPTO_SKEIN is not set
 # CONFIG_CRYPTO_THREEFISH is not set
@@ -158,6 +164,8 @@ CONFIG_CHECKPOINT_RESTORE=y
 # Should be 32bit only, but lacks KConfig depends
 # CONFIG_XO15_EBOOK is not set
 
+CONFIG_THUNDERBOLT=m
+
 CONFIG_NTB=m
 CONFIG_NTB_NETDEV=m
 
@@ -176,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
diff --git a/freed-ora/current/master/crash-driver.patch b/freed-ora/current/master/crash-driver.patch
index 5765d0461..f1d68bec9 100644
--- a/freed-ora/current/master/crash-driver.patch
+++ b/freed-ora/current/master/crash-driver.patch
@@ -1,69 +1,68 @@
-Bugzilla: N/A
-Upstream-status: Fedora mustard
-
-From 1786bc697d34af944e29437ce44337b0eb8b6799 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle@dreadnought.bos.jkkm.org>
+From 1d1476e327b1bb3d363e3fe68d67cb262bc239a9 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
 
+Bugzilla: N/A
+Upstream-status: Fedora mustard
 ---
- arch/arm/include/asm/crash.h     |   6 ++
- arch/arm64/include/asm/crash.h   |   6 ++
- arch/ia64/include/asm/crash.h    |  90 +++++++++++++++++++++++++++
- arch/ia64/kernel/ia64_ksyms.c    |   3 +
- arch/powerpc/include/asm/crash.h |   6 ++
- arch/s390/include/asm/crash.h    |  60 ++++++++++++++++++
- arch/s390/mm/maccess.c           |   2 +
- arch/x86/include/asm/crash.h     |   6 ++
- drivers/char/Kconfig             |   3 +
- drivers/char/Makefile            |   2 +
- drivers/char/crash.c             | 128 +++++++++++++++++++++++++++++++++++++++
- include/asm-generic/crash.h      |  72 ++++++++++++++++++++++
+ arch/arm/include/asm/crash-driver.h     |   6 ++
+ arch/arm64/include/asm/crash-driver.h   |   6 ++
+ arch/ia64/include/asm/crash-driver.h    |  90 ++++++++++++++++++++++
+ arch/ia64/kernel/ia64_ksyms.c           |   3 +
+ arch/powerpc/include/asm/crash-driver.h |   6 ++
+ arch/s390/include/asm/crash-driver.h    |  60 +++++++++++++++
+ arch/s390/mm/maccess.c                  |   2 +
+ arch/x86/include/asm/crash-driver.h     |   6 ++
+ drivers/char/Kconfig                    |   3 +
+ drivers/char/Makefile                   |   2 +
+ drivers/char/crash.c                    | 128 ++++++++++++++++++++++++++++++++
+ include/asm-generic/crash-driver.h      |  72 ++++++++++++++++++
  12 files changed, 384 insertions(+)
- create mode 100644 arch/arm/include/asm/crash.h
- create mode 100644 arch/arm64/include/asm/crash.h
- create mode 100644 arch/ia64/include/asm/crash.h
- create mode 100644 arch/powerpc/include/asm/crash.h
- create mode 100644 arch/s390/include/asm/crash.h
- create mode 100644 arch/x86/include/asm/crash.h
+ create mode 100644 arch/arm/include/asm/crash-driver.h
+ create mode 100644 arch/arm64/include/asm/crash-driver.h
+ create mode 100644 arch/ia64/include/asm/crash-driver.h
+ create mode 100644 arch/powerpc/include/asm/crash-driver.h
+ create mode 100644 arch/s390/include/asm/crash-driver.h
+ create mode 100644 arch/x86/include/asm/crash-driver.h
  create mode 100644 drivers/char/crash.c
- create mode 100644 include/asm-generic/crash.h
+ create mode 100644 include/asm-generic/crash-driver.h
 
-diff --git a/arch/arm/include/asm/crash.h b/arch/arm/include/asm/crash.h
+diff --git a/arch/arm/include/asm/crash-driver.h b/arch/arm/include/asm/crash-driver.h
 new file mode 100644
-index 0000000..1d2e537
+index 000000000000..06e7ae916601
 --- /dev/null
-+++ b/arch/arm/include/asm/crash.h
++++ b/arch/arm/include/asm/crash-driver.h
 @@ -0,0 +1,6 @@
 +#ifndef _ARM_CRASH_H
 +#define _ARM_CRASH_H
 +
-+#include <asm-generic/crash.h>
++#include <asm-generic/crash-driver.h>
 +
 +#endif /* _ARM_CRASH_H */
-diff --git a/arch/arm64/include/asm/crash.h b/arch/arm64/include/asm/crash.h
+diff --git a/arch/arm64/include/asm/crash-driver.h b/arch/arm64/include/asm/crash-driver.h
 new file mode 100644
-index 0000000..a7fcc28
+index 000000000000..43b26da0c5d6
 --- /dev/null
-+++ b/arch/arm64/include/asm/crash.h
++++ b/arch/arm64/include/asm/crash-driver.h
 @@ -0,0 +1,6 @@
 +#ifndef _ARM64_CRASH_H
 +#define _ARM64_CRASH_H
 +
-+#include <asm-generic/crash.h>
++#include <asm-generic/crash-driver.h>
 +
 +#endif /* _ARM64_CRASH_H */
-diff --git a/arch/ia64/include/asm/crash.h b/arch/ia64/include/asm/crash.h
+diff --git a/arch/ia64/include/asm/crash-driver.h b/arch/ia64/include/asm/crash-driver.h
 new file mode 100644
-index 0000000..28bd955
+index 000000000000..404bcb93c112
 --- /dev/null
-+++ b/arch/ia64/include/asm/crash.h
++++ b/arch/ia64/include/asm/crash-driver.h
 @@ -0,0 +1,90 @@
 +#ifndef _ASM_IA64_CRASH_H
 +#define _ASM_IA64_CRASH_H
 +
 +/*
-+ * linux/include/asm-ia64/crash.h
++ * linux/include/asm-ia64/crash-driver.h
 + *
 + * Copyright (c) 2004 Red Hat, Inc. All rights reserved.
 + *
@@ -150,7 +149,7 @@ index 0000000..28bd955
 +
 +#endif /* _ASM_IA64_CRASH_H */
 diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
-index 5b7791d..aee4b87 100644
+index 5b7791dd3965..aee4b870c763 100644
 --- a/arch/ia64/kernel/ia64_ksyms.c
 +++ b/arch/ia64/kernel/ia64_ksyms.c
 @@ -84,6 +84,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
@@ -163,23 +162,23 @@ index 5b7791d..aee4b87 100644
  #if defined(CONFIG_IA64_ESI) || defined(CONFIG_IA64_ESI_MODULE)
  extern void esi_call_phys (void);
  EXPORT_SYMBOL_GPL(esi_call_phys);
-diff --git a/arch/powerpc/include/asm/crash.h b/arch/powerpc/include/asm/crash.h
+diff --git a/arch/powerpc/include/asm/crash-driver.h b/arch/powerpc/include/asm/crash-driver.h
 new file mode 100644
-index 0000000..daa8c4d
+index 000000000000..50092d965dc5
 --- /dev/null
-+++ b/arch/powerpc/include/asm/crash.h
++++ b/arch/powerpc/include/asm/crash-driver.h
 @@ -0,0 +1,6 @@
 +#ifndef _PPC64_CRASH_H
 +#define _PPC64_CRASH_H
 +
-+#include <asm-generic/crash.h>
++#include <asm-generic/crash-driver.h>
 +
 +#endif /* _PPC64_CRASH_H */
-diff --git a/arch/s390/include/asm/crash.h b/arch/s390/include/asm/crash.h
+diff --git a/arch/s390/include/asm/crash-driver.h b/arch/s390/include/asm/crash-driver.h
 new file mode 100644
-index 0000000..552be5e
+index 000000000000..552be5e2c571
 --- /dev/null
-+++ b/arch/s390/include/asm/crash.h
++++ b/arch/s390/include/asm/crash-driver.h
 @@ -0,0 +1,60 @@
 +#ifndef _S390_CRASH_H
 +#define _S390_CRASH_H
@@ -242,10 +241,10 @@ index 0000000..552be5e
 +
 +#endif /* _S390_CRASH_H */
 diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
-index d1e0e0c..a2be459 100644
+index 2a2e35416d2f..a529181429bb 100644
 --- a/arch/s390/mm/maccess.c
 +++ b/arch/s390/mm/maccess.c
-@@ -219,6 +219,7 @@ void *xlate_dev_mem_ptr(unsigned long addr)
+@@ -193,6 +193,7 @@ void *xlate_dev_mem_ptr(unsigned long addr)
  	put_online_cpus();
  	return bounce;
  }
@@ -253,25 +252,25 @@ index d1e0e0c..a2be459 100644
  
  /*
   * Free converted buffer for /dev/mem access (if necessary)
-@@ -228,3 +229,4 @@ void unxlate_dev_mem_ptr(unsigned long addr, void *buf)
+@@ -202,3 +203,4 @@ void unxlate_dev_mem_ptr(unsigned long addr, void *buf)
  	if ((void *) addr != buf)
  		free_page((unsigned long) buf);
  }
 +EXPORT_SYMBOL_GPL(unxlate_dev_mem_ptr);
-diff --git a/arch/x86/include/asm/crash.h b/arch/x86/include/asm/crash.h
+diff --git a/arch/x86/include/asm/crash-driver.h b/arch/x86/include/asm/crash-driver.h
 new file mode 100644
-index 0000000..27a4156
+index 000000000000..fd4736ec99f5
 --- /dev/null
-+++ b/arch/x86/include/asm/crash.h
++++ b/arch/x86/include/asm/crash-driver.h
 @@ -0,0 +1,6 @@
 +#ifndef _X86_CRASH_H
 +#define _X86_CRASH_H
 +
-+#include <asm-generic/crash.h>
++#include <asm-generic/crash-driver.h>
 +
 +#endif /* _X86_CRASH_H */
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index fa3243d..83643e5b 100644
+index 6e9f74a5c095..ee6bae16b04c 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
 @@ -4,6 +4,9 @@
@@ -285,10 +284,10 @@ index fa3243d..83643e5b 100644
  
  config DEVKMEM
 diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index 7ff1d0d..3ed67af 100644
+index a324f9303e36..33ce2fb1d0a3 100644
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
-@@ -62,3 +62,5 @@ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
+@@ -61,3 +61,5 @@ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
  js-rtc-y = rtc.o
  
  obj-$(CONFIG_TILE_SROM)		+= tile-srom.o
@@ -296,7 +295,7 @@ index 7ff1d0d..3ed67af 100644
 +obj-$(CONFIG_CRASH)            += crash.o
 diff --git a/drivers/char/crash.c b/drivers/char/crash.c
 new file mode 100644
-index 0000000..a142bb3
+index 000000000000..085378a1d539
 --- /dev/null
 +++ b/drivers/char/crash.c
 @@ -0,0 +1,128 @@
@@ -332,7 +331,7 @@ index 0000000..a142bb3
 +#include <asm/io.h>
 +#include <asm/uaccess.h>
 +#include <asm/types.h>
-+#include <asm/crash.h>
++#include <asm/crash-driver.h>
 +
 +#define CRASH_VERSION   "1.0"
 +
@@ -428,17 +427,17 @@ index 0000000..a142bb3
 +module_exit(crash_cleanup_module);
 +
 +MODULE_LICENSE("GPL");
-diff --git a/include/asm-generic/crash.h b/include/asm-generic/crash.h
+diff --git a/include/asm-generic/crash-driver.h b/include/asm-generic/crash-driver.h
 new file mode 100644
-index 0000000..8a0a69a
+index 000000000000..25ab9869d566
 --- /dev/null
-+++ b/include/asm-generic/crash.h
++++ b/include/asm-generic/crash-driver.h
 @@ -0,0 +1,72 @@
 +#ifndef __CRASH_H__
 +#define __CRASH_H__
 +
 +/*
-+ * include/linux/crash.h
++ * include/linux/crash-driver.h
 + *
 + * Copyright (c) 2013 Red Hat, Inc. All rights reserved.
 + *
@@ -507,5 +506,5 @@ index 0000000..8a0a69a
 +
 +#endif /* __CRASH_H__ */
 -- 
-1.8.3.1
+1.9.3
 
diff --git a/freed-ora/current/master/criu-no-expert.patch b/freed-ora/current/master/criu-no-expert.patch
index 28c8a987d..f5cef51a9 100644
--- a/freed-ora/current/master/criu-no-expert.patch
+++ b/freed-ora/current/master/criu-no-expert.patch
@@ -1,11 +1,19 @@
+From 0265ed044330537c705ea39c7390b09910701241 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
+
 Bugzilla: N/A
 Upstream-status: Fedora mustard
+---
+ init/Kconfig | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/init/Kconfig b/init/Kconfig
-index be8b7f5..7461760 100644
+index 3bad458f1c68..aee58b9fedfc 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP
+@@ -1147,7 +1147,7 @@ config DEBUG_BLK_CGROUP
  endif # CGROUPS
  
  config CHECKPOINT_RESTORE
@@ -14,7 +22,7 @@ index be8b7f5..7461760 100644
  	default n
  	help
  	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE
+@@ -1158,7 +1158,7 @@ config CHECKPOINT_RESTORE
  	  If unsure, say N here.
  
  menuconfig NAMESPACES
@@ -23,3 +31,6 @@ index be8b7f5..7461760 100644
  	default !EXPERT
  	help
  	  Provides the way to make tasks work with different objects using
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/deblob-3.17 b/freed-ora/current/master/deblob-3.17
new file mode 100755
index 000000000..8fa808202
--- /dev/null
+++ b/freed-ora/current/master/deblob-3.17
@@ -0,0 +1,2940 @@
+#!/bin/sh
+
+#    Copyright (C) 2008-2014 Alexandre Oliva <lxoliva@fsfla.org>
+#    Copyright (C) 2008 Jeff Moe
+#    Copyright (C) 2009 Rubén Rodríguez <ruben@gnu.org>
+#
+#    This program is part of GNU Linux-libre, a GNU project that
+#    publishes scripts to clean up Linux so as to make it suitable for
+#    use in the GNU Project and in Free System Distributions.
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+# deblob - remove non-free blobs from the vanilla linux kernel
+
+# http://www.fsfla.org/svn/fsfla/software/linux-libre
+
+
+# This script, suited for the kernel version named below, in kver,
+# attempts to remove only non-Free Software bits, without removing
+# Free Software that happens to be in the same file.
+
+# Drivers that currently require non-Free firmware are retained, but
+# firmware included in GPLed sources is replaced with /*(DEBLOBBED)*/
+# if the deblob-check script, that knows how to do this, is present.
+# -lxoliva
+
+
+# See also:
+# http://wiki.debian.org/KernelFirmwareLicensing
+# svn://svn.debian.org/kernel/dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
+# http://wiki.gnewsense.org/Builder gen-kernel
+
+# Thanks to Brian Brazil @ gnewsense
+
+
+# For each kver release, start extra with an empty string, then count
+# from 1 if changes are needed that require rebuilding the tarball.
+kver=3.17 extra=
+
+case $1 in
+--force)
+  echo "WARNING: Using the force, ignored errors will be" >&2
+  die () {
+    echo ERROR: "$@" >&2
+    errors=:
+  }
+  forced=: errors=false
+  shift
+  ;;
+*)
+  die () {
+    echo ERROR: "$@" >&2
+    echo Use --force to ignore
+    exit 1
+  }
+  forced=false errors=false
+  ;;
+esac
+
+check=`echo "$0" | sed 's,[^/]*$,,;s,^$,.,;s,/*$,,'`/deblob-check
+if [ ! -f $check ] ; then
+  if $forced; then
+    die deblob-check script missing, will remove entire files
+  else
+    die deblob-check script missing
+  fi
+  have_check=false
+else
+  have_check=:
+  [ -x $check ] || check="/bin/sh $check"
+fi
+
+filetest () {
+  if [ ! -f $1 ]; then
+    die $1 does not exist, something is wrong && return 1
+  fi
+}
+
+announce () {
+  echo
+  echo "$@"
+}
+
+clean_file () {
+  #$1 = filename
+  filetest $1 || return
+  rm $1
+  echo $1: removed
+}
+
+check_changed () {
+  #$1 = filename
+  if cmp $1.deblob $1 > /dev/null; then
+    rm $1.deblob
+    die $1 did not change, something is wrong && return 1
+  fi
+  mv $1.deblob $1
+}
+
+clean_blob () {
+  #$1 = filename
+  filetest $1 || return
+  if $have_check; then
+    name=$1
+    set fnord "$@" -d
+    shift 2
+    if $check "$@" -i linux-$kver $name > $name.deblob; then
+      if [ ! -s $name.deblob ]; then
+	die got an empty file after removing blobs from $name
+      fi
+    else
+      die failed removing blobs from $name
+    fi
+    check_changed $name && echo $name: removed blobs
+  else
+    clean_file $1
+  fi
+}
+
+dummy_blob () {
+  #$1 = filename
+  if test -f $1; then
+    die $1 exists, something is wrong && return
+  elif test ! -f firmware/Makefile; then
+    die firmware/Makefile does not exist, something is wrong && return
+  fi
+
+  clean_sed "s,`echo $1 | sed s,^firmware/,,`,\$(DEBLOBBED),g" \
+    firmware/Makefile "dropped $1"
+}
+
+clean_fw () {
+  #$1 = firmware text input, $2 = firmware output
+  filetest $1 || return
+  if test -f $2; then
+    die $2 exists, something is wrong && return
+  fi
+  clean_blob $1 -s 4
+  dummy_blob $2
+}
+
+drop_fw_file () {
+  #$1 = firmware text input, $2 = firmware output
+  filetest $1 || return
+  if test -f $2; then
+    die $2 exists, something is wrong && return
+  fi
+  clean_file $1
+  dummy_blob $2
+}
+
+clean_kconfig () {
+  #$1 = filename $2 = things to remove
+  case $1 in
+  -f)
+    shift
+    ;;
+  *)
+    if $have_check; then
+      return
+    fi
+    ;;
+  esac
+  filetest $1 || return
+  sed "/^config \\($2\\)\$/{p;i\
+	depends on NONFREE
+d;}" $1 > $1.deblob
+  check_changed $1 && echo $1: marked config $2 as depending on NONFREE
+}
+
+clean_mk () {
+  #$1 = config $2 = Makefile name
+  # We don't clean up Makefiles any more --lxoliva
+  # sed -i "/\\($1\\)/d" $2
+  # echo $2: removed $1 support
+  # check_changed $2
+  filetest $2 || return
+  if sed -n "/\\($1\\)/p" $2 | grep . > /dev/null; then
+    :
+  else
+    die $2 does not contain matches for $1
+  fi
+}
+
+clean_sed () {
+  #$1 = sed-script $2 = file $3 = comment
+  filetest $2 || return
+  sed -e "$1" "$2" > "$2".deblob || {
+    die $2: failed: ${3-applied sed script $1} && return 1; }
+  check_changed $2 && echo $2: ${3-applied sed script $1}
+}
+
+reject_firmware () {
+  #$1 = file $2 = pre sed pattern
+  filetest $1 || return
+  clean_sed "$2"'
+s,request\(_ihex\)\?_firmware\(_nowait\)\?,reject_firmware\2,g
+' "$1" 'disabled non-Free firmware-loading machinery'
+}
+
+maybe_reject_firmware () {
+  #$1 = file $2 = pre sed pattern
+  filetest $1 || return
+  clean_sed "$2"'
+s,request_\(ihex_\)\?firmware\(_nowait\)\?,maybe_reject_\1firmware\2,g
+' "$1" 'retain Free firmware-loading machinery, disabling non-Free one'
+}
+
+undefine_macro () {
+  #$1 - macro name
+  #$2 - substitution
+  #$3 - message
+  #rest - file names
+  macro=$1 repl=$2 msg=$3; shift 3
+  for f in "$@"; do
+    clean_sed "
+s,^#define $macro .*\$,/*(DEBLOBBED)*/,;
+s,$macro,$repl,g;
+" "$f" "$msg"
+  done
+}
+
+undefault_firmware () {
+  #$1 - pattern such that $1_DEFAULT_FIRMWARE is #defined to non-Free firmware
+  #$@ other than $1 - file names
+  macro="$1"_DEFAULT_FIRMWARE; shift
+  undefine_macro "$macro" "\"/*(DEBLOBBED)*/\"" \
+    "disabled non-Free firmware" "$@"
+}
+
+# First, check that files that contain firmwares and their
+# corresponding sources are present.
+
+for f in \
+  drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc \
+  drivers/gpu/drm/nouveau/core/engine/copy/fuc/nvc0.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc \
+  drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/com.fuc \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/macros.fuc \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvd7.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvd7.fuc \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvf0.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvf0.fuc \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcgm107.fuc5.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcgm107.fuc5 \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnv108.fuc5.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnv108.fuc5 \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/hub.fuc \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvd7.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvd7.fuc \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvf0.fuc.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvf0.fuc \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubgm107.fuc5.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubgm107.fuc5 \
+  drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5.h \
+    drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5 \
+  drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nv108.fuc.h \
+    drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nv108.fuc \
+  drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h \
+    drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc \
+  drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc.h \
+    drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvc0.fuc \
+  drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc.h \
+    drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nvd0.fuc \
+  drivers/net/wan/wanxlfw.inc_shipped \
+    drivers/net/wan/wanxlfw.S \
+  drivers/net/wireless/atmel.c \
+    drivers/net/wireless/atmel.c \
+  drivers/scsi/aic7xxx/aic79xx_seq.h_shipped \
+    drivers/scsi/aic7xxx/aic79xx.seq \
+  drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped \
+    drivers/scsi/aic7xxx/aic7xxx.seq \
+  drivers/scsi/53c700_d.h_shipped \
+    drivers/scsi/53c700.scr \
+  drivers/scsi/sym53c8xx_2/sym_fw1.h \
+    drivers/scsi/sym53c8xx_2/sym_fw1.h \
+  drivers/scsi/sym53c8xx_2/sym_fw2.h \
+    drivers/scsi/sym53c8xx_2/sym_fw2.h \
+  firmware/dsp56k/bootstrap.bin.ihex \
+    firmware/dsp56k/bootstrap.asm \
+  firmware/keyspan_pda/keyspan_pda.HEX \
+    firmware/keyspan_pda/keyspan_pda.S \
+  firmware/keyspan_pda/xircom_pgs.HEX \
+    firmware/keyspan_pda/xircom_pgs.S \
+; do
+  filetest $f
+done
+
+# Identify the tarball.
+grep -q 'EXTRAVERSION.*-gnu' Makefile ||
+clean_sed "s,^EXTRAVERSION.*,&-gnu$extra,
+" Makefile 'added -gnu to EXTRAVERSION'
+
+grep -q Linux-libre README ||
+clean_sed '
+1,3 s,Linux kernel release.*kernel\.org.*,GNU Linux-libre <http://linux-libre.fsfla.org>,
+2,5 s,Linux version [0-9.]*,GNU Linux-libre,
+1,20 s,\(operating system \)\?Unix,Unix kernel,
+/WHAT IS LINUX/i\
+WHAT IS GNU Linux-libre?\
+\
+  GNU Linux-libre is a Free version of the kernel Linux (see below),\
+  suitable for use with the GNU Operating System in 100% Free\
+  GNU/Linux-libre System Distributions.\
+  http://www.gnu.org/distros/\
+\
+  It removes non-Free components from Linux, that are disguised as\
+  source code or distributed in separate files.  It also disables\
+  run-time requests for non-Free components, shipped separately or as\
+  part of Linux, and documentation pointing to them, so as to avoid\
+  (Free-)baiting users into the trap of non-Free Software.\
+  http://www.fsfla.org/anuncio/2010-11-Linux-2.6.36-libre-debait\
+\
+  Linux-libre started within the gNewSense GNU/Linux distribution.\
+  It was later adopted by Jeff Moe, who coined its name, and in 2008\
+  it became a project maintained by FSF Latin America.  In 2012, it\
+  became part of the GNU Project.\
+\
+  The GNU Linux-libre project takes a minimal-changes approach to\
+  cleaning up Linux, making no effort to substitute components that\
+  need to be removed with functionally equivalent Free ones.\
+  Nevertheless, we encourage and support efforts towards doing so.\
+  http://libreplanet.org/wiki/LinuxLibre:Devices_that_require_non-free_firmware\
+\
+  Our mascot is Freedo, a light-blue penguin that has just come out\
+  of the shower.  Although we like penguins, GNU is a much greater\
+  contribution to the entire system, so its mascot deserves more\
+  promotion.  See our web page for their images.\
+  http://linux-libre.fsfla.org/\
+
+' README 'added blurb about GNU Linux-libre'
+
+# Add reject_firmware and maybe_reject_firmware
+grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h ||
+clean_sed '$i\
+#ifndef _LINUX_LIBRE_FIRMWARE_H\
+#define _LINUX_LIBRE_FIRMWARE_H\
+\
+#include <linux/device.h>\
+\
+#define NONFREE_FIRMWARE "/*(DEBLOBBED)*/"\
+\
+static inline int\
+report_missing_free_firmware(const char *name, const char *what)\
+{\
+	printk(KERN_ERR "%s: Missing Free %s\\n", name,\
+	       what ? what : "firmware");\
+	return -EINVAL;\
+}\
+static inline int\
+reject_firmware(const struct firmware **fw,\
+		const char *name, struct device *device)\
+{\
+	const struct firmware *xfw = NULL;\
+	int retval;\
+	report_missing_free_firmware(dev_name(device), NULL);\
+	retval = request_firmware(&xfw, NONFREE_FIRMWARE, device);\
+	if (!retval)\
+		release_firmware(xfw);\
+	return -EINVAL;\
+}\
+static inline int\
+maybe_reject_firmware(const struct firmware **fw,\
+		      const char *name, struct device *device)\
+{\
+	if (strstr (name, NONFREE_FIRMWARE))\
+		return reject_firmware(fw, name, device);\
+	else\
+		return request_firmware(fw, name, device);\
+}\
+static inline int\
+reject_firmware_direct(const struct firmware **fw,\
+		const char *name, struct device *device)\
+{\
+	const struct firmware *xfw = NULL;\
+	int retval;\
+	report_missing_free_firmware(dev_name(device), NULL);\
+	retval = request_firmware_direct(&xfw, NONFREE_FIRMWARE, device);\
+	if (!retval)\
+		release_firmware(xfw);\
+	return -EINVAL;\
+}\
+static inline void\
+discard_rejected_firmware(const struct firmware *fw, void *context)\
+{\
+	release_firmware(fw);\
+}\
+static inline int\
+reject_firmware_nowait(struct module *module, int uevent,\
+		       const char *name, struct device *device,\
+		       gfp_t gfp, void *context,\
+		       void (*cont)(const struct firmware *fw,\
+				    void *context))\
+{\
+	int retval;\
+	report_missing_free_firmware(dev_name(device), NULL);\
+	retval = request_firmware_nowait(module, uevent, NONFREE_FIRMWARE,\
+					 device, gfp, NULL,\
+					 discard_rejected_firmware);\
+	if (retval)\
+		return retval;\
+	return -EINVAL;\
+}\
+static inline int\
+maybe_reject_firmware_nowait(struct module *module, int uevent,\
+			     const char *name, struct device *device,\
+			     gfp_t gfp, void *context,\
+			     void (*cont)(const struct firmware *fw,\
+					  void *context))\
+{\
+	if (strstr (name, NONFREE_FIRMWARE))\
+		return reject_firmware_nowait(module, uevent, name,\
+					      device, gfp, context, cont);\
+	else\
+		return request_firmware_nowait(module, uevent, name,\
+					       device, gfp, context, cont);\
+}\
+\
+#endif /* _LINUX_LIBRE_FIRMWARE_H */\
+' include/linux/firmware.h 'added non-Free firmware notification support'
+
+grep -q _LINUX_LIBRE_IHEX_FIRMWARE_H include/linux/ihex.h ||
+clean_sed '$i\
+#ifndef _LINUX_LIBRE_IHEX_H\
+#define _LINUX_LIBRE_IHEX_H\
+\
+static inline int\
+maybe_reject_ihex_firmware(const struct firmware **fw,\
+			   const char *name, struct device *device)\
+{\
+	if (strstr (name, NONFREE_FIRMWARE))\
+		return reject_firmware(fw, name, device);\
+	else\
+		return request_ihex_firmware(fw, name, device);\
+}\
+\
+#endif /* _LINUX_LIBRE_IHEX_H */\
+' include/linux/ihex.h 'added non-Free ihex firmware notification support'
+
+########
+# Arch #
+########
+
+# x86
+
+announce MICROCODE_AMD - "AMD microcode patch loading support"
+reject_firmware arch/x86/kernel/cpu/microcode/amd.c
+clean_blob arch/x86/kernel/cpu/microcode/amd.c
+clean_kconfig arch/x86/Kconfig 'MICROCODE_AMD'
+clean_mk CONFIG_MICROCODE_AMD arch/x86/kernel/cpu/microcode/Makefile
+
+announce MICROCODE_AMD_EARLY - "Early load AMD microcode"
+clean_blob arch/x86/kernel/cpu/microcode/amd_early.c
+clean_kconfig arch/x86/Kconfig 'MICROCODE_AMD_EARLY'
+clean_mk CONFIG_MICROCODE_AMD_EARLY arch/x86/kernel/cpu/microcode/Makefile
+
+announce MICROCODE_INTEL - "Intel microcode patch loading support"
+reject_firmware arch/x86/kernel/cpu/microcode/intel.c
+clean_blob arch/x86/kernel/cpu/microcode/intel.c
+clean_kconfig arch/x86/Kconfig 'MICROCODE_INTEL'
+clean_mk CONFIG_MICROCODE_INTEL arch/x86/kernel/cpu/microcode/Makefile
+
+announce MICROCODE_INTEL_EARLY - "Early load Intel microcode"
+clean_blob arch/x86/kernel/cpu/microcode/intel_early.c
+clean_kconfig arch/x86/Kconfig 'MICROCODE_INTEL_EARLY'
+clean_mk CONFIG_MICROCODE_INTEL_EARLY arch/x86/kernel/cpu/microcode/Makefile
+
+announce MICROCODE_EARLY - "Early load microcode"
+clean_blob Documentation/x86/early-microcode.txt
+clean_kconfig arch/x86/Kconfig 'MICROCODE_EARLY'
+clean_mk CONFIG_MICROCODE_EARLY arch/x86/kernel/cpu/microcode/Makefile
+
+# arm
+
+announce IXP4XX_NPE - "IXP4xx Network Processor Engine support"
+reject_firmware arch/arm/mach-ixp4xx/ixp4xx_npe.c
+clean_blob arch/arm/mach-ixp4xx/ixp4xx_npe.c
+clean_blob Documentation/arm/IXP4xx
+clean_kconfig arch/arm/mach-ixp4xx/Kconfig 'ARCH_IXP4XX'
+clean_mk CONFIG_IXP4XX_NPE arch/arm/mach-ixp4xx/Makefile
+
+announce ARCH_NETX - "Hilscher NetX based"
+clean_sed '
+s,\([" ]\)request_firmware(,\1reject_firmware(,
+' arch/arm/mach-netx/xc.c 'disabled non-Free firmware-loading machinery'
+clean_blob arch/arm/mach-netx/xc.c
+clean_blob drivers/net/ethernet/netx-eth.c
+clean_kconfig arch/arm/Kconfig 'ARCH_NETX'
+clean_mk CONFIG_ARCH_NETX arch/arm/Makefile
+
+# mips
+
+# I couldn't figure out where the firmware name actually comes from.
+# If it's from some user-set property, we could reenable it.  -lxo
+announce XRX200_PHY_FW - "XRX200 PHY firmware loader"
+reject_firmware arch/mips/lantiq/xway/xrx200_phy_fw.c
+clean_kconfig arch/mips/lantiq/Kconfig 'XRX200_PHY_FW'
+clean_mk CONFIG_XRX200_PHY_FW arch/mips/lantiq/xway/Makefile
+
+#######
+# ATM #
+#######
+
+announce ATM_AMBASSADOR - "Madge Ambassador, Collage PCI 155 Server"
+reject_firmware drivers/atm/ambassador.c
+clean_blob drivers/atm/ambassador.c
+clean_fw firmware/atmsar11.HEX firmware/atmsar11.fw
+clean_kconfig drivers/atm/Kconfig 'ATM_AMBASSADOR'
+clean_mk CONFIG_ATM_AMBASSADOR drivers/atm/Makefile
+
+announce ATM_FORE200E - "FORE Systems 200E-series"
+reject_firmware drivers/atm/fore200e.c
+clean_blob drivers/atm/fore200e.c
+clean_blob Documentation/networking/fore200e.txt
+clean_blob drivers/atm/.gitignore
+clean_blob Documentation/dontdiff
+clean_kconfig drivers/atm/Kconfig 'ATM_FORE200E'
+clean_mk CONFIG_ATM_FORE200E drivers/atm/Makefile
+
+announce ATM_SOLOS - "Solos ADSL2+ PCI Multiport card driver"
+reject_firmware drivers/atm/solos-pci.c
+clean_blob drivers/atm/solos-pci.c
+clean_kconfig drivers/atm/Kconfig 'ATM_SOLOS'
+clean_mk CONFIG_ATM_SOLOS drivers/atm/Makefile
+
+##########
+# Crypto #
+##########
+
+announce CRYPTO_DEV_QAT_DH895xCC - "Support for Intel(R) DH895xCC"
+clean_blob drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h
+clean_blob drivers/crypto/qat/qat_dh895xcc/adf_drv.c
+clean_kconfig drivers/crypto/qat/Kconfig 'CRYPTO_DEV_QAT_DH895xCC'
+clean_mk CONFIG_CRYPTO_DEV_QAT_DH895xCC drivers/crypto/qat/Makefile
+
+announce CRYPTO_DEV_QAT - "Common bits for Intel(R) QuickAssist Technology"
+reject_firmware drivers/crypto/qat/qat_common/adf_accel_engine.c
+clean_kconfig drivers/crypto/qat/Kconfig 'CRYPTO_DEV_QAT'
+clean_mk CONFIG_CRYPTO_DEV_QAT drivers/crypto/qat/Makefile
+
+########
+# tty #
+########
+
+announce CYCLADES - "Cyclades async mux support"
+reject_firmware drivers/tty/cyclades.c
+clean_blob drivers/tty/cyclades.c
+clean_kconfig drivers/tty/Kconfig 'CYCLADES'
+clean_mk CONFIG_CYCLADES drivers/tty/Makefile
+
+announce ISI - "Multi-Tech multiport card support"
+reject_firmware drivers/tty/isicom.c
+clean_blob drivers/tty/isicom.c
+clean_kconfig drivers/tty/Kconfig 'ISI'
+clean_mk CONFIG_ISI drivers/tty/Makefile
+
+announce MOXA_INTELLIO - "Moxa Intellio support"
+reject_firmware drivers/tty/moxa.c
+clean_blob drivers/tty/moxa.c
+clean_kconfig drivers/tty/Kconfig 'MOXA_INTELLIO'
+clean_mk CONFIG_MOXA_INTELLIO drivers/tty/Makefile
+
+# gpu drm
+
+announce DRM_AST - "AST server chips"
+reject_firmware drivers/gpu/drm/ast/ast_dp501.c
+clean_blob drivers/gpu/drm/ast/ast_dp501.c
+clean_kconfig drivers/gpu/drm/ast/Kconfig 'DRM_AST'
+clean_mk CONFIG_DRM_AST drivers/gpu/drm/ast/Makefile
+
+announce DRM_NOUVEAU - "Nouveau (nVidia) cards"
+reject_firmware drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+clean_blob drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+reject_firmware drivers/gpu/drm/nouveau/core/engine/falcon.c
+clean_blob drivers/gpu/drm/nouveau/core/engine/falcon.c
+reject_firmware drivers/gpu/drm/nouveau/core/engine/xtensa.c
+clean_blob drivers/gpu/drm/nouveau/core/engine/xtensa.c
+clean_kconfig drivers/gpu/drm/nouveau/Kconfig 'DRM_NOUVEAU'
+clean_mk CONFIG_DRM_NOUVEAU drivers/gpu/drm/nouveau/Makefile
+
+announce DRM_MGA - "Matrox g200/g400"
+drop_fw_file firmware/matrox/g200_warp.H16 firmware/matrox/g200_warp.fw
+drop_fw_file firmware/matrox/g400_warp.H16 firmware/matrox/g400_warp.fw
+reject_firmware drivers/gpu/drm/mga/mga_warp.c
+clean_blob drivers/gpu/drm/mga/mga_warp.c
+clean_kconfig drivers/gpu/drm/Kconfig 'DRM_MGA'
+clean_mk CONFIG_DRM_MGA drivers/gpu/drm/Makefile
+
+announce DRM_MSM - "MSM DRM"
+reject_firmware drivers/gpu/drm/msm/adreno/adreno_gpu.c
+clean_blob drivers/gpu/drm/msm/adreno/adreno_gpu.c
+clean_kconfig divers/gpu/drm/msm/Kconfig 'DRM_MSM'
+clean_mk CONFIG_DRM_MSM drivers/gpu/drm/msm/Makefile
+
+announce DRM_R128 - "ATI Rage 128"
+drop_fw_file firmware/r128/r128_cce.bin.ihex firmware/r128/r128_cce.bin
+reject_firmware drivers/gpu/drm/r128/r128_cce.c
+clean_blob drivers/gpu/drm/r128/r128_cce.c
+clean_kconfig drivers/gpu/drm/Kconfig 'DRM_R128'
+clean_mk CONFIG_DRM_R128 drivers/gpu/drm/Makefile
+
+announce DRM_RADEON - "ATI Radeon"
+drop_fw_file firmware/radeon/R100_cp.bin.ihex firmware/radeon/R100_cp.bin
+drop_fw_file firmware/radeon/R200_cp.bin.ihex firmware/radeon/R200_cp.bin
+drop_fw_file firmware/radeon/R300_cp.bin.ihex firmware/radeon/R300_cp.bin
+drop_fw_file firmware/radeon/R420_cp.bin.ihex firmware/radeon/R420_cp.bin
+drop_fw_file firmware/radeon/R520_cp.bin.ihex firmware/radeon/R520_cp.bin
+drop_fw_file firmware/radeon/R600_me.bin.ihex firmware/radeon/R600_me.bin
+drop_fw_file firmware/radeon/R600_pfp.bin.ihex firmware/radeon/R600_pfp.bin
+drop_fw_file firmware/radeon/RS600_cp.bin.ihex firmware/radeon/RS600_cp.bin
+drop_fw_file firmware/radeon/RS690_cp.bin.ihex firmware/radeon/RS690_cp.bin
+drop_fw_file firmware/radeon/RS780_me.bin.ihex firmware/radeon/RS780_me.bin
+drop_fw_file firmware/radeon/RS780_pfp.bin.ihex firmware/radeon/RS780_pfp.bin
+drop_fw_file firmware/radeon/RV610_me.bin.ihex firmware/radeon/RV610_me.bin
+drop_fw_file firmware/radeon/RV610_pfp.bin.ihex firmware/radeon/RV610_pfp.bin
+drop_fw_file firmware/radeon/RV620_me.bin.ihex firmware/radeon/RV620_me.bin
+drop_fw_file firmware/radeon/RV620_pfp.bin.ihex firmware/radeon/RV620_pfp.bin
+drop_fw_file firmware/radeon/RV630_me.bin.ihex firmware/radeon/RV630_me.bin
+drop_fw_file firmware/radeon/RV630_pfp.bin.ihex firmware/radeon/RV630_pfp.bin
+drop_fw_file firmware/radeon/RV635_me.bin.ihex firmware/radeon/RV635_me.bin
+drop_fw_file firmware/radeon/RV635_pfp.bin.ihex firmware/radeon/RV635_pfp.bin
+drop_fw_file firmware/radeon/RV670_me.bin.ihex firmware/radeon/RV670_me.bin
+drop_fw_file firmware/radeon/RV670_pfp.bin.ihex firmware/radeon/RV670_pfp.bin
+drop_fw_file firmware/radeon/RV710_me.bin.ihex firmware/radeon/RV710_me.bin
+drop_fw_file firmware/radeon/RV710_pfp.bin.ihex firmware/radeon/RV710_pfp.bin
+drop_fw_file firmware/radeon/RV730_me.bin.ihex firmware/radeon/RV730_me.bin
+drop_fw_file firmware/radeon/RV730_pfp.bin.ihex firmware/radeon/RV730_pfp.bin
+drop_fw_file firmware/radeon/RV770_me.bin.ihex firmware/radeon/RV770_me.bin
+drop_fw_file firmware/radeon/RV770_pfp.bin.ihex firmware/radeon/RV770_pfp.bin
+reject_firmware drivers/gpu/drm/radeon/radeon_cp.c
+clean_blob drivers/gpu/drm/radeon/radeon_cp.c
+reject_firmware drivers/gpu/drm/radeon/r100.c
+clean_blob drivers/gpu/drm/radeon/r100.c
+reject_firmware drivers/gpu/drm/radeon/r600.c
+clean_blob drivers/gpu/drm/radeon/r600.c
+reject_firmware drivers/gpu/drm/radeon/r600_cp.c
+clean_blob drivers/gpu/drm/radeon/r600_cp.c
+reject_firmware drivers/gpu/drm/radeon/ni.c
+clean_blob drivers/gpu/drm/radeon/ni.c
+reject_firmware drivers/gpu/drm/radeon/si.c
+clean_blob drivers/gpu/drm/radeon/si.c
+reject_firmware drivers/gpu/drm/radeon/cik.c
+clean_blob drivers/gpu/drm/radeon/cik.c
+reject_firmware drivers/gpu/drm/radeon/radeon_uvd.c
+clean_blob drivers/gpu/drm/radeon/radeon_uvd.c
+reject_firmware drivers/gpu/drm/radeon/radeon_vce.c
+clean_blob drivers/gpu/drm/radeon/radeon_vce.c
+clean_kconfig drivers/gpu/drm/Kconfig 'DRM_RADEON'
+clean_mk CONFIG_DRM_RADEON drivers/gpu/drm/Makefile
+
+#######
+# dma #
+#######
+
+announce IMX_SDMA - "i.MX SDMA support"
+reject_firmware drivers/dma/imx-sdma.c
+clean_blob arch/arm/mach-imx/mm-imx25.c
+clean_blob arch/arm/mach-imx/mm-imx3.c
+clean_blob arch/arm/boot/dts/imx25.dtsi
+clean_blob arch/arm/boot/dts/imx35.dtsi
+clean_blob arch/arm/boot/dts/imx50.dtsi
+clean_blob arch/arm/boot/dts/imx51.dtsi
+clean_blob arch/arm/boot/dts/imx53.dtsi
+clean_blob arch/arm/boot/dts/imx53-tx53.dtsi
+clean_blob arch/arm/boot/dts/imx6qdl.dtsi
+clean_blob arch/arm/boot/dts/imx6sl.dtsi
+clean_blob arch/arm/boot/dts/imx6sx.dtsi
+clean_blob Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
+clean_kconfig drivers/dma/Kconfig 'IMX_SDMA'
+clean_mk CONFIG_IMX_SDMA drivers/dma/Makefile
+
+#########
+# Media #
+#########
+
+# media/tuner
+
+announce MEDIA_TUNER_SI2157 - "Silicon Labs Si2157 silicon tuner"
+reject_firmware drivers/media/tuners/si2157.c
+clean_blob drivers/media/tuners/si2157.c
+clean_blob drivers/media/tuners/si2157_priv.h
+clean_kconfig drivers/media/tuners/Kconfig 'MEDIA_TUNER_SI2157'
+clean_mk CONFIG_MEDIA_TUNER_SI2157 drivers/media/tuners/Makefile
+
+announce MEDIA_TUNER_XC2028 - "XCeive xc2028/xc3028 tuners"
+undefault_firmware 'XC\(2028\|3028L\)' \
+  drivers/media/tuners/tuner-xc2028.h \
+  drivers/media/pci/saa7134/saa7134-cards.c \
+  drivers/media/pci/ivtv/ivtv-driver.c \
+  drivers/media/pci/cx18/cx18-driver.c \
+  drivers/media/pci/cx18/cx18-dvb.c \
+  drivers/media/pci/cx23885/cx23885-dvb.c \
+  drivers/media/pci/cx23885/cx23885-video.c \
+  drivers/media/pci/cx88/cx88-dvb.c \
+  drivers/media/pci/cx88/cx88-cards.c \
+  drivers/media/usb/em28xx/em28xx-cards.c \
+  drivers/media/usb/dvb-usb/dib0700_devices.c \
+  drivers/media/usb/dvb-usb/cxusb.c
+reject_firmware drivers/media/tuners/tuner-xc2028.c
+clean_blob drivers/media/tuners/tuner-xc2028.c
+clean_kconfig drivers/media/tuners/Kconfig 'MEDIA_TUNER_XC2028'
+clean_mk CONFIG_MEDIA_TUNER_XC2028 drivers/media/tuners/Makefile
+
+announce VIDEO_TM6000_DVB - "DVB Support for tm6000 based TV cards"
+clean_blob drivers/media/usb/tm6000/tm6000-cards.c
+clean_kconfig drivers/media/usb/tm6000/Kconfig 'VIDEO_TM6000_DVB'
+clean_mk CONFIG_VIDEO_TM6000_DVB drivers/media/usb/tm6000/Makefile
+
+announce MEDIA_TUNER_XC4000 - "Xceive XC4000 silicon tuner"
+undefine_macro "XC4000_DEFAULT_FIRMWARE\(\|_NEW\)" "\"/*(DEBLOBBED)*/\"" \
+  "disabled non-Free firmware" drivers/media/tuners/xc4000.c
+maybe_reject_firmware drivers/media/tuners/xc4000.c
+clean_blob drivers/media/tuners/xc4000.c
+clean_kconfig drivers/media/tuners/Kconfig 'MEDIA_TUNER_XC4000'
+clean_mk CONFIG_MEDIA_TUNER_XC4000 drivers/media/tuners/Makefile
+
+announce MEDIA_TUNER_XC5000 - "Xceive XC5000 silicon tuner"
+undefault_firmware 'XC5000' \
+  drivers/media/usb/cx231xx/cx231xx-cards.c
+reject_firmware drivers/media/tuners/xc5000.c
+clean_blob drivers/media/tuners/xc5000.c
+clean_kconfig drivers/media/tuners/Kconfig 'MEDIA_TUNER_XC5000'
+clean_mk CONFIG_MEDIA_TUNER_XC5000 drivers/media/tuners/Makefile
+
+announce DVB_USB - "Support for various USB DVB devices"
+reject_firmware drivers/media/usb/dvb-usb/dvb-usb-firmware.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB'
+clean_mk CONFIG_DVB_USB drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_V2 - "Support for various USB DVB devices v2"
+reject_firmware drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+clean_kconfig drivers/media/usb/dvb-usb-v2/Kconfig 'DVB_USB_V2'
+clean_mk CONFIG_DVB_USB_V2 drivers/media/usb/dvb-usb-v2/Makefile
+
+announce DVB_B2C2_FLEXCOP - "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
+reject_firmware drivers/media/common/b2c2/flexcop-fe-tuner.c
+
+announce DVB_BT8XX - "BT8xx based PCI cards"
+reject_firmware drivers/media/pci/bt8xx/dvb-bt8xx.c
+
+announce DVB_USB_A800 - "AVerMedia AverTV DVB-T USB 2.0 (A800)"
+clean_blob drivers/media/usb/dvb-usb/a800.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_A800'
+clean_mk CONFIG_DVB_USB_A800 drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_AF9005 - "Afatech AF9005 DVB-T USB1.1 support"
+clean_file drivers/media/usb/dvb-usb/af9005-script.h
+clean_sed '
+s,^	deb_info("load init script\\n");$,	{\n		err("Missing Free init script\\n");\n		return scriptlen = ret = -EINVAL;\n		,;
+' drivers/media/usb/dvb-usb/af9005-fe.c 'report missing Free init script'
+clean_blob drivers/media/usb/dvb-usb/af9005-fe.c
+clean_blob drivers/media/usb/dvb-usb/af9005.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_AF9005'
+clean_mk CONFIG_DVB_USB_AF9005 drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_AF9015 - "Afatech AF9015 DVB-T USB2.0 support"
+clean_blob drivers/media/usb/dvb-usb-v2/af9015.h
+clean_blob drivers/media/usb/dvb-usb-v2/af9015.c
+clean_kconfig drivers/media/usb/dvb-usb-v2/Kconfig 'DVB_USB_AF9015'
+clean_mk CONFIG_DVB_USB_AF9015 drivers/media/usb/dvb-usb-v2/Makefile
+
+announce DVB_USB_AF9035 - "Afatech AF9035 DVB-T USB2.0 support"
+clean_blob drivers/media/usb/dvb-usb-v2/af9035.h
+clean_blob drivers/media/usb/dvb-usb-v2/af9035.c
+clean_kconfig drivers/media/usb/dvb-usb-v2/Kconfig 'DVB_USB_AF9035'
+clean_mk CONFIG_DVB_USB_AF9035 drivers/media/usb/dvb-usb-v2/Makefile
+
+announce DVB_USB_AZ6007 - "Azurewave 6007 and clones DVB-T/C USB2.0 support"
+clean_blob drivers/media/usb/dvb-usb-v2/az6007.c
+clean_kconfig drivers/media/usb/dvb-usb-v2/Kconfig 'DVB_USB_AZ6007'
+clean_mk CONFIG_DVB_USB_AZ6007 drivers/media/usb/dvb-usb-v2/Makefile
+
+announce DVB_USB_AZ6027 - "Azurewave DVB-S/S2 USB2.0 AZ6027 support"
+clean_blob drivers/media/usb/dvb-usb/az6027.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_AZ6027'
+clean_mk CONFIG_DVB_USB_AZ6027 drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_CXUSB - "Conexant USB2.0 hybrid reference design support"
+clean_blob drivers/media/usb/dvb-usb/cxusb.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_CXUSB'
+clean_mk CONFIG_DVB_USB_CXUSB drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_DIB0700 - "DiBcom DiB0700 USB DVB devices"
+reject_firmware drivers/media/usb/dvb-usb/dib0700_devices.c
+clean_blob drivers/media/usb/dvb-usb/dib0700_devices.c
+clean_blob drivers/media/usb/dvb-usb/dib0700_core.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_DIB0700'
+clean_mk CONFIG_DVB_USB_DIB0700 drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_DIBUSB_MB - "DiBcom USB DVB-T devices (based on the DiB3000M-B)"
+clean_blob drivers/media/usb/dvb-usb/dibusb-mb.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_DIBUSB_MB'
+clean_mk CONFIG_DVB_USB_DIBUSB_MB drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_DIBUSB_MC - "DiBcom USB DVB-T devices (based on the DiB3000M-C/P)"
+clean_blob drivers/media/usb/dvb-usb/dibusb-mc.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_DIBUSB_MC'
+clean_mk CONFIG_DVB_USB_DIBUSB_MC drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_DIGITV - "Nebula Electronics uDigiTV DVB-T USB2.0 support"
+clean_blob drivers/media/usb/dvb-usb/digitv.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_DIGITV'
+clean_mk CONFIG_DVB_USB_DIGITV drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_DTT200U - "WideView WT-200U and WT-220U (pen) DVB-T USB2.0 support (Yakumo/Hama/Typhoon/Yuan)"
+clean_blob drivers/media/usb/dvb-usb/dtt200u.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_DTT200U'
+clean_mk CONFIG_DVB_USB_DTT200U drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_DW2102 - "DvbWorld DVB-S/S2 USB2.0 support"
+reject_firmware drivers/media/usb/dvb-usb/dw2102.c
+clean_blob drivers/media/usb/dvb-usb/dw2102.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_DW2102'
+clean_mk CONFIG_DVB_USB_DW2102 drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_EC168 - "E3C EC168 DVB-T USB2.0 support"
+clean_blob drivers/media/usb/dvb-usb-v2/ec168.h
+clean_blob drivers/media/usb/dvb-usb-v2/ec168.c
+clean_kconfig drivers/media/usb/dvb-usb-v2/Kconfig 'DVB_USB_EC168'
+clean_mk CONFIG_DVB_USB_EC168 drivers/media/usb/dvb-usb-v2/Makefile
+
+announce DVB_USB_GP8PSK - "GENPIX 8PSK->USB module support"
+reject_firmware drivers/media/usb/dvb-usb/gp8psk.c
+clean_blob drivers/media/usb/dvb-usb/gp8psk.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_GP8PSK'
+clean_mk CONFIG_DVB_USB_GP8PSK drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_LME2510 - "LME DM04/QQBOX DVB-S USB2.0 support"
+reject_firmware drivers/media/usb/dvb-usb-v2/lmedm04.c
+clean_blob drivers/media/usb/dvb-usb-v2/lmedm04.c
+clean_file Documentation/dvb/lmedm04.txt
+clean_kconfig drivers/media/usb/dvb-usb-v2/Kconfig 'DVB_USB_LME2510'
+clean_mk CONFIG_DVB_USB_LME2510 drivers/media/usb/dvb-usb-v2/Makefile
+
+announce DVB_USB_M920X - "Uli m920x DVB-T USB2.0 support"
+reject_firmware drivers/media/usb/dvb-usb/m920x.c
+clean_blob drivers/media/usb/dvb-usb/m920x.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_M920X'
+clean_mk CONFIG_DVB_USB_M920X drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_NOVA_T_USB2 - "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support"
+clean_blob drivers/media/usb/dvb-usb/nova-t-usb2.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_NOVA_T_USB2'
+clean_mk CONFIG_DVB_USB_NOVA_T_USB2 drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_OPERA1 - "Opera1 DVB-S USB2.0 receiver"
+reject_firmware drivers/media/usb/dvb-usb/opera1.c
+clean_blob drivers/media/usb/dvb-usb/opera1.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_OPERA1'
+clean_mk CONFIG_DVB_USB_OPERA1 drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_TECHNISAT_USB2 - "Technisat DVB-S/S2 USB2.0 support"
+clean_blob drivers/media/usb/dvb-usb/technisat-usb2.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_TECHNISAT_USB2'
+clean_mk CONFIG_DVB_USB_TECHNISAT_USB2 drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_TTUSB2 - "Pinnacle 400e DVB-S USB2.0 support"
+clean_blob drivers/media/usb/dvb-usb/ttusb2.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_TTUSB2'
+clean_mk CONFIG_DVB_USB_TTUSB2 drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_UMT_010 - "HanfTek UMT-010 DVB-T USB2.0 support"
+clean_blob drivers/media/usb/dvb-usb/umt-010.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_UMT_010'
+clean_mk CONFIG_DVB_USB_UMT_010 drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_VP702X - "TwinhanDTV StarBox and clones DVB-S USB2.0 support"
+clean_blob drivers/media/usb/dvb-usb/vp702x.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_VP702X'
+clean_mk CONFIG_DVB_USB_VP702X drivers/media/usb/dvb-usb/Makefile
+
+announce DVB_USB_VP7045 - "TwinhanDTV Alpha/MagicBoxII, DNTV tinyUSB2, Beetle USB2.0 support"
+clean_blob drivers/media/usb/dvb-usb/vp7045.c
+clean_kconfig drivers/media/usb/dvb-usb/Kconfig 'DVB_USB_VP7045'
+clean_mk CONFIG_DVB_USB_VP7045 drivers/media/usb/dvb-usb/Makefile
+
+# dvb/frontends
+
+announce DVB_AF9013 - "Afatech AF9013 demodulator"
+reject_firmware drivers/media/dvb-frontends/af9013.c
+clean_blob drivers/media/dvb-frontends/af9013.c
+clean_blob drivers/media/dvb-frontends/af9013_priv.h
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_AF9013'
+clean_mk CONFIG_DVB_AF9013 drivers/media/dvb-frontends/Makefile
+
+announce DVB_BCM3510 - "Broadcom BCM3510"
+undefault_firmware 'BCM3510' drivers/media/dvb-frontends/bcm3510.c
+reject_firmware drivers/media/dvb-frontends/bcm3510.c
+reject_firmware drivers/media/dvb-frontends/bcm3510.h
+clean_sed '
+/You.ll need a firmware/,/dvb-fe-bcm/d;
+' drivers/media/dvb-frontends/bcm3510.c \
+  "removed non-Free firmware notes"
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_BCM3510'
+clean_mk CONFIG_DVB_BCM3510 drivers/media/dvb-frontends/Makefile
+
+announce DVB_CX24116 - "Conexant CX24116 based"
+undefault_firmware CX24116 drivers/media/dvb-frontends/cx24116.c
+reject_firmware drivers/media/dvb-frontends/cx24116.c
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_CX24116'
+clean_mk CONFIG_DVB_CX24116 drivers/media/dvb-frontends/Makefile
+
+announce DVB_CX24117 - "Conexant CX24117 based"
+undefault_firmware CX24117 drivers/media/dvb-frontends/cx24117.c
+reject_firmware drivers/media/dvb-frontends/cx24117.c
+clean_blob drivers/media/dvb-frontends/cx24117.c
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_CX24117'
+clean_mk CONFIG_DVB_CX24117 drivers/media/dvb-frontends/Makefile
+
+announce DVB_DS3000 - "Montage Tehnology DS3000 based"
+undefault_firmware 'DS3000' \
+  drivers/media/dvb-frontends/ds3000.c
+reject_firmware drivers/media/dvb-frontends/ds3000.c
+clean_blob drivers/media/dvb-frontends/ds3000.c
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_DS3000'
+clean_mk CONFIG_DVB_DS3000 drivers/media/dvb-frontends/Makefile
+
+announce DVB_DRX39XYJ - "Micronas DRX-J demodulator"
+reject_firmware drivers/media/dvb-frontends/drx39xyj/drxj.c
+clean_blob drivers/media/dvb-frontends/drx39xyj/drxj.c
+clean_kconfig drivers/media/dvb-frontends/drx39xyj/Kconfig 'DVB_DRX39XYJ'
+clean_mk CONFIG_DVB_DRX39XYJ drivers/media/dvb-frontends/drx39xyj/Makefile
+
+announce DVB_LGS8GXX - "Legend Silicon LGS8913/LGS8GL5/LGS8GXX DMB-TH demodulator"
+reject_firmware drivers/media/dvb-frontends/lgs8gxx.c
+clean_blob drivers/media/dvb-frontends/lgs8gxx.c
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_LGS8GXX'
+clean_mk CONFIG_DVB_LGS8GXX drivers/media/dvb-frontends/Makefile
+
+announce DVB_M88DS3103 - "Montage M88DS3103"
+reject_firmware drivers/media/dvb-frontends/m88ds3103.c
+clean_blob drivers/media/dvb-frontends/m88ds3103.c
+clean_blob drivers/media/dvb-frontends/m88ds3103_priv.h
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_M88DS3103'
+clean_mk CONFIG_DVB_M88DS3103 drivers/media/dvb-frontends/Makefile
+
+announce DVB_NXT200X - "NxtWave Communications NXT2002/NXT2004 based"
+undefault_firmware 'NXT200[24]' drivers/media/dvb-frontends/nxt200x.c
+reject_firmware drivers/media/dvb-frontends/nxt200x.c
+clean_blob drivers/media/dvb-frontends/nxt200x.c
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_NXT200X'
+clean_mk CONFIG_DVB_NXT200X drivers/media/dvb-frontends/Makefile
+
+announce DVB_OR51132 - "Oren OR51132 based"
+reject_firmware drivers/media/dvb-frontends/or51132.c
+clean_blob drivers/media/dvb-frontends/or51132.c
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_OR51132'
+clean_mk CONFIG_DVB_OR51132 drivers/media/dvb-frontends/Makefile
+
+announce DVB_OR51211 - "Oren OR51211 based"
+undefault_firmware 'OR51211' drivers/media/dvb-frontends/or51211.c
+reject_firmware drivers/media/dvb-frontends/or51211.c
+reject_firmware drivers/media/dvb-frontends/or51211.h
+clean_blob drivers/media/dvb-frontends/or51211.c
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_OR51211'
+clean_mk CONFIG_DVB_OR51211 drivers/media/dvb-frontends/Makefile
+
+announce DVB_SI2165 - "Silicon Labs si2165 based"
+reject_firmware drivers/media/dvb-frontends/si2165.c
+clean_blob drivers/media/dvb-frontends/si2165.c
+clean_blob drivers/media/dvb-frontends/si2165_priv.h
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_SI2165'
+clean_mk CONFIG_DVB_SI2165 drivers/media/dvb-frontends/Makefile
+
+announce DVB_SI2168 - "Silicon Labs Si2168"
+reject_firmware drivers/media/dvb-frontends/si2168.c
+clean_blob drivers/media/dvb-frontends/si2168.c
+clean_blob drivers/media/dvb-frontends/si2168_priv.h
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_SI2168'
+clean_mk CONFIG_DVB_SI2168 drivers/media/dvb-frontends/Makefile
+
+announce DVB_SP8870 - "Spase sp8870"
+undefault_firmware 'SP8870' drivers/media/dvb-frontends/sp8870.c
+reject_firmware drivers/media/dvb-frontends/sp8870.c
+reject_firmware drivers/media/dvb-frontends/sp8870.h
+clean_blob drivers/media/dvb-frontends/sp8870.c
+clean_kconfig drivers/media/dvb-frontends 'DVB_SP8870'
+clean_mk CONFIG_DVB_SP8870 drivers/media/dvb-frontends/Makefile
+
+announce DVB_SP887X - "Spase sp887x based"
+undefault_firmware 'SP887X' drivers/media/dvb-frontends/sp887x.c
+reject_firmware drivers/media/dvb-frontends/sp887x.c
+reject_firmware drivers/media/dvb-frontends/sp887x.h
+clean_blob drivers/media/dvb-frontends/sp887x.c
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_SP887X'
+clean_mk CONFIG_DVB_SP887X drivers/media/dvb-frontends/Makefile
+
+announce DVB_TDA10048 - "Philips TDA10048HN based"
+undefine_macro 'TDA10048_DEFAULT_FIRMWARE_SIZE' 0 \
+  'removed non-Free firmware size' drivers/media/dvb-frontends/tda10048.c
+undefault_firmware 'TDA10048' drivers/media/dvb-frontends/tda10048.c
+reject_firmware drivers/media/dvb-frontends/tda10048.c
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_TDA10048'
+clean_mk CONFIG_DVB_TDA10048 drivers/media/dvb-frontends/Makefile
+
+announce DVB_TDA1004X - "Philips TDA10045H/TDA10046H"
+undefault_firmware 'TDA1004[56]' drivers/media/dvb-frontends/tda1004x.c
+reject_firmware drivers/media/dvb-frontends/tda1004x.c
+reject_firmware drivers/media/dvb-frontends/tda1004x.h
+clean_blob drivers/media/dvb-frontends/tda1004x.c
+clean_kconfig drivers/media/dvb-frontends 'DVB_TDA1004X'
+clean_mk CONFIG_DVB_TDA1004X drivers/media/dvb-frontends/Makefile
+
+announce DVB_TDA10071 - "NXP TDA10071"
+reject_firmware drivers/media/dvb-frontends/tda10071.c
+clean_blob drivers/media/dvb-frontends/tda10071.c
+clean_blob drivers/media/dvb-frontends/tda10071_priv.h
+clean_kconfig drivers/media/dvb-frontends 'DVB_TDA10071'
+clean_mk CONFIG_DVB_TDA10071 drivers/media/dvb-frontends/Makefile
+
+# dvb
+
+announce DVB_AS102 - "Abilis AS102 DVB receiver"
+reject_firmware drivers/staging/media/as102/as102_fw.c
+clean_blob drivers/staging/media/as102/as102_fw.c
+clean_kconfig drivers/staging/media/as102/Kconfig 'DVB_AS102'
+clean_mk CONFIG_DVB_AS102 drivers/staging/media/as102/Makefile
+
+announce DVB_AV7110 - "AV7110 cards"
+reject_firmware drivers/media/pci/ttpci/av7110.c
+clean_blob drivers/media/pci/ttpci/av7110.c
+clean_kconfig drivers/media/pci/ttpci/Kconfig 'DVB_AV7110'
+clean_mk CONFIG_DVB_AV7110 drivers/media/pci/ttpci/Makefile
+
+announce DVB_BUDGET - "Budget cards"
+reject_firmware drivers/media/pci/ttpci/budget.c
+reject_firmware drivers/media/dvb-frontends/tdhd1.h
+
+announce DVB_BUDGET_AV - "Budget cards with analog video inputs"
+reject_firmware drivers/media/pci/ttpci/budget-av.c
+
+announce DVB_BUDGET_CI - "Budget cards with onboard CI connector"
+reject_firmware drivers/media/pci/ttpci/budget-ci.c
+
+announce DVB_DRXD - "Micronas DRXD driver"
+reject_firmware drivers/media/dvb-frontends/drxd_hard.c
+clean_blob drivers/media/dvb-frontends/drxd_hard.c
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_DRXD'
+clean_mk CONFIG_DVB_DRXD drivers/media/dvb-frontends/Makefile
+
+announce DVB_DRXK - "Micronas DRXK based"
+reject_firmware drivers/media/dvb-frontends/drxk_hard.c
+clean_kconfig drivers/media/dvb-frontends/Kconfig 'DVB_DRXK'
+clean_mk CONFIG_DVB_DRXK drivers/media/dvb-frontends/Makefile
+
+announce DVB_NGENE - "Micronas nGene support"
+reject_firmware drivers/media/pci/ngene/ngene-core.c
+clean_blob drivers/media/pci/ngene/ngene-core.c
+clean_kconfig drivers/media/pci/ngene/Kconfig 'DVB_NGENE'
+clean_mk CONFIG_DVB_NGENE drivers/media/pci/ngene/Makefile
+
+announce DVB_PLUTO2 - "Pluto2 cards"
+reject_firmware drivers/media/pci/pluto2/pluto2.c
+
+announce SMS_SIANO_MDTV - "Siano SMS1xxx based MDTV receiver"
+reject_firmware drivers/media/common/siano/smscoreapi.c
+clean_blob drivers/media/common/siano/smscoreapi.c
+clean_blob drivers/media/common/siano/smscoreapi.h
+clean_kconfig drivers/media/common/siano/Kconfig 'SMS_SIANO_MDTV'
+clean_mk CONFIG_SMS_SIANO_MDTV drivers/media/common/siano/Makefile
+
+announce SMS_USB_DRV - "Siano's USB interface support"
+reject_firmware drivers/media/usb/siano/smsusb.c
+clean_blob drivers/media/usb/siano/smsusb.c
+clean_kconfig drivers/media/usb/siano/Kconfig 'SMS_USB_DRV'
+clean_mk CONFIG_SMS_USB_DRV drivers/media/usb/siano/Makefile
+
+announce DVB_TTUSB_BUDGET - "Technotrend/Hauppauge Nova-USB devices"
+drop_fw_file firmware/ttusb-budget/dspbootcode.bin.ihex firmware/ttusb-budget/dspbootcode.bin
+reject_firmware drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
+clean_blob drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
+clean_kconfig drivers/media/usb/ttusb-budget/Kconfig 'DVB_TTUSB_BUDGET'
+clean_mk CONFIG_DVB_TTUSB_BUDGET drivers/media/usb/ttusb-budget/Makefile
+
+announce DVB_TTUSB_DEC - "Technotrend/Hauppauge USB DEC devices"
+reject_firmware drivers/media/usb/ttusb-dec/ttusb_dec.c
+clean_blob drivers/media/usb/ttusb-dec/ttusb_dec.c
+clean_blob Documentation/dvb/ttusb-dec.txt
+clean_kconfig drivers/media/usb/ttusb-dec/Kconfig 'DVB_TTUSB_DEC'
+clean_mk CONFIG_DVB_TTUSB_DEC drivers/media/usb/ttusb-dec/Makefile
+
+# video
+
+announce VIDEO_BT848 - "BT848 Video For Linux"
+reject_firmware drivers/media/pci/bt8xx/bttv-cards.c
+clean_blob drivers/media/pci/bt8xx/bttv-cards.c
+clean_blob Documentation/video4linux/bttv/README
+clean_kconfig drivers/media/pci/bt8xx/Kconfig 'VIDEO_BT848'
+clean_mk CONFIG_VIDEO_BT848 drivers/media/pci/bt8xx/Makefile
+
+announce VIDEO_CODA - "Chips&Media Coda multi-standard codec IP"
+reject_firmware drivers/media/platform/coda.c
+clean_blob drivers/media/platform/coda.c
+clean_kconfig drivers/media/platform/Kconfig 'VIDEO_CODA'
+clean_mk CONFIG_VIDEO_CODA drivers/media/platform/Makefile
+
+announce VIDEO_CPIA2 - "CPiA2 Video For Linux"
+clean_fw firmware/cpia2/stv0672_vp4.bin.ihex firmware/cpia2/stv0672_vp4.bin
+reject_firmware drivers/media/usb/cpia2/cpia2_core.c
+clean_blob drivers/media/usb/cpia2/cpia2_core.c
+clean_kconfig drivers/media/usb/cpia2/Kconfig 'VIDEO_CPIA2'
+clean_mk CONFIG_VIDEO_CPIA2 drivers/media/usb/cpia2/Makefile
+
+announce VIDEO_CX18 - "Conexant cx23418 MPEG encoder support"
+reject_firmware drivers/media/pci/cx18/cx18-av-firmware.c
+reject_firmware drivers/media/pci/cx18/cx18-dvb.c
+reject_firmware drivers/media/pci/cx18/cx18-firmware.c
+clean_blob drivers/media/pci/cx18/cx18-av-firmware.c
+clean_blob drivers/media/pci/cx18/cx18-dvb.c
+clean_blob drivers/media/pci/cx18/cx18-firmware.c
+clean_blob drivers/media/pci/cx18/cx18-driver.c
+clean_kconfig drivers/media/pci/cx18/Kconfig 'VIDEO_CX18'
+clean_mk CONFIG_VIDEO_CX18 drivers/media/pci/cx18/Makefile
+
+announce VIDEO_CX231XX - "Conexant cx231xx USB video capture support"
+reject_firmware drivers/media/usb/cx231xx/cx231xx-417.c
+clean_blob drivers/media/usb/cx231xx/cx231xx-417.c
+clean_kconfig drivers/media/usb/cx231xx/Kconfig 'VIDEO_CX231XX'
+clean_mk CONFIG_VIDEO_CX231XX drivers/media/usb/cx231xx/Makefile
+
+announce VIDEO_CX23885 - "Conexant cx23885 (2388x successor) support"
+reject_firmware drivers/media/pci/cx23885/cx23885-417.c
+clean_blob drivers/media/pci/cx23885/cx23885-417.c
+reject_firmware drivers/media/pci/cx23885/cx23885-cards.c
+clean_blob drivers/media/pci/cx23885/cx23885-cards.c
+clean_blob drivers/media/pci/cx23885/cx23885-video.c
+clean_kconfig drivers/media/pci/cx23885/Kconfig 'VIDEO_CX23885'
+clean_mk CONFIG_VIDEO_CX23885 drivers/media/pci/cx23885/Makefile
+
+announce VIDEO_CX25840 - "Conexant CX2584x audio/video decoders"
+reject_firmware drivers/media/i2c/cx25840/cx25840-firmware.c
+clean_blob drivers/media/i2c/cx25840/cx25840-firmware.c
+clean_kconfig drivers/media/i2c/cx25840/Kconfig 'VIDEO_CX25840'
+clean_mk CONFIG_VIDEO_CX25840 drivers/media/i2c/cx25840/Makefile
+
+announce VIDEO_CX88_BLACKBIRD - "Blackbird MPEG encoder support (cx2388x + cx23416)"
+reject_firmware drivers/media/pci/cx88/cx88-blackbird.c
+clean_kconfig drivers/media/pci/cx88/Kconfig 'VIDEO_CX88_BLACKBIRD'
+clean_mk CONFIG_VIDEO_CX88_BLACKBIRD drivers/media/pci/cx88/Makefile
+
+announce VIDEO_EM28XX_DVB - "DVB/ATSC Support for em28xx based TV cards"
+clean_blob drivers/media/usb/em28xx/em28xx-dvb.c
+clean_kconfig drivers/media/usb/em28xx/Kconfig 'VIDEO_EM28XX_DVB'
+clean_mk CONFIG_VIDEO_EM28XX_DVB drivers/media/usb/em28xx/Makefile
+
+announce VIDEO_EXYNOS4_FIMC_IS - "EXYNOS4x12 FIMC-IS (Imaging Subsystem) driver"
+reject_firmware drivers/media/platform/exynos4-is/fimc-is.c
+clean_blob drivers/media/platform/exynos4-is/fimc-is.h
+clean_kconfig drivers/media/platform/exynos4-is/Kconfig 'VIDEO_EXYNOS4_FIMC_IS'
+clean_mk CONFIG_VIDEO_EXYNOS4_FIMC_IS drivers/media/platform/exynos4-is/Makefile
+
+announce VIDEO_IVTV - "Conexant cx23416/cx23415 MPEG encoder/decoder support"
+reject_firmware drivers/media/pci/ivtv/ivtv-firmware.c
+clean_blob drivers/media/pci/ivtv/ivtv-firmware.c
+clean_kconfig drivers/media/pci/ivtv/Kconfig 'VIDEO_IVTV'
+clean_mk CONFIG_VIDEO_IVTV drivers/media/pci/ivtv/Makefile
+
+announce VIDEO_PVRUSB2 - "Hauppauge WinTV-PVR USB2 support"
+reject_firmware drivers/media/usb/pvrusb2/pvrusb2-hdw.c
+clean_blob drivers/media/usb/pvrusb2/pvrusb2-devattr.c
+clean_kconfig drivers/media/usb/pvrusb2/Kconfig 'VIDEO_PVRUSB2'
+clean_mk CONFIG_VIDEO_PVRUSB2 drivers/media/usb/pvrusb2/Makefile
+
+announce "VIDEO_CX23885, VIDEO_CX88_BLACKBIRD, VIDEO_IVTV, VIDEO_PVRUSB2" - "See above"
+clean_blob include/media/cx2341x.h
+
+announce VIDEO_GO7007 - "Go 7007 support"
+reject_firmware drivers/media/usb/go7007/go7007-driver.c
+clean_blob drivers/media/usb/go7007/go7007-driver.c
+reject_firmware drivers/media/usb/go7007/go7007-fw.c
+clean_blob drivers/media/usb/go7007/go7007-fw.c
+clean_kconfig drivers/media/usb/go7007/Kconfig 'VIDEO_GO7007'
+clean_mk CONFIG_VIDEO_GO7007 drivers/media/usb/go7007/Makefile
+
+announce VIDEO_GO7007_USB_S2250_BOARD - "Sensoray 2250/2251 support"
+reject_firmware drivers/media/usb/go7007/go7007-loader.c
+clean_blob drivers/media/usb/go7007/go7007-loader.c
+clean_kconfig drivers/media/usb/go7007/Kconfig 'VIDEO_GO7007_USB_S2250_BOARD'
+clean_mk CONFIG_VIDEO_GO7007_USB_S2250_BOARD drivers/media/usb/go7007/Makefile
+
+announce VIDEO_SAA7134_DVB - "DVB/ATSC Support for saa7134 based TV cards"
+reject_firmware drivers/media/pci/saa7134/saa7134-dvb.c
+clean_kconfig drivers/media/pci/saa7134/Kconfig 'VIDEO_SAA7134_DVB'
+clean_mk CONFIG_VIDEO_SAA7134_DVB drivers/media/pci/saa7134/Makefile
+
+announce VIDEO_SAA7164 - "NXP SAA7164 support"
+reject_firmware drivers/media/pci/saa7164/saa7164-fw.c
+clean_blob drivers/media/pci/saa7164/saa7164-fw.c
+clean_kconfig drivers/media/pci/saa7164/Kconfig 'VIDEO_SAA7164'
+clean_mk CONFIG_VIDEO_SAA7164 drivers/media/pci/saa7164/Makefile
+
+announce VIDEO_S5C73M3 - "Samsung S5C73M3 sensor support"
+reject_firmware drivers/media/i2c/s5c73m3/s5c73m3-core.c
+clean_blob drivers/media/i2c/s5c73m3/s5c73m3-core.c
+clean_kconfig drivers/media/i2c/Kconfig 'VIDEO_S5C73M3'
+clean_mk CONFIG_VIDEO_S5C73M3 drivers/media/i2c/s5c73m3/Makefile
+
+announce VIDEO_S5K4ECGX - "Samsung S5K4ECGX sensor support"
+reject_firmware drivers/media/i2c/s5k4ecgx.c
+clean_blob drivers/media/i2c/s5k4ecgx.c
+clean_kconfig drivers/media/i2c/Kconfig 'VIDEO_S5K4ECGX'
+clean_mk CONFIG_VIDEO_S5K4ECGX drivers/media/i2c/Makefile
+
+announce VIDEO_S5K5BAF - "Samsung S5K5BAF sensor support"
+reject_firmware drivers/media/i2c/s5k5baf.c
+clean_blob drivers/media/i2c/s5k5baf.c
+clean_kconfig drivers/media/i2c/Kconfig 'VIDEO_S5K5BAF'
+clean_mk CONFIG_VIDEO_S5K5BAF drivers/media/i2c/Makefile
+
+announce VIDEO_SAMSUNG_S5P_MFC - "Samsung S5P MFC 5.1 Video Codec"
+reject_firmware drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
+clean_blob drivers/media/platform/s5p-mfc/s5p_mfc.c
+clean_kconfig drivers/media/platform/Kconfig 'VIDEO_SAMSUNG_S5P_MFC'
+clean_mk CONFIG_VIDEO_SAMSUNG_S5P_MFC drivers/media/platform/s5p-mfc/Makefile
+
+announce VIDEO_TLG2300 - "Telegent TLG2300 USB video capture support"
+reject_firmware drivers/media/usb/tlg2300/pd-main.c
+clean_blob drivers/media/usb/tlg2300/pd-main.c
+clean_kconfig drivers/media/usb/tlg2300/Kconfig 'VIDEO_TLG2300'
+clean_mk CONFIG_VIDEO_TLG2300 drivers/media/usb/tlg2300/Makefile
+
+announce USB_S2255 - "USB Sensoray 2255 video capture device"
+reject_firmware drivers/media/usb/s2255/s2255drv.c
+clean_blob drivers/media/usb/s2255/s2255drv.c
+clean_kconfig drivers/media/usb/Kconfig 'USB_S2255'
+clean_mk CONFIG_USB_S2255 drivers/media/usb/s2255/Makefile
+
+announce USB_GSPCA_VICAM - "USB 3com HomeConnect, AKA vicam"
+drop_fw_file firmware/vicam/firmware.H16 firmware/vicam/firmware.fw
+reject_firmware drivers/media/usb/gspca/vicam.c
+clean_blob drivers/media/usb/gspca/vicam.c
+clean_kconfig drivers/media/usb/gspca/Kconfig 'USB_GSPCA_VICAM'
+clean_mk CONFIG_USB_GSPCA_VICAM drivers/media/usb/gspca/Makefile
+
+announce VIDEO_TI_VPE - "TI VPE (Video Processing Engine) driver"
+reject_firmware drivers/media/platform/ti-vpe/vpdma.c
+clean_blob drivers/media/platform/ti-vpe/vpdma.c
+clean_kconfig drivers/media/platform/Kconfig 'VIDEO_TI_VPE'
+clean_mk CONFIG_VIDEO_TI_VPE drivers/media/platform/ti-vpe/Makefile
+
+# radio
+
+announce RADIO_WL1273 - "Texas Instruments WL1273 I2C FM Radio"
+reject_firmware drivers/media/radio/radio-wl1273.c
+clean_blob drivers/media/radio/radio-wl1273.c
+clean_kconfig drivers/media/radio/Kconfig 'RADIO_WL1273'
+clean_mk CONFIG_RADIO_WL1273 drivers/media/radio/Makefile
+
+announce RADIO_WL128X - "Texas Instruments WL128x FM Radio"
+clean_blob drivers/media/radio/wl128x/fmdrv_common.h
+reject_firmware drivers/media/radio/wl128x/fmdrv_common.c
+clean_blob drivers/media/radio/wl128x/fmdrv_common.c
+clean_kconfig drivers/media/radio/Kconfig 'RADIO_WL128X'
+clean_mk CONFIG_RADIO_WL128X drivers/media/radio/Makefile
+
+#######
+# net #
+#######
+
+announce ACENIC - "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit"
+drop_fw_file firmware/acenic/tg1.bin.ihex firmware/acenic/tg1.bin
+drop_fw_file firmware/acenic/tg2.bin.ihex firmware/acenic/tg2.bin
+reject_firmware drivers/net/ethernet/alteon/acenic.c
+clean_blob drivers/net/ethernet/alteon/acenic.c
+clean_kconfig drivers/net/ethernet/alteon/Kconfig 'ACENIC'
+clean_mk CONFIG_ACENIC drivers/net/ethernet/alteon/Makefile
+
+announce ADAPTEC_STARFIRE - "Adaptec Starfire/DuraLAN support"
+clean_fw firmware/adaptec/starfire_rx.bin.ihex firmware/adaptec/starfire_rx.bin
+clean_fw firmware/adaptec/starfire_tx.bin.ihex firmware/adaptec/starfire_tx.bin
+reject_firmware drivers/net/ethernet/adaptec/starfire.c
+clean_blob drivers/net/ethernet/adaptec/starfire.c
+clean_kconfig drivers/net/ethernet/adaptec/Kconfig 'ADAPTEC_STARFIRE'
+clean_mk CONFIG_ADAPTEC_STARFIRE drivers/net/ethernet/adaptec/Makefile
+
+announce BNA - "Brocade 1010/1020 10Gb Ethernet Driver support"
+clean_blob drivers/net/ethernet/brocade/bna/bnad.c
+clean_blob drivers/net/ethernet/brocade/bna/cna.h
+reject_firmware drivers/net/ethernet/brocade/bna/bnad_ethtool.c
+reject_firmware drivers/net/ethernet/brocade/bna/cna_fwimg.c
+clean_kconfig drivers/net/ethernet/brocade/bna/Kconfig 'BNA'
+clean_mk CONFIG_BNA drivers/net/ethernet/brocade/bna/Makefile
+
+announce BNX2 - "Broadcom NetXtremeII"
+drop_fw_file firmware/bnx2/bnx2-mips-09-6.2.1a.fw.ihex firmware/bnx2/bnx2-mips-09-6.2.1a.fw
+drop_fw_file firmware/bnx2/bnx2-rv2p-09-6.0.17.fw.ihex firmware/bnx2/bnx2-rv2p-09-6.0.17.fw
+drop_fw_file firmware/bnx2/bnx2-rv2p-09ax-6.0.17.fw.ihex firmware/bnx2/bnx2-rv2p-09ax-6.0.17.fw
+drop_fw_file firmware/bnx2/bnx2-mips-06-6.2.1.fw.ihex firmware/bnx2/bnx2-mips-06-6.2.1.fw
+drop_fw_file firmware/bnx2/bnx2-rv2p-06-6.0.15.fw.ihex firmware/bnx2/bnx2-rv2p-06-6.0.15.fw
+reject_firmware drivers/net/ethernet/broadcom/bnx2.c
+clean_blob drivers/net/ethernet/broadcom/bnx2.c
+clean_kconfig drivers/net/ethernet/broadcom/Kconfig 'BNX2'
+clean_mk CONFIG_BNX2 drivers/net/ethernet/broadcom/Makefile
+
+announce BNX2X - "Broadcom NetXtremeII 10Gb support"
+drop_fw_file firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex firmware/bnx2x/bnx2x-e1-6.2.9.0.fw
+drop_fw_file firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw
+drop_fw_file firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex firmware/bnx2x/bnx2x-e2-6.2.9.0.fw
+reject_firmware drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+clean_sed '
+/^#include "bnx2x_init\.h"/,/^$/{
+  /^$/i\
+#define bnx2x_init_block(bp, start, end) \\\
+  return (printk(KERN_ERR "%s: Missing Free firmware\\n", bp->dev->name),\\\
+	  -EINVAL)
+}' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 'report missing Free firmware'
+clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+clean_sed '
+/^int bnx2x_compare_fw_ver/,/^}$/{
+  /^		u32 my_fw = /i\
+		/*(DEBLOBBED)*/
+  /^		u32 my_fw = /,/<< 24);/d;
+  /^		u32 loaded_fw = /,/^$/{
+    /^$/i\
+\
+		u32 my_fw = ~loaded_fw;
+  }
+}' drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 'fail already-loaded test'
+clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+clean_sed '
+/static void bnx2x_init_wr_wb/{
+  i\
+extern void bnx2x_init_wr_wb(struct bnx2x *, u32, const u32 *, u32);
+}' drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h 'declare removed function'
+clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h
+clean_kconfig drivers/net/ethernet/broadcom/Kconfig 'BNX2X'
+clean_mk CONFIG_BNX2X drivers/net/ethernet/broadcom/bnx2x/Makefile
+
+announce CASSINI - "Sun Cassini"
+drop_fw_file firmware/sun/cassini.bin.ihex firmware/sun/cassini.bin
+reject_firmware drivers/net/ethernet/sun/cassini.c
+clean_blob drivers/net/ethernet/sun/cassini.c
+clean_kconfig drivers/net/ethernet/sun/Kconfig 'CASSINI'
+clean_mk CONFIG_CASSINI drivers/net/ethernet/sun/Makefile
+
+announce CHELSIO_T3 - "Chelsio AEL 2005 support"
+drop_fw_file firmware/cxgb3/t3b_psram-1.1.0.bin.ihex firmware/cxgb3/t3b_psram-1.1.0.bin
+drop_fw_file firmware/cxgb3/t3c_psram-1.1.0.bin.ihex firmware/cxgb3/t3c_psram-1.1.0.bin
+drop_fw_file firmware/cxgb3/ael2005_opt_edc.bin.ihex firmware/cxgb3/ael2005_opt_edc.bin
+drop_fw_file firmware/cxgb3/ael2005_twx_edc.bin.ihex firmware/cxgb3/ael2005_twx_edc.bin
+drop_fw_file firmware/cxgb3/ael2020_twx_edc.bin.ihex firmware/cxgb3/ael2020_twx_edc.bin
+reject_firmware drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+clean_blob drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+clean_kconfig drivers/net/ethernet/chelsio/Kconfig 'CHELSIO_T3'
+clean_mk CONFIG_CHELSIO_T3 drivers/net/ethernet/chelsio/cxgb3/Makefile
+
+announce CHELSIO_T4 - "Chelsio Communications T4 Ethernet support"
+reject_firmware drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+clean_blob drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+clean_kconfig drivers/net/ethernet/chelsio/Kconfig 'CHELSIO_T4'
+clean_mk CONFIG_CHELSIO_T4 drivers/net/ethernet/chelsio/cxgb4/Makefile
+
+announce E100 - "Intel PRO/100+"
+drop_fw_file firmware/e100/d101m_ucode.bin.ihex firmware/e100/d101m_ucode.bin
+drop_fw_file firmware/e100/d101s_ucode.bin.ihex firmware/e100/d101s_ucode.bin
+drop_fw_file firmware/e100/d102e_ucode.bin.ihex firmware/e100/d102e_ucode.bin
+reject_firmware drivers/net/ethernet/intel/e100.c
+clean_sed '
+/^static const struct firmware \*e100_\(reject\|request\)_firmware(/,/^}$/{
+  s:^\(.*\)return ERR_PTR(err);$:\1netif_err(nic, probe, nic->netdev, "Proceeding without firmware\\n");\n\1return NULL;:
+}' drivers/net/ethernet/intel/e100.c 'proceed without firmware'
+clean_blob drivers/net/ethernet/intel/e100.c
+clean_kconfig drivers/net/ethernet/intel/Kconfig 'E100'
+clean_mk CONFIG_E100 drivers/net/ethernet/intel/Makefile
+
+announce FT1000_PCMCIA - "Driver for ft1000 pcmcia device."
+clean_file drivers/staging/ft1000/ft1000-pcmcia/ft1000.img
+reject_firmware drivers/staging/ft1000/TODO
+clean_blob drivers/staging/ft1000/ft1000-pcmcia/boot.h
+clean_sed '
+/^static int ft1000_reset_card/,/^}$/ {
+  /card_bootload/i\
+		return /*(DEBLOBBED)*/ false;
+}
+' drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c \
+  'disabled non-Free firmware-loading machinery'
+reject_firmware drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+clean_blob drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+clean_kconfig drivers/staging/ft1000/Kconfig 'FT1000_PCMCIA'
+clean_mk CONFIG_FT1000_PCMCIA drivers/staging/ft1000/Makefile
+
+announce FT1000_USB - "Driver for ft1000 USB devices."
+clean_file drivers/staging/ft1000/ft1000-usb/ft3000.img
+reject_firmware drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+clean_blob drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+clean_kconfig drivers/staging/ft1000/Kconfig 'FT1000_USB'
+clean_mk CONFIG_FT1000_USB drivers/staging/ft1000/Makefile
+
+announce MYRI_SBUS - "MyriCOM Gigabit Ethernet"
+drop_fw_file firmware/myricom/lanai.bin.ihex firmware/myricom/lanai.bin
+
+announce MYRI10GE - "Myricom Myri-10G Ethernet support"
+reject_firmware drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+clean_blob drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+clean_kconfig drivers/net/ethernet/myricom/Kconfig 'MYRI10GE'
+clean_mk CONFIG_MYRI10GE drivers/net/ethernet/myricom/myri10ge/Makefile
+
+announce NETXEN_NIC - "NetXen Multi port (1/10) Gigabit Ethernet NIC"
+reject_firmware drivers/net/ethernet/qlogic/netxen/netxen_nic.h
+reject_firmware drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+reject_firmware drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+clean_blob drivers/net/ethernet/qlogic/netxen/netxen_nic.h
+clean_blob drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+clean_kconfig drivers/net/ethernet/qlogic/Kconfig 'NETXEN_NIC'
+clean_mk CONFIG_NETXEN_NIC drivers/net/ethernet/qlogic/Makefile
+
+announce QLCNIC - "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
+reject_firmware drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+reject_firmware drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+reject_firmware drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
+reject_firmware drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+clean_blob drivers/net/ethernet/qlogic/qlcnic/qlcnic.h
+clean_blob drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h
+clean_blob drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+clean_kconfig drivers/net/ethernet/qlogic/Kconfig 'QLCNIC'
+clean_mk CONFIG_QLCNIC drivers/net/ethernet/qlogic/qlcnic/Makefile
+
+announce R8169 - "Realtek 8169 gigabit ethernet support"
+reject_firmware drivers/net/ethernet/realtek/r8169.c
+clean_blob drivers/net/ethernet/realtek/r8169.c
+clean_kconfig drivers/net/ethernet/realtek/Kconfig R8169
+clean_mk CONFIG_R8169 drivers/net/ethernet/realtek/Makefile
+
+announce SLICOSS - "Alacritech Gigabit IS-NIC cards"
+reject_firmware drivers/staging/slicoss/slicoss.c
+clean_blob drivers/staging/slicoss/slicoss.c
+clean_kconfig drivers/staging/slicoss/Kconfig 'SLICOSS'
+clean_mk CONFIG_SLICOSS drivers/staging/slicoss/Makefile
+
+announce SPIDER_NET - "Spider Gigabit Ethernet driver"
+reject_firmware drivers/net/ethernet/toshiba/spider_net.c
+clean_sed 's,spider_fw\.bin,DEBLOBBED.bin,g' \
+  drivers/net/ethernet/toshiba/spider_net.c 'removed non-Free firmware notes'
+clean_blob drivers/net/ethernet/toshiba/spider_net.c
+clean_blob drivers/net/ethernet/toshiba/spider_net.h
+clean_kconfig drivers/net/ethernet/toshiba/Kconfig 'SPIDER_NET'
+clean_mk CONFIG_SPIDER_NET drivers/net/ethernet/toshiba/Makefile
+
+announce TEHUTI - "Tehuti Networks 10G Ethernet"
+drop_fw_file firmware/tehuti/bdx.bin.ihex firmware/tehuti/bdx.bin
+reject_firmware drivers/net/ethernet/tehuti/tehuti.c
+clean_blob drivers/net/ethernet/tehuti/tehuti.c
+clean_kconfig drivers/net/ethernet/tehuti/Kconfig 'TEHUTI'
+clean_mk CONFIG_TEHUTI drivers/net/ethernet/tehuti/Makefile
+
+announce TIGON3 - "Broadcom Tigon3"
+drop_fw_file firmware/tigon/tg3.bin.ihex firmware/tigon/tg3.bin
+drop_fw_file firmware/tigon/tg3_tso.bin.ihex firmware/tigon/tg3_tso.bin
+drop_fw_file firmware/tigon/tg3_tso5.bin.ihex firmware/tigon/tg3_tso5.bin
+reject_firmware drivers/net/ethernet/broadcom/tg3.c
+clean_blob drivers/net/ethernet/broadcom/tg3.c
+clean_kconfig drivers/net/ethernet/broadcom/Kconfig 'TIGON3'
+clean_mk CONFIG_TIGON3 drivers/net/ethernet/broadcom/Makefile
+
+announce TYPHOON - "3cr990 series Typhoon"
+drop_fw_file firmware/3com/typhoon.bin.ihex firmware/3com/typhoon.bin
+reject_firmware drivers/net/ethernet/3com/typhoon.c
+clean_blob drivers/net/ethernet/3com/typhoon.c
+clean_kconfig drivers/net/ethernet/3com/Kconfig 'TYPHOON'
+clean_mk CONFIG_TYPHOON drivers/net/ethernet/3com/Makefile
+
+announce VXGE - "Exar X3100 Series 10GbE PCIe Server Adapter"
+reject_firmware drivers/net/ethernet/neterion/vxge/vxge-main.c
+clean_blob drivers/net/ethernet/neterion/vxge/vxge-main.c
+clean_kconfig drivers/net/ethernet/neterion/Kconfig 'VXGE'
+clean_mk CONFIG_VXGE drivers/net/ethernet/neterion/vxge/Makefile
+
+# appletalk
+
+announce COPS - "COPS LocalTalk PC"
+clean_sed '
+/sizeof(\(ff\|lt\)drv_code)/{
+  i\
+		printk(KERN_INFO "%s: Missing Free firmware.\\n", dev->name);\
+		return;
+}
+/\(ff\|lt\)drv_code/d;
+' drivers/net/appletalk/cops.c 'report missing Free firmware'
+clean_blob drivers/net/appletalk/cops.c
+clean_file drivers/net/appletalk/cops_ffdrv.h
+clean_file drivers/net/appletalk/cops_ltdrv.h
+clean_kconfig drivers/net/appletalk/Kconfig 'COPS'
+clean_mk CONFIG_COPS drivers/net/appletalk/Makefile
+
+# hamradio
+
+announce YAM - "YAM driver for AX.25"
+drop_fw_file firmware/yam/1200.bin.ihex firmware/yam/1200.bin
+drop_fw_file firmware/yam/9600.bin.ihex firmware/yam/9600.bin
+reject_firmware drivers/net/hamradio/yam.c
+clean_blob drivers/net/hamradio/yam.c
+clean_kconfig drivers/net/hamradio/Kconfig 'YAM'
+clean_mk CONFIG_YAM drivers/net/hamradio/Makefile
+
+# irda
+
+announce USB_IRDA - "IrDA USB dongles"
+reject_firmware drivers/net/irda/irda-usb.c
+clean_blob drivers/net/irda/irda-usb.c
+clean_kconfig drivers/net/irda/Kconfig 'USB_IRDA'
+clean_mk CONFIG_USB_IRDA drivers/net/irda/Makefile
+
+# smsc
+
+announce PCMCIA_SMC91C92 - "SMC 91Cxx PCMCIA"
+drop_fw_file firmware/ositech/Xilinx7OD.bin.ihex firmware/ositech/Xilinx7OD.bin
+reject_firmware drivers/net/ethernet/smsc/smc91c92_cs.c
+clean_blob drivers/net/ethernet/smsc/smc91c92_cs.c
+clean_kconfig drivers/net/ethernet/smsc/Kconfig 'PCMCIA_SMC91C92'
+clean_mk CONFIG_PCMCIA_SMC91C92 drivers/net/ethernet/smsc/Makefile
+
+# near-field communication
+
+announce NFC_WILINK - "Texas Instruments NFC WiLink driver"
+reject_firmware drivers/nfc/nfcwilink.c
+clean_blob drivers/nfc/nfcwilink.c
+clean_kconfig drivers/nfc/Kconfig 'NFC_WILINK'
+clean_mk CONFIG_NFC_WILINK drivers/nfc/Makefile
+
+announce NFC_PN544_I2C - "NFC PN544 i2c support"
+reject_firmware drivers/nfc/pn544/i2c.c
+clean_kconfig drivers/nfs/pn544/Kconfig 'NFC_PN544_I2C'
+clean_mk NFC_PN544_I2C drivers/nfc/pn544/Kconfig
+
+# pcmcia
+
+# CIS files are not software.
+# announce PCCARD - "PCCard (PCMCIA/CardBus) support"
+# reject_firmware drivers/pcmcia/ds.c
+# clean_kconfig drivers/pcmcia/Kconfig 'PCCARD'
+# clean_mk CONFIG_PCCARD drivers/pcmcia/Makefile
+
+announce PCMCIA_3C574 - "3Com 3c574 PCMCIA support"
+# This is not software; it's Free, but GPLed without in-tree sources.
+drop_fw_file firmware/cis/3CCFEM556.cis.ihex firmware/cis/3CCFEM556.cis
+# clean_blob drivers/net/pcmcia/3c574_cs.c
+# clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_3C574'
+# clean_mk CONFIG_PCMCIA_3C574 drivers/net/pcmcia/Makefile
+
+announce PCMCIA_3C589 - "3Com 3c589 PCMCIA support"
+# This is not software; it's Free, but GPLed without in-tree sources.
+drop_fw_file firmware/cis/3CXEM556.cis.ihex firmware/cis/3CXEM556.cis
+# clean_blob drivers/net/pcmcia/3c589_cs.c
+# clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_3C589'
+# clean_mk CONFIG_PCMCIA_3C589 drivers/net/pcmcia/Makefile
+
+announce PCMCIA_PCNET - "NE2000 compatible PCMCIA support"
+# These are not software; they're Free, but GPLed without in-tree sources.
+drop_fw_file firmware/cis/LA-PCM.cis.ihex firmware/cis/LA-PCM.cis
+drop_fw_file firmware/cis/PCMLM28.cis.ihex firmware/cis/PCMLM28.cis
+drop_fw_file firmware/cis/DP83903.cis.ihex firmware/cis/DP83903.cis
+drop_fw_file firmware/cis/NE2K.cis.ihex firmware/cis/NE2K.cis
+drop_fw_file firmware/cis/tamarack.cis.ihex firmware/cis/tamarack.cis
+drop_fw_file firmware/cis/PE-200.cis.ihex firmware/cis/PE-200.cis
+drop_fw_file firmware/cis/PE520.cis.ihex firmware/cis/PE520.cis
+# clean_blob drivers/net/pcmcia/pcnet_cs.c
+# clean_kconfig drivers/net/pcmcia/Kconfig 'PCMCIA_PCNET'
+# clean_mk CONFIG_PCMCIA_PCNET drivers/net/pcmcia/Makefile
+
+# usb
+
+announce USB_KAWETH - "USB KLSI KL5USB101-based ethernet device support"
+drop_fw_file firmware/kaweth/new_code.bin.ihex firmware/kaweth/new_code.bin
+drop_fw_file firmware/kaweth/new_code_fix.bin.ihex firmware/kaweth/new_code_fix.bin
+drop_fw_file firmware/kaweth/trigger_code.bin.ihex firmware/kaweth/trigger_code.bin
+drop_fw_file firmware/kaweth/trigger_code_fix.bin.ihex firmware/kaweth/trigger_code_fix.bin
+reject_firmware drivers/net/usb/kaweth.c
+clean_blob drivers/net/usb/kaweth.c
+clean_kconfig drivers/net/usb/Kconfig 'USB_KAWETH'
+clean_mk CONFIG_USB_KAWETH drivers/net/usb/Makefile
+
+# wireless
+
+announce ATMEL "Atmel at76c50x chipset  802.11b support"
+reject_firmware drivers/net/wireless/atmel.c
+clean_blob drivers/net/wireless/atmel.c
+clean_kconfig drivers/net/wireless/Kconfig 'ATMEL'
+clean_mk CONFIG_ATMEL drivers/net/wireless/Makefile
+
+announce AT76C50X_USB - "Atmel at76c503/at76c505/at76c505a USB cards"
+reject_firmware drivers/net/wireless/at76c50x-usb.c
+clean_blob drivers/net/wireless/at76c50x-usb.c
+clean_kconfig drivers/net/wireless/Kconfig 'AT76C50X_USB'
+clean_mk CONFIG_AT76C50X_USB drivers/net/wireless/Makefile
+
+announce B43 - "Broadcom 43xx wireless support (mac80211 stack)"
+maybe_reject_firmware drivers/net/wireless/b43/main.c
+clean_sed '
+/^static int b43_upload_microcode(/,/^}$/{
+  /	if (dev->fw\.opensource) {$/i\
+	if (!dev->fw.opensource) {\
+		b43err(dev->wl, "Rejected non-Free firmware\\n");\
+		err = -EOPNOTSUPP;\
+		goto error;\
+	}
+}' drivers/net/wireless/b43/main.c 'double-check and reject non-Free firmware'
+# Major portions of firmware filenames not deblobbed.
+clean_blob drivers/net/wireless/b43/main.c
+clean_kconfig drivers/net/wireless/b43/Kconfig 'B43'
+clean_mk CONFIG_B43 drivers/net/wireless/b43/Makefile
+
+announce B43LEGACY - "Broadcom 43xx-legacy wireless support (mac80211 stack)"
+reject_firmware drivers/net/wireless/b43legacy/main.c
+# Major portions of firwmare filenames not deblobbed.
+clean_blob drivers/net/wireless/b43legacy/main.c
+clean_kconfig drivers/net/wireless/b43legacy/Kconfig 'B43LEGACY'
+clean_mk CONFIG_B43LEGACY drivers/net/wireless/b43legacy/Makefile
+
+announce BRCMSMAC - "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"
+reject_firmware drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+clean_blob drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+clean_kconfig drivers/net/wireless/brcm80211/Kconfig 'BRCMSMAC'
+clean_mk CONFIG_BRCMSMAC drivers/net/wireless/brcm80211/Makefile
+
+announce BRCMFMAC - "Broadcom IEEE802.11n embedded FullMAC WLAN driver"
+reject_firmware drivers/net/wireless/brcm80211/brcmfmac/firmware.c
+clean_kconfig drivers/net/wireless/brcm80211/Kconfig 'BRCMFMAC'
+clean_mk CONFIG_BRCMFMAC drivers/net/wireless/brcm80211/brcmfmac/Makefile
+
+announce BRCMFMAC_SDIO - "Broadcom IEEE802.11n SDIO FullMAC WLAN driver"
+clean_blob drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+clean_kconfig drivers/net/wireless/brcm80211/Kconfig 'BRCMFMAC_SDIO'
+clean_mk CONFIG_BRCMFMAC_SDIO drivers/net/wireless/brcm80211/brcmfmac/Makefile
+
+announce BRCMFMAC_USB - "Broadcom IEEE802.11n USB FullMAC WLAN driver"
+clean_blob drivers/net/wireless/brcm80211/brcmfmac/usb.c
+clean_kconfig drivers/net/wireless/brcm80211/Kconfig 'BRCMFMAC_USB'
+clean_mk CONFIG_BRCMFMAC_USB drivers/net/wireless/brcm80211/brcmfmac/Makefile
+
+announce BRCMFMAC_PCIE - "Broadcom IEEE802.11n PCIE FullMAC WLAN driver"
+clean_blob drivers/net/wireless/brcm80211/brcmfmac/pcie.c
+clean_kconfig drivers/net/wireless/brcm80211/Kconfig 'BRCMFMAC_PCIE'
+clean_mk CONFIG_BRCMFMAC_PCIE drivers/net/wireless/brcm80211/brcmfmac/Makefile
+
+announce HERMES - "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"
+reject_firmware drivers/net/wireless/orinoco/fw.c
+clean_blob drivers/net/wireless/orinoco/fw.c
+clean_kconfig drivers/net/wireless/orinoco/Kconfig 'HERMES'
+clean_mk CONFIG_HERMES drivers/net/wireless/orinoco/Makefile
+
+announce ORINOCO_USB - "Agere Orinoco USB support"
+reject_firmware drivers/net/wireless/orinoco/orinoco_usb.c
+clean_blob drivers/net/wireless/orinoco/orinoco_usb.c
+clean_kconfig drivers/net/wireless/orinoco/Kconfig 'ORINOCO_USB'
+clean_mk CONFIG_ORINOCO_USB drivers/net/wireless/orinoco/Makefile
+
+announce IPW2100 - "Intel PRO/Wireless 2100 Network Connection"
+reject_firmware drivers/net/wireless/ipw2x00/ipw2100.c
+clean_blob drivers/net/wireless/ipw2x00/ipw2100.c
+clean_kconfig drivers/net/wireless/Kconfig 'IPW2100'
+clean_mk CONFIG_IPW2100 drivers/net/wireless/ipw2x00/Makefile
+
+announce IPW2200 - "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
+reject_firmware drivers/net/wireless/ipw2x00/ipw2200.c
+clean_blob drivers/net/wireless/ipw2x00/ipw2200.c
+clean_kconfig drivers/net/wireless/Kconfig 'IPW2200'
+clean_mk CONFIG_IPW2200 drivers/net/wireless/ipw2x00/Makefile
+
+announce IWL3945 - "Intel PRO/Wireless 3945ABG/BG Network Connection"
+reject_firmware drivers/net/wireless/iwlegacy/3945-mac.c
+clean_blob drivers/net/wireless/iwlegacy/3945-mac.c
+clean_blob drivers/net/wireless/iwlegacy/3945.h
+clean_kconfig drivers/net/wireless/iwlegacy/Kconfig 'IWL3945'
+clean_mk CONFIG_IWL3945 drivers/net/wireless/iwlegacy/Makefile
+
+announce IWL4965 - "Intel Wireless WiFi 4965AGN"
+reject_firmware drivers/net/wireless/iwlegacy/4965-mac.c
+clean_blob drivers/net/wireless/iwlegacy/4965-mac.c
+clean_blob drivers/net/wireless/iwlegacy/4965.c
+clean_kconfig drivers/net/wireless/iwlegacy/Kconfig 'IWL4965'
+clean_mk CONFIG_IWL4965 drivers/net/wireless/iwlegacy/Makefile
+
+announce IWLWIFI - "Intel Wireless WiFi Next Gen AGN"
+reject_firmware drivers/net/wireless/iwlwifi/iwl-drv.c
+clean_blob drivers/net/wireless/iwlwifi/iwl-drv.c
+clean_kconfig drivers/net/wireless/iwlwifi/Kconfig 'IWLWIFI'
+clean_mk CONFIG_IWLWIFI drivers/net/wireless/iwlwifi/Makefile
+
+announce IWLDVM - "Intel Wireless WiFi DVM Firmware support"
+clean_blob drivers/net/wireless/iwlwifi/iwl-1000.c
+clean_blob drivers/net/wireless/iwlwifi/iwl-2000.c
+clean_blob drivers/net/wireless/iwlwifi/iwl-5000.c
+clean_blob drivers/net/wireless/iwlwifi/iwl-6000.c
+clean_kconfig drivers/net/wireless/iwlwifi/Kconfig 'IWLDVM'
+clean_mk CONFIG_IWLMVM drivers/net/wireless/iwlwifi/Makefile
+
+announce IWLMVM - "Intel Wireless WiFi MVM Firmware support"
+reject_firmware drivers/net/wireless/iwlwifi/mvm/nvm.c
+clean_blob drivers/net/wireless/iwlwifi/iwl-7000.c
+clean_blob drivers/net/wireless/iwlwifi/iwl-8000.c
+clean_kconfig drivers/net/wireless/iwlwifi/Kconfig 'IWLMVM'
+clean_mk CONFIG_IWLMVM drivers/net/wireless/iwlwifi/Makefile
+
+announce LIBERTAS - "Marvell 8xxx Libertas WLAN driver support"
+reject_firmware drivers/net/wireless/libertas/firmware.c
+clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS'
+clean_mk CONFIG_LIBERTAS drivers/net/wireless/libertas/Makefile
+
+announce LIBERTAS_CS - "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
+clean_blob drivers/net/wireless/libertas/if_cs.c
+clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_CS'
+clean_mk CONFIG_LIBERTAS_CS drivers/net/wireless/libertas/Makefile
+
+announce LIBERTAS_SDIO - "Marvell Libertas 8385 and 8686 SDIO 802.11b/g cards"
+clean_blob drivers/net/wireless/libertas/if_sdio.c
+clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_SDIO'
+clean_mk CONFIG_LIBERTAS_SDIO drivers/net/wireless/libertas/Makefile
+
+announce LIBERTAS_SPI - "Marvell Libertas 8686 SPI 802.11b/g cards"
+clean_blob drivers/net/wireless/libertas/if_spi.c
+clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_SPI'
+clean_mk CONFIG_LIBERTAS_SPI drivers/net/wireless/libertas/Makefile
+
+announce LIBERTAS_USB - "Marvell Libertas 8388 USB 802.11b/g cards"
+clean_blob drivers/net/wireless/libertas/if_usb.c
+clean_blob drivers/net/wireless/libertas/README
+clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_USB'
+clean_mk CONFIG_LIBERTAS_USB drivers/net/wireless/libertas/Makefile
+
+announce LIBERTAS_THINFIRM_USB - "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware"
+reject_firmware drivers/net/wireless/libertas_tf/if_usb.c
+clean_blob drivers/net/wireless/libertas_tf/if_usb.c
+clean_kconfig drivers/net/wireless/Kconfig 'LIBERTAS_THINFIRM_USB'
+clean_mk CONFIG_LIBERTAS_THINFIRM_USB drivers/net/wireless/libertas_tf/Makefile
+
+announce MWIFIEX - "Marvell WiFi-Ex Driver"
+clean_blob drivers/net/wireless/mwifiex/README
+reject_firmware drivers/net/wireless/mwifiex/main.c
+clean_kconfig drivers/net/wireless/mwifiex/Kconfig 'MWIFIEX'
+clean_mk CONFIG_MWIFIEX drivers/net/wireless/mwifiex/Makefile
+
+announce MWIFIEX_SDIO - "Marvell WiFi-Ex Driver for SD8787"
+clean_blob drivers/net/wireless/mwifiex/sdio.h
+clean_blob drivers/net/wireless/mwifiex/sdio.c
+clean_kconfig drivers/net/wireless/mwifiex/Kconfig 'MWIFIEX_SDIO'
+clean_mk CONFIG_MWIFIEX_SDIO drivers/net/wireless/mwifiex/Makefile
+
+announce MWIFIEX_PCIE - "Marvell WiFi-Ex Driver for PCI 8766"
+clean_blob drivers/net/wireless/mwifiex/pcie.h
+clean_blob drivers/net/wireless/mwifiex/pcie.c
+clean_kconfig drivers/net/wireless/mwifiex/Kconfig 'MWIFIEX_PCIE'
+clean_mk CONFIG_MWIFIEX_PCIE drivers/net/wireless/mwifiex/Makefile
+
+announce MWIFIEX_USB - "Marvell WiFi-Ex Driver for USB8797"
+clean_blob drivers/net/wireless/mwifiex/usb.h
+clean_blob drivers/net/wireless/mwifiex/usb.c
+clean_kconfig drivers/net/wireless/mwifiex/Kconfig 'MWIFIEX_USB'
+clean_mk CONFIG_MWIFIEX_USB drivers/net/wireless/mwifiex/Makefile
+
+announce MWL8K - "Marvell 88W8xxx PCI/PCIe Wireless support"
+reject_firmware drivers/net/wireless/mwl8k.c
+clean_blob drivers/net/wireless/mwl8k.c
+clean_kconfig drivers/net/wireless/Kconfig 'MWL8K'
+clean_mk CONFIG_MWL8K drivers/net/wireless/Makefile
+
+announce AR5523 - "Atheros AR5523 wireless driver support"
+reject_firmware drivers/net/wireless/ath/ar5523/ar5523.c
+clean_blob drivers/net/wireless/ath/ar5523/ar5523.c
+clean_blob drivers/net/wireless/ath/ar5523/ar5523.h
+clean_kconfig drivers/net/wireless/ath/ar5523/Kconfig 'AR5523'
+clean_mk CONFIG_AR5523 drivers/net/wireless/ath/ar5523/Makefile
+
+announce ATH6KL - "Atheros ath6kl support"
+reject_firmware drivers/net/wireless/ath/ath6kl/init.c
+clean_blob drivers/net/wireless/ath/ath6kl/init.c
+clean_blob drivers/net/wireless/ath/ath6kl/core.h
+clean_kconfig drivers/net/wireless/ath/ath6kl/Kconfig 'ATH6KL'
+clean_mk CONFIG_ATH6KL drivers/net/wireless/ath/ath6kl/Makefile
+
+announce ATH6KL_SDIO - "Atheros ath6kl SDIO support"
+clean_blob drivers/net/wireless/ath/ath6kl/sdio.c
+clean_kconfig drivers/net/wireless/ath/ath6kl/Kconfig 'ATH6KL_SDIO'
+clean_mk CONFIG_ATH6KL_SDIO drivers/net/wireless/ath/ath6kl/Makefile
+
+announce ATH6KL_USB - "Atheros ath6kl USB support"
+clean_blob drivers/net/wireless/ath/ath6kl/usb.c
+clean_kconfig drivers/net/wireless/ath/ath6kl/Kconfig 'ATH6KL_USB'
+clean_mk CONFIG_ATH6KL_USB drivers/net/wireless/ath/ath6kl/Makefile
+
+announce ATH10K - "Atheros 802.11ac wireless cards support"
+reject_firmware drivers/net/wireless/ath/ath10k/core.c
+clean_blob drivers/net/wireless/ath/ath10k/hw.h
+clean_kconfig drivers/net/wireless/ath/ath10k/Kconfig 'ATH10K'
+clean_mk CONFIG_ATH10K drivers/net/wireless/ath/ath10k/Makefile
+
+announce ATH10K_PCI - "Atheros ath10k PCI support"
+clean_blob drivers/net/wireless/ath/ath10k/pci.c
+clean_kconfig drivers/net/wireless/ath/ath10k/Kconfig 'ATH10K_PCI'
+clean_mk CONFIG_ATH10K_PCI drivers/net/wireless/ath/ath10k/Makefile
+
+announce CW1200 - "CW1200 WLAN support"
+reject_firmware drivers/net/wireless/cw1200/fwio.c
+clean_blob drivers/net/wireless/cw1200/fwio.h
+reject_firmware drivers/net/wireless/cw1200/sta.c
+clean_kconfig drivers/net/wireless/cw1200/Kconfig 'CW1200'
+clean_mk CONFIG_CW1200 drivers/net/wireless/cw1200/Makefile
+
+announce CW1200_WLAN_SDIO - "Support SDIO platforms"
+clean_blob drivers/net/wireless/cw1200/cw1200_sdio.c
+clean_kconfig drivers/net/wireless/cw1200/Kconfig 'CW1200_WLAN_SDIO'
+clean_mk CONFIG_CW1200_WLAN_SDIO drivers/net/wireless/cw1200/Makefile
+
+announce PRISM2_USB - "Prism2.5/3 USB driver"
+reject_firmware drivers/staging/wlan-ng/prism2fw.c
+clean_blob drivers/staging/wlan-ng/prism2fw.c
+clean_kconfig drivers/staging/wlan-ng/Kconfig PRISM2_USB
+clean_mk CONFIG_PRISM2_USB drivers/staging/wlan-ng/Makefile
+
+announce P54_PCI - "Prism54 PCI support"
+reject_firmware drivers/net/wireless/p54/p54pci.c
+clean_blob drivers/net/wireless/p54/p54pci.c
+clean_sed 's,3826\.eeprom,DEBLOBBED,g' drivers/net/wireless/p54/Kconfig 'removed blob name'
+clean_kconfig drivers/net/wireless/p54/Kconfig 'P54_PCI'
+clean_mk CONFIG_P54_PCI drivers/net/wireless/p54/Makefile
+
+announce P54_SPI - "Prism54 SPI (stlc45xx) support"
+# There's support for loading custom 3826.eeprom here, with a default
+# eeprom that is clearly pure data.  Without Free 3826.arm, there's
+# little point in trying to retain the ability to load 3826.eeprom, so
+# we drop it altogether.
+reject_firmware drivers/net/wireless/p54/p54spi.c
+clean_blob drivers/net/wireless/p54/p54spi.c
+clean_kconfig drivers/net/wireless/p54/Kconfig 'P54_SPI'
+clean_mk CONFIG_P54_SPI drivers/net/wireless/p54/Makefile
+
+announce P54_USB - "Prism54 USB support"
+reject_firmware drivers/net/wireless/p54/p54usb.c
+clean_blob drivers/net/wireless/p54/p54usb.c
+clean_blob drivers/net/wireless/p54/p54usb.h
+clean_kconfig drivers/net/wireless/p54/Kconfig 'P54_USB'
+clean_mk CONFIG_P54_USB drivers/net/wireless/p54/Makefile
+
+announce PRISM54 - "Intersil Prism GT/Duette/Indigo PCI/Cardbus"
+reject_firmware drivers/net/wireless/prism54/islpci_dev.c
+clean_blob drivers/net/wireless/prism54/islpci_dev.c
+clean_kconfig drivers/net/wireless/Kconfig 'PRISM54'
+clean_mk CONFIG_PRISM54 drivers/net/wireless/prism54/Makefile
+
+announce RSI_91X - "Redpine Signals Inc 91x WLAN driver support"
+clean_blob drivers/net/wireless/rsi/rsi_common.h
+clean_kconfig drivers/net/wireless/rsi/Kconfig 'RSI_91X'
+clean_mk CONFIG_RSI_91X drivers/net/wireless/rsi/Makefile
+
+announce RSI_SDIO - "Redpine Signals SDIO bus support"
+reject_firmware drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
+clean_blob drivers/net/wireless/rsi/rsi_91x_sdio.c
+clean_kconfig drivers/net/wireless/rsi/Kconfig 'RSI_SDIO'
+clean_mk CONFIG_RSI_SDIO drivers/net/wireless/rsi/Makefile
+
+announce RSI_USB - "Redpine Signals USB bus support"
+reject_firmware drivers/net/wireless/rsi/rsi_91x_usb_ops.c
+clean_blob drivers/net/wireless/rsi/rsi_91x_usb.c
+clean_kconfig drivers/net/wireless/rsi/Kconfig 'RSI_USB'
+clean_mk CONFIG_RSI_USB drivers/net/wireless/rsi/Makefile
+
+announce RT2X00_LIB_FIRMWARE - "Ralink driver firmware support"
+reject_firmware drivers/net/wireless/rt2x00/rt2x00firmware.c
+clean_kconfig drivers/net/wireless/rt2x00/Kconfig 'RT2X00_LIB_FIRMWARE'
+clean_mk CONFIG_RT2X00_LIB_FIRMWARE drivers/net/wireless/rt2x00/Makefile
+
+announce RT61PCI - "Ralink rt2501/rt61 (PCI/PCMCIA) support"
+clean_blob drivers/net/wireless/rt2x00/rt61pci.h
+clean_blob drivers/net/wireless/rt2x00/rt61pci.c
+clean_kconfig drivers/net/wireless/rt2x00/Kconfig 'RT61PCI'
+clean_mk CONFIG_RT61PCI drivers/net/wireless/rt2x00/Makefile
+
+announce RT73USB - "Ralink rt2501/rt73 (USB) support"
+clean_blob drivers/net/wireless/rt2x00/rt73usb.h
+clean_blob drivers/net/wireless/rt2x00/rt73usb.c
+clean_kconfig drivers/net/wireless/rt2x00/Kconfig 'RT73USB'
+clean_mk CONFIG_RT73USB drivers/net/wireless/rt2x00/Makefile
+
+announce RT2800PCI - "Ralink rt2800 (PCI/PCMCIA) support"
+clean_blob drivers/net/wireless/rt2x00/rt2800pci.h
+clean_blob drivers/net/wireless/rt2x00/rt2800pci.c
+clean_kconfig drivers/net/wireless/rt2x00/Kconfig RT2800PCI
+clean_mk CONFIG_RT2800PCI drivers/net/wireless/rt2x00/Makefile
+
+announce RT2800USB - "Ralink rt2800 (USB) support"
+clean_blob drivers/net/wireless/rt2x00/rt2800usb.h
+clean_blob drivers/net/wireless/rt2x00/rt2800usb.c
+clean_kconfig drivers/net/wireless/rt2x00/Kconfig RT2800USB
+clean_mk CONFIG_RT2800USB drivers/net/wireless/rt2x00/Makefile
+
+announce RTLWIFI - "Realtek Wireless Network Adapters"
+reject_firmware drivers/net/wireless/rtlwifi/core.c
+clean_kconfig drivers/net/wireless/rtlwifi/Kconfig RTLWIFI
+clean_mk CONFIG_RTLWIFI drivers/net/wireless/rtlwifi/Makefile
+
+announce RTL8188EE - "Realtek RTL8188EE Wireless Network Adapter"
+reject_firmware drivers/net/wireless/rtlwifi/rtl8188ee/sw.c
+clean_blob drivers/net/wireless/rtlwifi/rtl8188ee/sw.c
+clean_kconfig drivers/net/wireless/rtlwifi/Kconfig RTL8188EE
+clean_mk CONFIG_RTL8188EE drivers/net/wireless/rtlwifi/rtl8188ee/Makefile
+
+announce R8188EU - "Realtek RTL8188EU Wireless LAN NIC driver"
+reject_firmware drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+clean_blob drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+clean_blob drivers/staging/rtl8188eu/include/rtl8188e_hal.h
+clean_kconfig drivers/staging/rtl8188eu/Kconfig R8188EU
+clean_mk CONFIG_R8188EU drivers/staging/rtl8188eu/Makefile
+
+announce RTL8192CE - "Realtek RTL8192CE/RTL8188CE Wireless Network Adapter"
+reject_firmware drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+clean_blob drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
+clean_kconfig drivers/net/wireless/rtlwifi/Kconfig RTL8192CE
+clean_mk CONFIG_RTL8192CE drivers/net/wireless/rtlwifi/rtl8192ce/Makefile
+
+announce RTL8192CU - "Realtek RTL8192CU/RTL8188CU USB Wireless Network Adapter"
+reject_firmware drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+clean_blob drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+clean_kconfig drivers/net/wireless/rtlwifi/Kconfig RTL8192CU
+clean_mk CONFIG_RTL8192CU drivers/net/wireless/rtlwifi/rtl8192cu/Makefile
+
+announce RTL8192DE - "Realtek RTL8192DE/RTL8188DE PCIe Wireless Network Adapter"
+reject_firmware drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+clean_blob drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+clean_kconfig drivers/net/wireless/rtlwifi/Kconfig RTL8192DE
+clean_mk CONFIG_RTL8192DE drivers/net/wireless/rtlwifi/rtl8192de/Makefile
+
+announce RTL8192SE - "Realtek RTL8192SE/RTL8191SE PCIe Wireless Network Adapter"
+reject_firmware drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+clean_blob drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+clean_kconfig drivers/net/wireless/rtlwifi/Kconfig RTL8192SE
+clean_mk CONFIG_RTL8192SE drivers/net/wireless/rtlwifi/rtl8192se/Makefile
+
+announce RTL8192E - "RealTek RTL8192E Wireless LAN NIC driver"
+reject_firmware drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
+clean_blob drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h
+clean_blob drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+clean_kconfig drivers/staging/rtl8192e/Kconfig RTL8192E
+clean_mk CONFIG_RTL8192E drivers/staging/rtl8192e/Makefile
+
+announce R8192EE - "RealTek RTL8192EE Wireless Network Adapter"
+reject_firmware drivers/staging/rtl8192ee/rtl8192ee/sw.c
+clean_blob drivers/staging/rtl8192ee/rtl8192ee/sw.c
+clean_kconfig drivers/staging/rtl8192ee/Kconfig R8192EE
+clean_mk CONFIG_R8192EE drivers/staging/rtl8192ee/Makefile
+
+announce RTL8192U - "RealTek RTL8192U Wireless LAN NIC driver"
+reject_firmware drivers/staging/rtl8192u/r819xU_firmware.c
+clean_blob drivers/staging/rtl8192u/r819xU_firmware.c
+clean_kconfig drivers/staging/rtl8192u/Kconfig 'RTL8192U'
+clean_mk CONFIG_RTL8192U drivers/staging/rtl8192u/Makefile
+
+announce R8712U - "RealTek RTL8712U (RTL8192SU) Wireless LAN NIC driver"
+reject_firmware drivers/staging/rtl8712/hal_init.c
+clean_blob drivers/staging/rtl8712/hal_init.c
+clean_kconfig drivers/staging/rtl8712/Kconfig 'R8712U'
+clean_mk CONFIG_R8712U drivers/staging/rtl8712/Makefile
+
+announce RTL8723AE - "Realtek RTL8723AE PCIe Wireless Network Adapter"
+reject_firmware drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
+clean_blob drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
+clean_kconfig drivers/net/wireless/rtlwifi/Kconfig 'RTL8723AE'
+clean_mk CONFIG_RTL8723AE drivers/net/wireless/rtlwifi/rtl8723ae/Makefile
+
+announce R8723AU - "RealTek RTL8723AU Wireless LAN NIC driver"
+reject_firmware drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+clean_blob drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+clean_blob drivers/staging/rtl8723au/os_dep/os_intfs.c
+clean_kconfig drivers/staging/rtl8723au/Kconfig 'R8723AU'
+clean_mk CONFIG_R8723AU drivers/staging/rtl8723au/Makefile
+
+announce RTL8723BE - "Realtek RTL8723BE PCIe Wireless Network Adapter"
+reject_firmware drivers/net/wireless/rtlwifi/rtl8723be/sw.c
+clean_blob drivers/net/wireless/rtlwifi/rtl8723be/sw.c
+clean_kconfig drivers/net/wireless/rtlwifi/Kconfig 'RTL8723BE'
+clean_mk CONFIG_RTL8723BE drivers/net/wireless/rtlwifi/rtl8723be/Makefile
+
+announce R8821AE - "Realtek RTL8821AE Wireless LAN NIC driver"
+reject_firmware drivers/staging/rtl8821ae/rtl8821ae/sw.c
+clean_blob drivers/staging/rtl8821ae/rtl8821ae/sw.c
+clean_kconfig drivers/staging/rtl8821ae/Kconfig 'R8821AE'
+clean_mk CONFIG_R8821AE drivers/staging/rtl8821ae/Makefile
+
+announce VT6656 - "VIA Technologies VT6656 support"
+reject_firmware drivers/staging/vt6656/firmware.c
+clean_blob drivers/staging/vt6656/firmware.c
+clean_kconfig drivers/staging/vt6656/Kconfig 'VT6656'
+clean_mk CONFIG_VT6656 drivers/staging/vt6656/Makefile
+
+announce WL1251 - "TI wl1251 support"
+reject_firmware drivers/net/wireless/ti/wl1251/main.c
+clean_blob drivers/net/wireless/ti/wl1251/main.c
+clean_blob drivers/net/wireless/ti/wl1251/wl1251.h
+clean_kconfig drivers/net/wireless/ti/wl1251/Kconfig 'WL1251'
+clean_mk CONFIG_WL1251 drivers/net/wireless/ti/wl1251/Makefile
+
+announce WL12XX - "TI wl12xx support"
+clean_blob drivers/net/wireless/ti/wl12xx/main.c
+clean_kconfig drivers/net/wireless/ti/wl12xx/Kconfig 'WL12XX'
+clean_mk CONFIG_WL12XX drivers/net/wireless/ti/wl12xx/Makefile
+
+announce WL18XX - "TI wl18xx support"
+reject_firmware drivers/net/wireless/ti/wl18xx/main.c
+clean_blob drivers/net/wireless/ti/wl18xx/main.c
+clean_kconfig drivers/net/wireless/ti/wl18xx/Kconfig 'WL18XX'
+clean_mk CONFIG_WL18XX drivers/net/wireless/ti/wl18xx/Makefile
+
+announce WLCORE - "TI wlcore support"
+reject_firmware drivers/net/wireless/ti/wlcore/main.c
+clean_blob drivers/net/wireless/ti/wlcore/main.c
+clean_blob drivers/net/wireless/ti/wlcore/wlcore_i.h
+clean_kconfig drivers/net/wireless/ti/wlcore/Kconfig 'WLCORE'
+clean_mk CONFIG_WLCORE drivers/net/wireless/ti/wlcore/Makefile
+
+announce USB_ZD1201 - "USB ZD1201 based Wireless device support"
+reject_firmware drivers/net/wireless/zd1201.c
+clean_blob drivers/net/wireless/zd1201.c
+clean_kconfig drivers/net/wireless/Kconfig 'USB_ZD1201'
+clean_mk CONFIG_USB_ZD1201 drivers/net/wireless/Makefile
+
+announce WCN36XX - "Qualcomm Atheros WCN3660/3680 support"
+reject_firmware drivers/net/wireless/ath/wcn36xx/smd.c
+clean_blob drivers/net/wireless/ath/wcn36xx/wcn36xx.h
+clean_blob drivers/net/wireless/ath/wcn36xx/main.c
+clean_kconfig drivers/net/wireless/ath/wcn36xx/Kconfig 'WCN36XX'
+clean_mk CONFIG_WCN36XX drivers/net/wireless/ath/wcn36xx/Makefile
+
+announce ZD1211RW - "ZyDAS ZD1211/ZD1211B USB-wireless support"
+reject_firmware drivers/net/wireless/zd1211rw/zd_usb.c
+clean_blob drivers/net/wireless/zd1211rw/zd_usb.c
+clean_kconfig drivers/net/wireless/zd1211rw/Kconfig 'ZD1211RW'
+clean_mk CONFIG_ZD1211RW drivers/net/wireless/zd1211rw/Makefile
+
+# bluetooth
+
+announce BT_ATH3K - "Atheros firmware download driver"
+reject_firmware drivers/bluetooth/ath3k.c
+clean_blob drivers/bluetooth/ath3k.c
+clean_kconfig drivers/bluetooth/Kconfig 'BT_ATH3K'
+clean_mk CONFIG_BT_ATH3K drivers/bluetooth/Makefile
+
+announce BT_HCIBCM203X - "HCI BCM203x USB driver"
+reject_firmware drivers/bluetooth/bcm203x.c
+clean_blob drivers/bluetooth/bcm203x.c
+clean_kconfig drivers/bluetooth/Kconfig 'BT_HCIBCM203X'
+clean_mk CONFIG_BT_HCIBCM203X drivers/bluetooth/Makefile
+
+announce BT_HCIBFUSB - "HCI BlueFRITZ! USB driver"
+reject_firmware drivers/bluetooth/bfusb.c
+clean_blob drivers/bluetooth/bfusb.c
+clean_kconfig drivers/bluetooth/Kconfig 'BT_HCIBFUSB'
+clean_mk CONFIG_BT_HCIBFUSB drivers/bluetooth/Makefile
+
+announce BT_HCIBT3C - "HCI BT3C (PC Card) driver"
+reject_firmware drivers/bluetooth/bt3c_cs.c
+clean_blob drivers/bluetooth/bt3c_cs.c
+clean_kconfig drivers/bluetooth/Kconfig 'BT_HCIBT3C'
+clean_mk CONFIG_BT_HCIBT3C drivers/bluetooth/Makefile
+
+announce BT_HCIBTUSB - "HCI USB driver"
+reject_firmware drivers/bluetooth/btusb.c
+clean_blob drivers/bluetooth/btusb.c
+clean_kconfig drivers/bluetooth/Kconfig 'BT_HCIBTUSB'
+clean_mk CONFIG_BT_HCIBTUSB drivers/bluetooth/Makefile
+
+announce BT_MRVL_SDIO - "Marvell BT-over-SDIO driver"
+reject_firmware drivers/bluetooth/btmrvl_sdio.c
+clean_blob drivers/bluetooth/btmrvl_sdio.c
+clean_blob Documentation/btmrvl.txt
+clean_kconfig drivers/bluetooth/Kconfig 'BT_MRVL_SDIO'
+clean_mk CONFIG_BT_MRVL_SDIO drivers/bluetooth/Makefile
+
+announce BT_NOKIA_H4P - "HCI driver with H4 Nokia extensions"
+reject_firmware drivers/staging/nokia_h4p/nokia_fw.c
+clean_blob drivers/staging/nokia_h4p/nokia_fw.c
+clean_kconfig drivers/staging/nokia_h4p/Kconfig 'BT_NOKIA_H4P'
+clean_mk CONFIG_BT_NOKIA_H4P drivers/staging/nokia_h4p/Makefile
+
+announce TI_ST - "Texas Instruments shared transport line discipline"
+reject_firmware drivers/misc/ti-st/st_kim.c
+clean_blob drivers/misc/ti-st/st_kim.c
+clean_kconfig drivers/misc/ti-st/Kconfig 'TI_ST'
+clean_mk CONFIG_TI_ST drivers/misc/ti-st/Makefile
+
+# wimax
+
+announce WIMAX_I2400M - "Intel Wireless WiMAX Connection 2400"
+reject_firmware drivers/net/wimax/i2400m/fw.c
+clean_blob drivers/net/wimax/i2400m/usb.c
+clean_blob Documentation/wimax/README.i2400m
+clean_kconfig drivers/net/wimax/i2400m/Kconfig 'WIMAX_I2400M'
+clean_mk CONFIG_WIMAX_I2400M drivers/net/wimax/i2400m/Makefile
+
+announce BCM_WIMAX - "Beceem BCS200/BCS220-3 and BCSM250 wimax support"
+clean_blob drivers/staging/bcm/Macros.h
+# This disables loading of the .cfg file as well, but it's useless without
+# the firmware proper.
+clean_sed '
+/^static \(inline \)\?struct file \*open_firmware_file/,/^}$/ {
+  s,\(flp *= *\)filp_open[^;]*,\1/*(DEBLOBBED)*/(void*)-ENOENT,
+}' drivers/staging/bcm/Misc.c 'disabled non-Free firmware loading machinery'
+clean_kconfig drivers/staging/bcm/Kconfig 'BCM_WIMAX'
+clean_mk CONFIG_BCM_WIMAX drivers/staging/bcm/Makefile
+
+announce WIMAX_GDM72XX_SDIO - "GCT GDM72xx WiMAX support: SDIO interface"
+reject_firmware drivers/staging/gdm72xx/sdio_boot.c
+clean_blob drivers/staging/gdm72xx/sdio_boot.c
+clean_kconfig drivers/staging/gdm72xx/Kconfig 'WIMAX_GDM72XX_SDIO'
+clean_mk CONFIG_WIMAX_GDM72XX_SDIO drivers/staging/gdm72xx/Makefile
+
+announce WIMAX_GDM72XX_USB - "GCT GDM72xx WiMAX support: USB interface"
+reject_firmware drivers/staging/gdm72xx/usb_boot.c
+clean_blob drivers/staging/gdm72xx/usb_boot.c
+clean_kconfig drivers/staging/gdm72xx/Kconfig 'WIMAX_GDM72XX_USB'
+clean_mk CONFIG_WIMAX_GDM72XX_USB drivers/staging/gdm72xx/Makefile
+
+# infiniband
+
+announce INFINIBAND_QIB - "QLogic PCIe HCA support"
+drop_fw_file firmware/qlogic/sd7220.fw.ihex firmware/qlogic/sd7220.fw
+reject_firmware drivers/infiniband/hw/qib/qib_sd7220.c
+clean_blob drivers/infiniband/hw/qib/qib_sd7220.c
+clean_kconfig drivers/infiniband/hw/qib/Kconfig 'INFINIBAND_QIB'
+clean_mk CONFIG_INFINIBAND_QIB drivers/infiniband/hw/qib/Makefile
+
+# CAN
+
+announce CAN_SOFTING - "Softing Gmbh CAN generic support"
+reject_firmware drivers/net/can/softing/softing_fw.c
+clean_kconfig drivers/net/can/softing/Kconfig 'CAN_SOFTING'
+clean_mk CONFIG_CAN_SOFTING drivers/net/can/softing/Makefile
+
+announce CAN_SOFTING_CS - "Softing Gmbh CAN pcmcia cards"
+clean_blob drivers/net/can/softing/softing_cs.c
+clean_blob drivers/net/can/softing/softing_platform.h
+clean_sed '
+/^config CAN_SOFTING_CS$/,${
+  /You need firmware/i\
+	  /*(DEBLOBBED)*/
+  /You need firmware/,/softing-fw.*tar\.gz/d
+}' drivers/net/can/softing/Kconfig 'removed firmware notes'
+clean_kconfig drivers/net/can/softing/Kconfig 'CAN_SOFTING_CS'
+clean_mk CONFIG_CAN_SOFTING_CS drivers/net/can/softing/Makefile
+
+########
+# ISDN #
+########
+
+announce ISDN_DIVAS - "Support Eicon DIVA Server cards"
+clean_blob drivers/isdn/hardware/eicon/cardtype.h
+clean_blob drivers/isdn/hardware/eicon/dsp_defs.h
+clean_kconfig drivers/isdn/hardware/eicon/Kconfig 'ISDN_DIVAS'
+clean_mk CONFIG_ISDN_DIVAS drivers/isdn/hardware/eicon/Makefile
+
+announce MISDN_SPEEDFAX - "Support for Sedlbauer Speedfax+"
+reject_firmware drivers/isdn/hardware/mISDN/speedfax.c
+clean_blob drivers/isdn/hardware/mISDN/speedfax.c
+clean_kconfig drivers/isdn/hardware/mISDN/Kconfig 'MISDN_SPEEDFAX'
+clean_mk CONFIG_MISDN_SPEEDFAX drivers/isdn/hardware/mISDN/Makefile
+
+##########
+# Serial #
+##########
+
+announce DGAP - "Digi EPCA PCI products"
+reject_firmware drivers/staging/dgap/dgap.c
+clean_blob drivers/staging/dgap/dgap.c
+clean_kconfig drivers/staging/dgap/Kconfig 'DGAP'
+clean_mk CONFIG_DGAP drivers/staging/dgap/Makefile
+
+announce SERIAL_8250_CS - "8250/16550 PCMCIA device support"
+# These are not software; they're Free, but GPLed without in-tree sources.
+drop_fw_file firmware/cis/MT5634ZLX.cis.ihex firmware/cis/MT5634ZLX.cis
+drop_fw_file firmware/cis/RS-COM-2P.cis.ihex firmware/cis/RS-COM-2P.cis
+drop_fw_file firmware/cis/COMpad2.cis.ihex firmware/cis/COMpad2.cis
+drop_fw_file firmware/cis/COMpad4.cis.ihex firmware/cis/COMpad4.cis
+# These are not software; they're Free, but GPLed without textual sources.
+# It could be assumed that these binaries *are* sources, since they
+# can be trivially converted back to a textual form, without loss,
+# but we're better off safe than sorry, so remove them from our tree.
+drop_fw_file firmware/cis/SW_555_SER.cis.ihex firmware/cis/SW_555_SER.cis
+drop_fw_file firmware/cis/SW_7xx_SER.cis.ihex firmware/cis/SW_7xx_SER.cis
+drop_fw_file firmware/cis/SW_8xx_SER.cis.ihex firmware/cis/SW_8xx_SER.cis
+# clean_blob drivers/tty/serial/serial_cs.c
+# clean_kconfig drivers/tty/serial/Kconfig 'SERIAL_8250_CS'
+# clean_mk CONFIG_SERIAL_8250_CS drivers/tty/serial/Makefile
+
+announce SERIAL_ICOM - "IBM Multiport Serial Adapter"
+reject_firmware drivers/tty/serial/icom.c
+clean_blob drivers/tty/serial/icom.c
+clean_kconfig drivers/tty/serial/Kconfig 'SERIAL_ICOM'
+clean_mk CONFIG_SERIAL_ICOM drivers/tty/serial/Makefile
+
+announce SERIAL_QE - "Freescale QUICC Engine serial port support"
+reject_firmware drivers/tty/serial/ucc_uart.c
+clean_blob drivers/tty/serial/ucc_uart.c
+clean_kconfig drivers/tty/serial/Kconfig 'SERIAL_QE'
+clean_mk CONFIG_SERIAL_QE drivers/tty/serial/Makefile
+
+announce SERIAL_RP2 - "Comtrol RocketPort EXPRESS/INFINITY support"
+reject_firmware drivers/tty/serial/rp2.c
+clean_blob drivers/tty/serial/rp2.c
+clean_kconfig drivers/tty/serial/Kconfig 'SERIAL_RP2'
+clean_mk CONFIG_SERIAL_RP2 drivers/tty/serial/Makefile
+
+########
+# Leds #
+########
+
+announce LEDS_LP55XX_COMMON - "Common Driver for TI/National LP5521 and LP5523/55231"
+reject_firmware drivers/leds/leds-lp55xx-common.c
+clean_kconfig drivers/leds/Kconfig 'LEDS_LP55XX_COMMON'
+clean_mk CONFIG_LEDS_LP55XX_COMMON drivers/leds/Makefile
+
+announce LEDS_LP5521 - "LED Support for N.S. LP5521 LED driver chip"
+# The blob name is the chip name; no point in deblobbing that.
+# clean_blob drivers/leds/leds-lp5521.c
+clean_kconfig drivers/leds/Kconfig 'LEDS_LP5521'
+clean_mk CONFIG_LEDS_LP5521 drivers/leds/Makefile
+
+announce LEDS_LP5523 - "LED Support for TI/National LP5523/55231 LED driver chip"
+# The blob name is the chip name; no point in deblobbing that.
+# clean_blob drivers/leds/leds-lp5523.c
+clean_kconfig drivers/leds/Kconfig 'LEDS_LP5523'
+clean_mk CONFIG_LEDS_LP5523 drivers/leds/Makefile
+
+#########
+# input #
+#########
+
+announce TOUCHSCREEN_ATMEL_MXT - "Atmel mXT I2C Touchscreen"
+reject_firmware drivers/input/touchscreen/atmel_mxt_ts.c
+clean_blob drivers/input/touchscreen/atmel_mxt_ts.c
+clean_kconfig drivers/input/touchscreen/Kconfig 'TOUCHSCREEN_ATMEL_MXT'
+clean_mk CONFIG_TOUCHSCREEN_ATMEL_MXT drivers/input/touchscreen/Makefile
+
+announce LIRC_ZILOG - "Zilog/Hauppauge IR Transmitter"
+reject_firmware drivers/staging/media/lirc/lirc_zilog.c
+clean_blob drivers/staging/media/lirc/lirc_zilog.c
+clean_kconfig drivers/staging/media/lirc/Kconfig 'LIRC_ZILOG'
+clean_mk CONFIG_LIRC_ZILOG drivers/staging/media/lirc/Makefile
+
+announce INPUT_IMS_PCU - "IMS Passenger Control Unit driver"
+reject_firmware drivers/input/misc/ims-pcu.c
+clean_blob drivers/input/misc/ims-pcu.c
+clean_kconfig drivers/input/misc/Kconfig 'INPUT_IMS_PCU'
+clean_mk CONFIG_INPUT_IMS_PCU drivers/input/misc/Makefile
+
+####################
+# Data acquisition #
+####################
+
+announce COMEDI - "Data acquisition support (comedi)"
+reject_firmware drivers/staging/comedi/drivers.c
+clean_kconfig drivers/staging/comedi/Kconfig 'COMEDI'
+clean_mk CONFIG_COMEDI drivers/staging/comedi/Makefile
+
+announce COMEDI_DAQBOARD2000 - "IOtech DAQboard/2000 support"
+clean_blob drivers/staging/comedi/drivers/daqboard2000.c
+clean_kconfig drivers/staging/comedi/Kconfig 'COMEDI_DAQBOARD2000'
+clean_mk CONFIG_COMEDI_DAQBOARD2000 drivers/staging/comedi/drivers/Makefile
+
+announce COMEDI_JR3_PCI - "JR3/PCI force sensor board support"
+clean_blob drivers/staging/comedi/drivers/jr3_pci.c
+clean_kconfig drivers/staging/comedi/Kconfig 'COMEDI_JR3_PCI'
+clean_mk CONFIG_COMEDI_JR3_PCI drivers/staging/comedi/drivers/Makefile
+
+announce COMEDI_ME_DAQ - "Meilhaus ME-2000i, ME-2600i, ME-3000vm1 support"
+clean_blob drivers/staging/comedi/drivers/me_daq.c
+clean_kconfig drivers/staging/comedi/Kconfig 'COMEDI_ME_DAQ'
+clean_mk CONFIG_COMEDI_ME_DAQ drivers/staging/comedi/drivers/Makefile
+
+announce COMEDI_NI_PCIDIO - "NI PCI-DIO32HS, PCI-6533, PCI-6534 support"
+clean_blob drivers/staging/comedi/drivers/ni_pcidio.c
+clean_kconfig drivers/staging/comedi/Kconfig 'COMEDI_NI_PCIDIO'
+clean_mk CONFIG_COMEDI_NI_PCIDIO drivers/staging/comedi/drivers/Makefile
+
+announce COMEDI_USBDUX - "ITL USBDUX support"
+clean_blob drivers/staging/comedi/drivers/usbdux.c
+clean_kconfig drivers/staging/comedi/Kconfig 'COMEDI_USBDUX'
+clean_mk CONFIG_COMEDI_USBDUX drivers/staging/comedi/drivers/Makefile
+
+announce COMEDI_USBDUXFAST - "ITL USB-DUXfast support"
+clean_blob drivers/staging/comedi/drivers/usbduxfast.c
+clean_kconfig drivers/staging/comedi/Kconfig 'COMEDI_USBDUXFAST'
+clean_mk CONFIG_COMEDI_USBDUXFAST drivers/staging/comedi/drivers/Makefile
+
+announce COMEDI_USBDUXSIGMA - "ITL USB-DUXsigma support"
+clean_blob drivers/staging/comedi/drivers/usbduxsigma.c
+clean_kconfig drivers/staging/comedi/Kconfig 'COMEDI_USBDUXSIGMA'
+clean_mk CONFIG_COMEDI_USBDUXSIGMA drivers/staging/comedi/drivers/Makefile
+
+
+#######
+# MMC #
+#######
+
+announce MMC_VUB300 - "VUB300 USB to SDIO/SD/MMC Host Controller support"
+clean_sed '
+/^config MMC_VUB300/,/^config /{
+  /Some SDIO cards/i\
+	  /*(DEBLOBBED)*/
+  /Some SDIO cards/,/obtainable data rate\.$/d
+}
+' drivers/mmc/host/Kconfig "removed firmware notes"
+reject_firmware drivers/mmc/host/vub300.c
+clean_blob drivers/mmc/host/vub300.c
+clean_kconfig drivers/mmc/host/Kconfig 'MMC_VUB300'
+clean_mk CONFIG_MMC_VUB300 drivers/mmc/host/Makefile
+
+########
+# SCSI #
+########
+
+announce SCSI_QLOGICPTI - "PTI Qlogic, ISP Driver"
+drop_fw_file firmware/qlogic/isp1000.bin.ihex firmware/qlogic/isp1000.bin
+reject_firmware drivers/scsi/qlogicpti.c
+clean_blob drivers/scsi/qlogicpti.c
+clean_kconfig drivers/scsi/Kconfig 'SCSI_QLOGICPTI'
+clean_mk CONFIG_SCSI_QLOGICPTI drivers/scsi/Makefile
+
+announce SCSI_ADVANSYS - "AdvanSys SCSI"
+drop_fw_file firmware/advansys/mcode.bin.ihex firmware/advansys/mcode.bin
+drop_fw_file firmware/advansys/3550.bin.ihex firmware/advansys/3550.bin
+drop_fw_file firmware/advansys/38C0800.bin.ihex firmware/advansys/38C0800.bin
+drop_fw_file firmware/advansys/38C1600.bin.ihex firmware/advansys/38C1600.bin
+reject_firmware drivers/scsi/advansys.c
+clean_blob drivers/scsi/advansys.c
+clean_kconfig drivers/scsi/Kconfig 'SCSI_ADVANSYS'
+clean_mk CONFIG_SCSI_ADVANSYS drivers/scsi/Makefile
+
+announce SCSI_QLOGIC_1280 - "Qlogic QLA 1240/1x80/1x160 SCSI"
+drop_fw_file firmware/qlogic/1040.bin.ihex firmware/qlogic/1040.bin
+drop_fw_file firmware/qlogic/1280.bin.ihex firmware/qlogic/1280.bin
+drop_fw_file firmware/qlogic/12160.bin.ihex firmware/qlogic/12160.bin
+reject_firmware drivers/scsi/qla1280.c
+clean_blob drivers/scsi/qla1280.c
+clean_kconfig drivers/scsi/Kconfig 'SCSI_QLOGIC_1280'
+clean_mk CONFIG_SCSI_QLOGIC_1280 drivers/scsi/Makefile
+
+announce SCSI_AIC94XX - "Adaptec AIC94xx SAS/SATA support"
+reject_firmware drivers/scsi/aic94xx/aic94xx_seq.c
+clean_blob drivers/scsi/aic94xx/aic94xx_seq.c
+clean_blob drivers/scsi/aic94xx/aic94xx_seq.h
+clean_kconfig drivers/scsi/aic94xx/Kconfig 'SCSI_AIC94XX'
+clean_mk CONFIG_SCSI_AIC94XX drivers/scsi/aic94xx/Makefile
+
+announce SCSI_BFA_FC - "Brocade BFA Fibre Channel Support"
+reject_firmware drivers/scsi/bfa/bfad.c
+clean_blob drivers/scsi/bfa/bfad.c
+clean_kconfig drivers/scsi/Kconfig 'SCSI_BFA_FC'
+clean_mk CONFIG_SCSI_BFA_FC drivers/scsi/bfa/Makefile
+
+announce SCSI_CHELSIO_FCOE - "Chelsio Communications FCoE support"
+reject_firmware drivers/scsi/csiostor/csio_hw.c
+clean_blob drivers/scsi/csiostor/csio_hw_chip.h
+clean_blob drivers/scsi/csiostor/csio_init.c
+clean_kconfig drivers/scsi/csiostor/Kconfig 'SCSI_CHELSIO_FCOE'
+clean_mk CONFIG_SCSI_CHELSIO_FCOE drivers/scsi/csiostor/Makefile
+
+announce SCSI_LPFC - "Emulex LightPulse Fibre Channel Support"
+# The firmware name is built out of Vital Product Data read from the
+# adapter.  The firmware is definitely code, and I couldn't find
+# evidence it is Free, so I'm disabling it.  It's not clear whether
+# this is the hardware or the software inducing to the installation of
+# non-Free firmware.
+reject_firmware drivers/scsi/lpfc/lpfc.h
+reject_firmware drivers/scsi/lpfc/lpfc_crtn.h
+reject_firmware drivers/scsi/lpfc/lpfc_init.c
+reject_firmware drivers/scsi/lpfc/lpfc_attr.c
+clean_kconfig drivers/scsi/Kconfig 'SCSI_LPFC'
+clean_mk CONFIG_SCSI_LPFC drivers/scsi/lpfc/Makefile
+
+announce SCSI_QLA_FC - "QLogic QLA2XXX Fibre Channel Support"
+reject_firmware drivers/scsi/qla2xxx/qla_gbl.h
+reject_firmware drivers/scsi/qla2xxx/qla_init.c
+reject_firmware drivers/scsi/qla2xxx/qla_os.c
+reject_firmware drivers/scsi/qla2xxx/qla_nx.c
+clean_sed '
+/^config SCSI_QLA_FC$/,/^config /{
+  /^	By default, firmware/i\
+	/*(DEBLOBBED)*/
+  /^	By default, firmware/,/ftp:[/][/].*firmware[/]/d
+}' drivers/scsi/qla2xxx/Kconfig 'removed firmware notes'
+clean_blob drivers/scsi/qla2xxx/qla_os.c
+clean_kconfig drivers/scsi/qla2xxx/Kconfig 'SCSI_QLA_FC'
+clean_mk CONFIG_SCSI_QLA_FC drivers/scsi/qla2xxx/Makefile
+
+
+#######
+# USB #
+#######
+
+# atm
+
+announce USB_CXACRU - "Conexant AccessRunner USB support"
+reject_firmware drivers/usb/atm/cxacru.c
+clean_blob drivers/usb/atm/cxacru.c
+clean_kconfig drivers/usb/atm/Kconfig 'USB_CXACRU'
+clean_mk CONFIG_USB_CXACRU drivers/usb/atm/Makefile
+
+announce USB_SPEEDTOUCH - "Speedtouch USB support"
+reject_firmware drivers/usb/atm/speedtch.c
+clean_blob drivers/usb/atm/speedtch.c
+clean_kconfig drivers/usb/atm/Kconfig 'USB_SPEEDTOUCH'
+clean_mk CONFIG_USB_SPEEDTOUCH drivers/usb/atm/Makefile
+
+announce USB_UEAGLEATM - "ADI 930 and eagle USB DSL modem"
+reject_firmware drivers/usb/atm/ueagle-atm.c
+clean_blob drivers/usb/atm/ueagle-atm.c
+clean_kconfig drivers/usb/atm/Kconfig 'USB_UEAGLEATM'
+clean_mk CONFIG_USB_UEAGLEATM drivers/usb/atm/Makefile
+
+# host
+
+announce USB_XHCI_RCAR - "xHCI support for Renesas R-Car SoCs"
+reject_firmware drivers/usb/host/xhci-rcar.c
+clean_blob drivers/usb/host/xhci-rcar.c
+clean_kconfig drivers/usb/host/Kconfig 'USB_XHCI_RCAR'
+clean_mk CONFIG_USB_XHCI_RCAR drivers/usb/host/Makefile
+
+# misc
+
+announce USB_EMI26 - "EMI 2|6 USB Audio interface"
+# These files are not under the GPL, better remove them all.
+drop_fw_file firmware/emi26/bitstream.HEX firmware/emi26/bitstream.fw
+drop_fw_file firmware/emi26/firmware.HEX firmware/emi26/firmware.fw
+drop_fw_file firmware/emi26/loader.HEX firmware/emi26/loader.fw
+reject_firmware drivers/usb/misc/emi26.c
+clean_blob drivers/usb/misc/emi26.c
+clean_kconfig drivers/usb/misc/Kconfig 'USB_EMI26'
+clean_mk CONFIG_USB_EMI26 drivers/usb/misc/Makefile
+
+announce USB_EMI62 - "EMI 6|2m USB Audio interface"
+# These files are probably not under the GPL, better remove them all.
+drop_fw_file firmware/emi62/bitstream.HEX firmware/emi62/bitstream.fw
+drop_fw_file firmware/emi62/loader.HEX firmware/emi62/loader.fw
+drop_fw_file firmware/emi62/midi.HEX firmware/emi62/midi.fw
+drop_fw_file firmware/emi62/spdif.HEX firmware/emi62/spdif.fw
+reject_firmware drivers/usb/misc/emi62.c
+clean_blob drivers/usb/misc/emi62.c
+clean_kconfig drivers/usb/misc/Kconfig 'USB_EMI62'
+clean_mk CONFIG_USB_EMI62 drivers/usb/misc/Makefile
+
+announce USB_EZUSB_FX2 - "Functions for loading firmware on EZUSB chips"
+maybe_reject_firmware drivers/usb/misc/ezusb.c
+
+announce USB_ISIGHTFW - "iSight firmware loading support"
+reject_firmware drivers/usb/misc/isight_firmware.c
+clean_blob drivers/usb/misc/isight_firmware.c
+clean_kconfig drivers/usb/misc/Kconfig 'USB_ISIGHTFW'
+clean_mk CONFIG_USB_ISIGHTFW drivers/usb/misc/Makefile
+
+# storage
+
+announce USB_STORAGE_ENE_UB6250 - "USB ENE card reader support"
+reject_firmware drivers/usb/storage/ene_ub6250.c
+clean_blob drivers/usb/storage/ene_ub6250.c
+clean_kconfig drivers/usb/storage/Kconfig 'USB_STORAGE_ENE_UB6250'
+clean_mk 'CONFIG_USB_STORAGE_ENE_UB6250' drivers/usb/storage/Makefile
+
+# serial
+
+announce USB_SERIAL_KEYSPAN - "USB Keyspan USA-xxx Serial Driver"
+drop_fw_file firmware/keyspan/mpr.HEX firmware/keyspan/mpr.fw
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_MPR'
+drop_fw_file firmware/keyspan/usa18x.HEX firmware/keyspan/usa18x.fw
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA18X'
+drop_fw_file firmware/keyspan/usa19.HEX firmware/keyspan/usa19.fw
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19'
+drop_fw_file firmware/keyspan/usa19qi.HEX firmware/keyspan/usa19qi.fw
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QI'
+drop_fw_file firmware/keyspan/usa19qw.HEX firmware/keyspan/usa19qw.fw
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19QW'
+drop_fw_file firmware/keyspan/usa19w.HEX firmware/keyspan/usa19w.fw
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA19W'
+drop_fw_file firmware/keyspan/usa28.HEX firmware/keyspan/usa28.fw
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28'
+drop_fw_file firmware/keyspan/usa28xa.HEX firmware/keyspan/usa28xa.fw
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XA'
+drop_fw_file firmware/keyspan/usa28xb.HEX firmware/keyspan/usa28xb.fw
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28XB'
+drop_fw_file firmware/keyspan/usa28x.HEX firmware/keyspan/usa28x.fw
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA28X'
+drop_fw_file firmware/keyspan/usa49w.HEX firmware/keyspan/usa49w.fw
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49W'
+drop_fw_file firmware/keyspan/usa49wlc.HEX firmware/keyspan/usa49wlc.fw
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN_USA49WLC'
+clean_blob drivers/usb/serial/keyspan.c
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_KEYSPAN'
+clean_mk CONFIG_USB_SERIAL_KEYSPAN drivers/usb/serial/Makefile
+
+announce USB_SERIAL_EDGEPORT - "USB Inside Out Edgeport Serial Driver"
+clean_fw firmware/edgeport/boot.H16 firmware/edgeport/boot.fw
+clean_fw firmware/edgeport/boot2.H16 firmware/edgeport/boot2.fw
+clean_fw firmware/edgeport/down.H16 firmware/edgeport/down.fw
+clean_fw firmware/edgeport/down2.H16 firmware/edgeport/down2.fw
+reject_firmware drivers/usb/serial/io_edgeport.c
+clean_blob drivers/usb/serial/io_edgeport.c
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT'
+clean_mk CONFIG_USB_SERIAL_EDGEPORT drivers/usb/serial/Makefile
+
+announce USB_SERIAL_EDGEPORT_TI - "USB Inside Out Edgeport Serial Driver (TI devices)"
+clean_fw firmware/edgeport/down3.bin.ihex firmware/edgeport/down3.bin
+reject_firmware drivers/usb/serial/io_ti.c
+clean_blob drivers/usb/serial/io_ti.c
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_EDGEPORT_TI'
+clean_mk CONFIG_USB_SERIAL_EDGEPORT_TI drivers/usb/serial/Makefile
+
+announce USB_SERIAL_MXUPORT - "USB Moxa UPORT Serial Driver"
+reject_firmware drivers/usb/serial/mxuport.c
+clean_blob drivers/usb/serial/mxuport.c
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_MXUPORT'
+clean_mk CONFIG_USB_SERIAL_MXUPORT drivers/usb/serial/Makefile
+
+announce USB_SERIAL_TI - "USB TI 3410/5052 Serial Driver"
+drop_fw_file firmware/ti_3410.fw.ihex firmware/ti_3410.fw
+drop_fw_file firmware/ti_5052.fw.ihex firmware/ti_5052.fw
+drop_fw_file firmware/mts_cdma.fw.ihex firmware/mts_cdma.fw
+drop_fw_file firmware/mts_gsm.fw.ihex firmware/mts_gsm.fw
+drop_fw_file firmware/mts_edge.fw.ihex firmware/mts_edge.fw
+reject_firmware drivers/usb/serial/ti_usb_3410_5052.c
+clean_blob drivers/usb/serial/ti_usb_3410_5052.c
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_TI'
+clean_mk CONFIG_USB_SERIAL_TI drivers/usb/serial/Makefile
+
+announce USB_SERIAL_WHITEHEAT - "USB ConnectTech WhiteHEAT Serial Driver"
+clean_fw firmware/whiteheat.HEX firmware/whiteheat.fw
+clean_fw firmware/whiteheat_loader.HEX firmware/whiteheat_loader.fw
+clean_fw firmware/whiteheat_loader_debug.HEX firmware/whiteheat_loader_debug.fw
+clean_blob drivers/usb/serial/whiteheat.c
+clean_kconfig drivers/usb/serial/Kconfig 'USB_SERIAL_WHITEHEAT'
+clean_mk CONFIG_USB_SERIAL_WHITEHEAT drivers/usb/serial/Makefile
+
+# uwb
+
+announce UWB_I1480U - Support for Intel Wireless UWB Link 1480 HWA
+reject_firmware drivers/uwb/i1480/dfu/i1480-dfu.h
+reject_firmware drivers/uwb/i1480/dfu/mac.c
+reject_firmware drivers/uwb/i1480/dfu/phy.c
+clean_blob drivers/uwb/i1480/dfu/usb.c
+clean_kconfig drivers/uwb/Kconfig 'UWB_I1480U'
+clean_mk CONFIG_UWB_I1480U drivers/uwb/i1480/dfu/Makefile
+
+
+
+################
+# Programmable #
+################
+
+announce LATTICE_ECP3_CONFIG - "Lattice ECP3 FPGA bitstrap configuration via SPI"
+reject_firmware drivers/misc/lattice-ecp3-config.c
+clean_blob drivers/misc/lattice-ecp3-config.c
+clean_kconfig drivers/misc/Kconfig 'LATTICE_ECP3_CONFIG'
+clean_mk CONFIG_LATTICE_ECP3_CONFIG drivers/misc/Makefile
+
+announce STE_MODEM_RPROC - "STE-Modem remoteproc support"
+maybe_reject_firmware drivers/remoteproc/remoteproc_core.c
+undefine_macro SPROC_MODEM_FIRMWARE "\"/*(DEBLOBBED)*/\"" \
+  "disabled non-Free firmware" drivers/remoteproc/ste_modem_rproc.c
+clean_kconfig drivers/remoteproc/Kconfig 'STE_MODEM_RPROC'
+clean_mk CONFIG_STE_MODEM_RPROC drivers/remoteproc/Makefile
+
+
+#########
+# Sound #
+#########
+
+announce SND_ASIHPI - "AudioScience ASIxxxx"
+reject_firmware sound/pci/asihpi/hpidspcd.c
+clean_blob sound/pci/asihpi/hpidspcd.c
+clean_blob sound/pci/asihpi/hpioctl.c
+clean_kconfig sound/pci/Kconfig 'SND_ASIHPI'
+clean_mk CONFIG_SND_ASIHPI sound/pci/asihpi/Makefile
+
+announce SND_CS46XX - "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"
+reject_firmware sound/pci/cs46xx/cs46xx_lib.c
+clean_blob sound/pci/cs46xx/cs46xx_lib.c
+clean_kconfig sound/pci/Kconfig 'SND_CS46XX'
+clean_mk 'CONFIG_SND_CS46XX' sound/pci/cs46xx/Makefile
+
+announce SND_KORG1212 - "Korg 1212 IO"
+drop_fw_file firmware/korg/k1212.dsp.ihex firmware/korg/k1212.dsp
+reject_firmware sound/pci/korg1212/korg1212.c
+clean_blob sound/pci/korg1212/korg1212.c
+clean_kconfig sound/pci/Kconfig 'SND_KORG1212'
+clean_mk 'CONFIG_SND_KORG1212' sound/pci/korg1212/Makefile
+
+announce SND_MAESTRO3 - "ESS Allegro/Maestro3"
+drop_fw_file firmware/ess/maestro3_assp_kernel.fw.ihex firmware/ess/maestro3_assp_kernel.fw
+drop_fw_file firmware/ess/maestro3_assp_minisrc.fw.ihex firmware/ess/maestro3_assp_minisrc.fw
+reject_firmware sound/pci/maestro3.c
+clean_blob sound/pci/maestro3.c
+clean_kconfig sound/pci/Kconfig 'SND_MAESTRO3'
+clean_mk 'CONFIG_SND_MAESTRO3' sound/pci/Makefile
+
+announce SND_YMFPCI - "Yamaha YMF724/740/744/754"
+drop_fw_file firmware/yamaha/ds1_ctrl.fw.ihex firmware/yamaha/ds1_ctrl.fw
+drop_fw_file firmware/yamaha/ds1_dsp.fw.ihex firmware/yamaha/ds1_dsp.fw
+drop_fw_file firmware/yamaha/ds1e_ctrl.fw.ihex firmware/yamaha/ds1e_ctrl.fw
+reject_firmware sound/pci/ymfpci/ymfpci_main.c
+clean_blob sound/pci/ymfpci/ymfpci_main.c
+clean_kconfig sound/pci/Kconfig 'SND_YMFPCI'
+clean_mk 'CONFIG_SND_YMFPCI' sound/pci/ymfpci/Makefile
+
+announce SND_SB16_CSP - "SB16 Advanced Signal Processor"
+drop_fw_file firmware/sb16/alaw_main.csp.ihex firmware/sb16/alaw_main.csp
+drop_fw_file firmware/sb16/mulaw_main.csp.ihex firmware/sb16/mulaw_main.csp
+drop_fw_file firmware/sb16/ima_adpcm_init.csp.ihex firmware/sb16/ima_adpcm_init.csp
+drop_fw_file firmware/sb16/ima_adpcm_capture.csp.ihex firmware/sb16/ima_adpcm_capture.csp
+drop_fw_file firmware/sb16/ima_adpcm_playback.csp.ihex firmware/sb16/ima_adpcm_playback.csp
+reject_firmware sound/isa/sb/sb16_csp.c
+clean_blob sound/isa/sb/sb16_csp.c
+clean_kconfig sound/isa/Kconfig 'SND_SB16_CSP'
+clean_mk 'CONFIG_SND_SB16_CSP' sound/isa/sb/Makefile
+
+announce SND_WAVEFRONT - "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)"
+drop_fw_file firmware/yamaha/yss225_registers.bin.ihex firmware/yamaha/yss225_registers.bin
+reject_firmware sound/isa/wavefront/wavefront_fx.c
+clean_blob sound/isa/wavefront/wavefront_fx.c
+reject_firmware sound/isa/wavefront/wavefront_synth.c
+clean_blob sound/isa/wavefront/wavefront_synth.c
+clean_kconfig sound/isa/Kconfig 'SND_WAVEFRONT'
+clean_mk 'CONFIG_SND_WAVEFRONT' sound/isa/wavefront/Makefile
+
+announce SND_VX_LIB - Digigram VX soundcards
+reject_firmware sound/drivers/vx/vx_hwdep.c
+clean_blob sound/drivers/vx/vx_hwdep.c
+clean_kconfig sound/drivers/Kconfig 'SND_VX_LIB'
+clean_mk CONFIG_SND_VX_LIB sound/drivers/vx/Makefile
+
+announce SND_DARLA20 - "(Echoaudio) Darla20"
+clean_blob sound/pci/echoaudio/darla20.c
+clean_kconfig sound/pci/Kconfig 'SND_DARLA20'
+clean_mk CONFIG_SND_DARLA20 sound/pci/echoaudio/Makefile
+
+announce SND_DARLA24 - "(Echoaudio) Darla24"
+clean_blob sound/pci/echoaudio/darla24.c
+clean_kconfig sound/pci/Kconfig 'SND_DARLA24'
+clean_mk CONFIG_SND_DARLA24 sound/pci/echoaudio/Makefile
+
+announce SND_ECHO3G - "(Echoaudio) 3G cards"
+clean_blob sound/pci/echoaudio/echo3g.c
+clean_kconfig sound/pci/Kconfig 'SND_ECHO3G'
+clean_mk CONFIG_SND_ECHO3G sound/pci/echoaudio/Makefile
+
+announce SND_GINA20 - "(Echoaudio) Gina20"
+clean_blob sound/pci/echoaudio/gina20.c
+clean_kconfig sound/pci/Kconfig 'SND_GINA20'
+clean_mk CONFIG_SND_GINA20 sound/pci/echoaudio/Makefile
+
+announce SND_GINA24 - "(Echoaudio) Gina24"
+clean_blob sound/pci/echoaudio/gina24.c
+clean_kconfig sound/pci/Kconfig 'SND_GINA24'
+clean_mk CONFIG_SND_GINA24 sound/pci/echoaudio/Makefile
+
+announce SND_INDIGO - "(Echoaudio) Indigo"
+clean_blob sound/pci/echoaudio/indigo.c
+clean_kconfig sound/pci/Kconfig 'SND_INDIGO'
+clean_mk CONFIG_SND_INDIGO sound/pci/echoaudio/Makefile
+
+announce SND_INDIGODJ - "(Echoaudio) Indigo DJ"
+clean_blob sound/pci/echoaudio/indigodj.c
+clean_kconfig sound/pci/Kconfig 'SND_INDIGODJ'
+clean_mk CONFIG_SND_INDIGODJ sound/pci/echoaudio/Makefile
+
+announce SND_INDIGODJX - "(Echoaudio) Indigo DJx"
+clean_blob sound/pci/echoaudio/indigodjx.c
+clean_kconfig sound/pci/Kconfig 'SND_INDIGODJX'
+clean_mk CONFIG_SND_INDIGODJX sound/pci/echoaudio/Makefile
+
+announce SND_INDIGOIO - "(Echoaudio) Indigo IO"
+clean_blob sound/pci/echoaudio/indigoio.c
+clean_kconfig sound/pci/Kconfig 'SND_INDIGOIO'
+clean_mk CONFIG_SND_INDIGOIO sound/pci/echoaudio/Makefile
+
+announce SND_INDIGOIOX - "(Echoaudio) Indigo IOx"
+clean_blob sound/pci/echoaudio/indigoiox.c
+clean_kconfig sound/pci/Kconfig 'SND_INDIGOIOX'
+clean_mk CONFIG_SND_INDIGOIOX sound/pci/echoaudio/Makefile
+
+announce SND_LAYLA20 - "(Echoaudio) Layla20"
+clean_blob sound/pci/echoaudio/layla20.c
+clean_kconfig sound/pci/Kconfig 'SND_LAYLA20'
+clean_mk CONFIG_SND_LAYLA20 sound/pci/echoaudio/Makefile
+
+announce SND_LAYLA24 - "(Echoaudio) Layla24"
+clean_blob sound/pci/echoaudio/layla24.c
+clean_kconfig sound/pci/Kconfig 'SND_LAYLA24'
+clean_mk CONFIG_SND_LAYLA24 sound/pci/echoaudio/Makefile
+
+announce SND_MIA - "(Echoaudio) Mia"
+clean_blob sound/pci/echoaudio/mia.c
+clean_kconfig sound/pci/Kconfig 'SND_MIA'
+clean_mk CONFIG_SND_MIA sound/pci/echoaudio/Makefile
+
+announce SND_MONA - "(Echoaudio) Mona"
+clean_blob sound/pci/echoaudio/mona.c
+clean_kconfig sound/pci/Kconfig 'SND_MONA'
+clean_mk CONFIG_SND_MONA sound/pci/echoaudio/Makefile
+
+announce SND_'<(Echoaudio)>' - "(Echoaudio) all of the above "
+reject_firmware sound/pci/echoaudio/echoaudio.c
+clean_blob sound/pci/echoaudio/echoaudio.c
+
+announce SND_EMU10K1 - "Emu10k1 (SB Live!, Audigy, E-mu APS)"
+reject_firmware sound/pci/emu10k1/emu10k1_main.c
+clean_blob sound/pci/emu10k1/emu10k1_main.c
+clean_kconfig sound/pci/Kconfig 'SND_EMU10K1'
+clean_mk CONFIG_SND_EMU10K1 sound/pci/emu10k1/Makefile
+
+announce SND_MIXART - "Digigram miXart"
+reject_firmware sound/pci/mixart/mixart_hwdep.c
+clean_blob sound/pci/mixart/mixart_hwdep.c
+clean_kconfig sound/pci/Kconfig 'SND_MIXART'
+clean_mk CONFIG_SND_MIXART sound/pci/mixart/Makefile
+
+announce SND_PCXHR - "Digigram PCXHR"
+reject_firmware sound/pci/pcxhr/pcxhr_hwdep.c
+clean_blob sound/pci/pcxhr/pcxhr_hwdep.c
+clean_kconfig sound/pci/Kconfig 'SND_PCXHR'
+clean_mk CONFIG_SND_PCXHR sound/pci/pcxhr/Makefile
+
+announce SND_RIPTIDE - "Conexant Riptide"
+reject_firmware sound/pci/riptide/riptide.c
+clean_blob sound/pci/riptide/riptide.c
+clean_kconfig sound/pci/Kconfig 'SND_RIPTIDE'
+clean_mk CONFIG_SND_RIPTIDE sound/pci/riptide/Makefile
+
+# This is ok, patch filenames are supplied as module parameters, and
+# they are text files with patch instructions.
+#announce SND_HDA_PATCH_LOADER - "Support initialization patch loading for HD-audio"
+#reject_firmware sound/pci/hda/hda_hwdep.c
+#clean_kconfig sound/pci/hda/Kconfig 'SND_HDA_PATCH_LOADER'
+
+announce SND_HDA_CODEC_CA0132_DSP - "Support new DSP code for CA0132 codec"
+reject_firmware sound/pci/hda/patch_ca0132.c
+clean_blob sound/pci/hda/patch_ca0132.c
+clean_sed '
+/^config SND_HDA_CODEC_CA0132_DSP$/, /^config / {
+  s,(ctefx.bin),(/*(DEBLOBBED)*/),;
+}' sound/pci/hda/Kconfig 'removed blob name'
+clean_kconfig sound/pci/hda/Kconfig 'SND_HDA_CODEC_CA0132_DSP'
+# There are no separate source files or Makefile entries for the _DSP option.
+clean_mk CONFIG_SND_HDA_CODEC_CA0132 sound/pci/hda/Makefile
+
+announce SND_HDSP - "RME Hammerfall DSP Audio"
+reject_firmware sound/pci/rme9652/hdsp.c
+clean_blob sound/pci/rme9652/hdsp.c
+clean_kconfig sound/pci/Kconfig 'SND_HDSP'
+clean_mk CONFIG_SND_HDSP sound/pci/rme9652/Makefile
+
+announce SND_AICA - "Dreamcast Yamaha AICA sound"
+reject_firmware sound/sh/aica.c
+clean_blob sound/sh/aica.c
+clean_kconfig sound/sh/Kconfig 'SND_AICA'
+clean_mk CONFIG_SND_AICA sound/sh/Makefile
+
+announce SND_MSND_PINNACLE - "Support for Turtle Beach MultiSound Pinnacle"
+clean_blob sound/isa/msnd/msnd_pinnacle.h
+reject_firmware sound/isa/msnd/msnd_pinnacle.c
+clean_blob sound/isa/msnd/msnd_pinnacle.c
+clean_kconfig sound/isa/Kconfig 'SND_MSND_PINNACLE'
+clean_mk CONFIG_SND_MSND_PINNACLE sound/isa/msnd/Makefile
+
+announce SND_MSND_CLASSIC - "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey"
+clean_blob sound/isa/msnd/msnd_classic.h
+clean_kconfig sound/isa/Kconfig 'SND_MSND_CLASSIC'
+clean_mk CONFIG_SND_MSND_CLASSIC sound/isa/msnd/Makefile
+
+announce SOUND_MSNDCLAS - "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey (oss)"
+clean_blob sound/oss/msnd_classic.h
+clean_kconfig sound/oss/Kconfig 'SOUND_MSNDCLAS'
+clean_sed '
+/^config MSNDCLAS_INIT_FILE$/, /^config / {
+  /^	default.*msndinit\.bin/ s,".*","/*(DEBLOBBED)*/",;
+}
+/^config MSNDCLAS_PERM_FILE$/, /^config / {
+  /^	default.*msndperm\.bin/ s,".*","/*(DEBLOBBED)*/",;
+}' sound/oss/Kconfig 'removed default firmware'
+clean_mk CONFIG_SOUND_MSNDCLAS sound/oss/Makefile
+
+announce SOUND_MSNDPIN - "Support for Turtle Beach MultiSound Pinnacle (oss)"
+clean_blob sound/oss/msnd_pinnacle.h
+clean_kconfig sound/oss/Kconfig 'SOUND_MSNDPIN'
+clean_sed '
+/^config MSNDPIN_INIT_FILE$/, /^config / {
+  /^	default.*pndspini\.bin/ s,".*","/*(DEBLOBBED)*/",;
+}
+/^config MSNDPIN_PERM_FILE$/, /^config / {
+  /^	default.*pndsperm\.bin/ s,".*","/*(DEBLOBBED)*/",;
+}' sound/oss/Kconfig 'removed default firmware'
+clean_mk CONFIG_SOUND_MSNDPIN sound/oss/Makefile
+
+announce SND_SSCAPE - "Ensoniq SoundScape driver"
+reject_firmware sound/isa/sscape.c
+clean_blob sound/isa/sscape.c
+clean_sed '
+/^config SND_SSCAPE$/, /^config / {
+  s,"\(scope\|sndscape\)\.co[d?]","/*(DEBLOBBED)*/",g;
+}' sound/isa/Kconfig 'removed firmware names'
+clean_kconfig sound/isa/Kconfig 'SND_SSCAPE'
+clean_mk CONFIG_SND_SSCAPE sound/isa/Makefile
+
+announce SND_SOC_ADAU1701 - "ADAU1701 SigmaDSP processor"
+clean_blob sound/soc/codecs/adau1701.c
+clean_kconfig sound/soc/codecs/Kconfig 'SND_SOC_ADAU1701'
+clean_mk CONFIG_SND_SOC_ADAU1701 sound/soc/codecs/Makefile
+
+announce SND_SOC_ADAU1761 - "ADAU1761 SigmaDSP processor"
+clean_blob sound/soc/codecs/adau1761.c
+clean_kconfig sound/soc/codecs/Kconfig 'SND_SOC_ADAU1761'
+clean_mk CONFIG_SND_SOC_ADAU1761 sound/soc/codecs/Makefile
+
+announce SND_SOC_ADAU1781 - "ADAU1781 SigmaDSP processor"
+clean_blob sound/soc/codecs/adau1781.c
+clean_kconfig sound/soc/codecs/Kconfig 'SND_SOC_ADAU1781'
+clean_mk CONFIG_SND_SOC_ADAU1781 sound/soc/codecs/Makefile
+
+announce SND_SOC_SIGMADSP - "SigmaStudio firmware loader"
+maybe_reject_firmware sound/soc/codecs/sigmadsp.c
+
+announce SND_SOC_INTEL_SST_ACPI - "Intel SST (LPE) Driver"
+reject_firmware sound/soc/intel/sst-acpi.c
+clean_blob sound/soc/intel/sst-acpi.c
+clean_kconfig sound/soc/intel/Kconfig 'SND_SOC_INTEL_SST_ACPI'
+clean_mk 'CONFIG_SND_SOC_INTEL_SST_ACPI' sound/soc/intel/Makefile
+
+announce SND_SOC_WM0010 - "WM0010 DSP driver"
+reject_firmware sound/soc/codecs/wm0010.c
+clean_blob sound/soc/codecs/wm0010.c
+clean_kconfig sound/soc/codecs/Kconfig 'SND_SOC_WM0010'
+clean_mk CONFIG_SND_SOC_WM0010 sound/soc/codecs/Makefile
+
+# It's not clear that wm2000_anc.bin is pure data.
+# Check with developer, clean up for now.
+announce SND_SOC_WM2000 - "WM2000 ALSA Soc Audio codecs"
+reject_firmware sound/soc/codecs/wm2000.c
+clean_blob sound/soc/codecs/wm2000.c
+clean_kconfig sound/soc/codecs/Kconfig 'SND_SOC_WM2000'
+clean_mk CONFIG_SND_SOC_WM2000 sound/soc/codecs/Makefile
+
+announce SND_SOC_WM8994 - "WM8994 ALSA Soc Audio codecs"
+reject_firmware sound/soc/codecs/wm8958-dsp2.c
+clean_blob sound/soc/codecs/wm8958-dsp2.c
+clean_kconfig sound/soc/codecs/Kconfig 'SND_SOC_WM8994'
+clean_mk CONFIG_SND_SOC_WM8994 sound/soc/codecs/Makefile
+
+# The coeff files might be pure data, but the wmfw surely aren't.
+announce SND_SOC_WM_ADSP - "Wolfson ADSP support"
+reject_firmware sound/soc/codecs/wm_adsp.c
+clean_blob sound/soc/codecs/wm_adsp.c
+clean_kconfig sound/soc/codecs/Kconfig 'SND_SOC_WM_ADSP'
+clean_mk CONFIG_SND_SOC_WM_ADSP sound/soc/codecs/Makefile
+
+announce SND_SOC_SH4_SIU - "ALSA SoC driver for Renesas SH7343, SH7722 SIU peripheral"
+reject_firmware sound/soc/sh/siu_dai.c
+clean_blob sound/soc/sh/siu_dai.c
+clean_kconfig sound/soc/sh/Kconfig 'SND_SOC_SH4_SIU'
+clean_mk CONFIG_SND_SOC_SH4_SIU sound/soc/sh/Makefile
+
+announce SOUND_TRIX - "MediaTrix AudioTrix Pro support"
+clean_blob sound/oss/trix.c
+clean_kconfig sound/oss/Kconfig 'SOUND_TRIX'
+clean_sed '
+/^config TRIX_BOOT_FILE$/, /^config / {
+  /^	default.*trxpro\.hex/ s,".*","/*(DEBLOBBED)*/",;
+}' sound/oss/Kconfig 'removed default firmware'
+clean_mk CONFIG_SOUND_TRIX sound/oss/Makefile
+
+announce SOUND_TRIX - "See above,"
+announce SOUND_PAS - "ProAudioSpectrum 16 support,"
+announce SOUND_SB - "100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support"
+clean_blob sound/oss/sb_common.c
+clean_kconfig sound/oss/Kconfig 'SOUND_PAS'
+clean_kconfig sound/oss/Kconfig 'SOUND_SB'
+clean_mk CONFIG_SOUND_PAS sound/oss/Makefile
+clean_mk CONFIG_SOUND_SB sound/oss/Makefile
+
+announce SOUND_PSS - "PSS (AD1848, ADSP-2115, ESC614) support"
+clean_sed 's,^\( [*] .*synth"\)\.$,\1/*.,' sound/oss/pss.c 'avoid nested comments'
+clean_blob sound/oss/pss.c
+clean_kconfig sound/oss/Kconfig 'SOUND_PSS'
+clean_sed '
+/^config PSS_BOOT_FILE$/, /^config / {
+  /^	default.*dsp001\.ld/ s,".*","/*(DEBLOBBED)*/",;
+}' sound/oss/Kconfig 'removed default firmware'
+clean_mk CONFIG_SOUND_PSS sound/oss/Makefile
+
+announce SND_USB_6FIRE - "TerraTec DMX 6Fire USB"
+reject_firmware sound/usb/6fire/firmware.c
+clean_blob sound/usb/6fire/firmware.c
+clean_kconfig sound/usb/Kconfig 'SND_USB_6FIRE'
+clean_mk 'CONFIG_SND_USB_6FIRE' sound/usb/6fire/Makefile
+
+#################
+# Documentation #
+#################
+
+announce Documentation - "non-Free firmware scripts and documentation"
+clean_blob Documentation/dvb/avermedia.txt
+clean_blob Documentation/dvb/opera-firmware.txt
+clean_blob Documentation/sound/alsa/ALSA-Configuration.txt
+clean_blob Documentation/sound/oss/MultiSound
+clean_blob Documentation/sound/oss/PSS
+clean_blob Documentation/sound/oss/PSS-updates
+clean_blob Documentation/sound/oss/README.OSS
+clean_file Documentation/dvb/get_dvb_firmware
+clean_file Documentation/video4linux/extract_xc3028.pl
+clean_sed s,usb8388,whatever,g drivers/base/Kconfig 'removed blob name'
+clean_blob firmware/README.AddingFirmware
+clean_blob firmware/WHENCE
+
+if $errors; then
+  echo errors above were ignored because of --force >&2
+fi
+
+exit 0
diff --git a/freed-ora/current/master/deblob-check b/freed-ora/current/master/deblob-check
index 20bb408c0..8dfafa555 100755
--- a/freed-ora/current/master/deblob-check
+++ b/freed-ora/current/master/deblob-check
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# deblob-check version 2014-08-07
+# deblob-check version 2014-09-27
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -891,7 +891,7 @@ set_except () {
   blobna 'DEFAULT_FIRMWARE'
   blobna '\([.]\|->\)firmware[ 	\n]*=[^=]'
   blobna 'mod_firmware_load' # sound/
-  blobname '[.]\(fw\|bin[0-9]*\|hex\|frm\|co[dx]\|dat\|elf\|xlx\|rfb\|ucode\|img\|sbcf\|ctx\(prog\|vals\)\|z77\|wfw\|inp\)["]'
+  blobname '[.]\(fw\|bin[0-9]*\|hex\|frm\|co[dx]\|dat\|elf\|xlx\|rfb\|ucode\|img\|sbcf\|ctx\(prog\|vals\)\|z77\|wfw\|inp\|dlmem\)["]'
   # Ideally we'd whitelist URLs that don't recommend non-Free
   # Software, but there are just too many URLs in Linux, and most are
   # fine, so we just blacklist when we find undesirable URLs.
@@ -3470,7 +3470,7 @@ set_except () {
     defsnc 'static[ ]const[ ]unsigned[ ]int[ ]bsc_data32_pins\[\][ ]=' drivers/pinctrl/pinctrl-baytrail.c
     blobname 'mt76\(50\|62\)\.bin' drivers/staging/btmtk_usb/btmtk_usb.c
     accept '[	 ]*data->firmware[ ]=[ ]firmware[;]' drivers/staging/btmtk_usb/btmtk_usb.c
-    accept '[	]\[CODE_IMX\(27\|53\)\][ ]=[ ][{][\n][	][	]\.firmware[ ]*=' drivers/media/platform/coda.c
+    accept '[	]\[CODA_IMX\(27\|53\)\][ ]=[ ][{][\n][	][	]\.firmware[ ]*=' drivers/media/platform/coda.c
     blobname 'exynos4_\(fimc_is_fw\|s5k6a3_setfile\)\?\.bin' drivers/media/platform/exynos4-is/fimc-is.h
     accept '[ 	]*ret[ ]=[ ]process_sigma_firmware[(]client[,][ ]ADAU1701_FIRMWARE[)][;]' sound/soc/codecs/adau1701.c
     defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]rt5640_reg\[RT5640_VENDOR_ID2[ ][+][ ]1\][ ]=' sound/soc/codecs/rt5640.c
@@ -3757,6 +3757,59 @@ set_except () {
     defsnc 'static[ ]unsigned[ ]char[ ]bcd2000_init_sequence\[\][ ]=' sound/usb/bcd2000/bcd2000.c
     blobna '[ ][*][ ]xxd[ ]-r[ ]-p[ ]mXTXXX[^\n]*maxtouch\.fw[\n][ \t]*[*][/]' drivers/input/touchscreen/atmel_mxt_ts.c
     blobname 's5p-mfc-v8\.fw' drivers/media/platform/s5p-mfc/s5p_mfc.c
+
+    # New in 3.17
+    blobname 'radeon[/]\(%s\|kaveri\|KAVERI\)_mec2\.bin' drivers/gpu/drm/radeon/cik.c
+    blobname 'dvb-demod-si2168-\(\(a[23]\|b4\)0-01\|-02\)\.fw' drivers/media/dvb-frontends/si2168_priv.h
+    accept '[	]\[CODA_IMX6\(Q\|DL\)\][ ]=[ ][{][\n][	][	]\.firmware[ ]*=' drivers/media/platform/coda.c
+    blobname 'v4l-coda960-imx6\(q\|dl\)\.bin' drivers/media/platform/coda.c
+    blobname 's5p-mfc-v6-v2\.fw' drivers/media/platform/s5p-mfc/s5p_mfc.c
+    blobname 'dvb-fe-xc4000-1\.4\(\.1\)\?\.fw' drivers/media/tuners/xc4000.c
+    blobname 'ti-connectivity[/]TIInit_\(\(%d\|[0-9]\+\)[.]\)\+bts' drivers/misc/ti-st/st_kim.c
+    blobname 'fw-5\.bin' drivers/net/wireless/ath/ath6kl/core.h
+    blobname 'brcm[/]brcmfmac43569\.bin' drivers/net/wireless/brcm80211/brcmfmac/usb.c
+    blobname '3826\.eeprom' drivers/net/wireless/p54/p54spi.c
+    defsnc 'static[ ]const[ ]u64[ ]sha512_k\[\][ ]=' arch/arm/crypto/sha512_neon_glue.c
+    accept 'K_table:\([\n][ 	]*\.long[ 	]*0x[0-9a-f]*[,][ ]0x[0-9a-f]*\)*' arch/x86/crypto/crc32c-pcl-intel-asm_64.S
+    accept '\.L_s[12345678]:\([\n][ 	]*\.quad[ 	]*0x[0-9a-f]*[,][ ]0x[0-9a-f]*\)*' arch/x86/crypto/des3_ede-asm_64.S
+    defsnc '[\t]const[ ]unsigned[ ]char[ ][*]K[ ]=[ ][(]unsigned[ ]char[ ][*][)]' crypto/drbg.c
+    accept '[\t]ret[ ]=[ ]_request_firmware[(]firmware_p[,][ ]name[,][ ]device[,]' drivers/base/firmware_class.c
+    defsnc 'static[ ]const[ ]uint64_t[ ]inst\[\][ ]=' drivers/crypto/qat/qat_common/qat_hal.c
+    defsnc 'gk110b_\(grctx\|graph\)_init_\(sm\|l1c\)_0\[\][ ]=' drivers/gpu/dm/nouveau/core/engine/graph/ctxgk110b.c
+    defsnc '[\t]const[ ]u16[ ]map\[\][ ]=' drivers/hwmon/asc7621.c
+    defsnc '[}][ ]samp_freq_table\[\][ ]=' drivers/iio/accel/kxcjk-1013.c
+    defsnc 'static[ ]const[ ]unsigned[ ]char[ ]jpeg_dqt\[4\]\[DQT_LEN\][ ]=' drivers/media/pci/solo6x10/solo6x10-jpeg.h
+    defsnc 'static[ ]const[ ]u32[ ]qca953x_2p0_baseband_core\[\]\[2\][ ]=' drivers/net/wireless/ath/ath9k/ar953x_initvals.h
+    defsnc 'static[ ]const[ ]u32[ ]qca953x_2p0_baseband_postamble\[\]\[5\][ ]=' drivers/net/wireless/ath/ath9k/ar953x_initvals.h
+    defsnc 'static[ ]u16[ ]r2057_rev\(4\|5a\?\|[789]\|14\)_init\[\]\[2\][ ]=' drivers/net/wireless/b43/radio_2057.c
+    defsnc 'static[ ]const[ ]u32[ ]b43_ntab_\(\(tmap\|noisevar\)_r7\|tx_gain_\(epa\|ipa\(_2057\)\?\)_rev\([34569]\|14\)_\(hi_pwr_\)\?\(2g\|5g\)\)\[\][ ]=' drivers/net/wireless/b43/tables_nphy.c
+    accept '[	]ret[ ]=[ ]request_firmware[(][&]pm8001_ha->fw_image,' drivers/scsi/pm8001/pm8001_ctl.c
+    defsnc 'static[ ]unsigned[ ]char[ ]byVT3253InitTab_RFMD\[CB_VT3253_INIT_FOR_RFMD\]\[2\][ ]=' drivers/staging/vt6655/baseband.c
+    defsnc 'static[ ]unsigned[ ]char[ ]byVT3253B0_RFMD\[CB_VT3253B0_INIT_FOR_RFMD\]\[2\][ ]=' drivers/staging/vt6655/baseband.c
+    defsnc 'static[ ]unsigned[ ]char[ ]byVT3253B0_AGC4_RFMD2959\[CB_VT3253B0_AGC_FOR_RFMD2959\]\[2\][ ]=' drivers/staging/vt6655/baseband.c
+    defsnc 'static[ ]unsigned[ ]char[ ]byVT3253B0_AIROHA2230\[CB_VT3253B0_INIT_FOR_AIROHA2230\]\[2\][ ]=' drivers/staging/vt6655/baseband.c
+    defsnc 'static[ ]unsigned[ ]char[ ]byVT3253B0_UW2451\[CB_VT3253B0_INIT_FOR_UW2451\]\[2\][ ]=' drivers/staging/vt6655/baseband.c
+    defsnc 'static[ ]unsigned[ ]char[ ]byVT3253B0_AGC\[CB_VT3253B0_AGC\]\[2\][ ]=' drivers/staging/vt6655/baseband.c
+    defsnc 'static[ ]u8[ ]al2230_init_table\[CB_AL2230_INIT_SEQ\]\[3\][ ]=' drivers/staging/vt6656/rf.c
+    defsnc 'static[ ]u8[ ]\(al2230\|vt3226\)_channel_table[012]\[CB_MAX_CHANNEL_24G\]\[3\][ ]=' drivers/staging/vt6656/rf.c
+    defsnc 'static[ ]u8[ ]al7230_init_table\(_amode\)\?\[CB_AL7230_INIT_SEQ\]\[3\][ ]=' drivers/staging/vt6656/rf.c
+    defsnc 'static[ ]u8[ ]\(al7230\|vt3342\)_channel_table[012]\[CB_MAX_CHANNEL\]\[3\][ ]=' drivers/staging/vt6656/rf.c
+    defsnc 'static[ ]u8[ ]vt3226\(d0\)\?_init_table\[CB_VT3226_INIT_SEQ\]\[3\][ ]=' drivers/staging/vt6656/rf.c
+    defsnc 'static[ ]u8[ ]vt3342a0_init_table\[CB_VT3342_INIT_SEQ\]\[3\][ ]=' drivers/staging/vt6656/rf.c
+    defsnc 'static[ ]const[ ]u32[ ]al2230_power_table\[AL2230_PWR_IDX_LEN\][ ]=' drivers/staging/vt6656/rf.c
+    accept 'static[ ]inline[ ]int[ ]request_firmware_direct[(]const[ ]struct[ ]firmware[ ][*][*]fw[,]' include/linux/firmware.h
+    defsnc 'static[ ]u8[ ]const[ ]__aligned[(]8[)][ ]test_buf\[\][ ]__initconst[ ]=' lib/crc32.c
+    defsnc 'static[ ]struct[ ]crc_test[ ][{][^}]*[}][ ]const[ ]test\[\][ ]__initconst[ ]=' lib/crc32.c
+    accept '[\t]rc[ ]=[ ]request_firmware[(][&]test_firmware[,]' lib/test_firmware.c
+    defsnc 'static[ ]struct[ ]reg_default[ ]rt286_index_def\[\][ ]=' sound/soc/codecs/rt286.c
+    defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]rt286_reg\[\][ ]=' sound/soc/codecs/rt286.c
+    defsnc 'static[ ]const[ ]struct[ ]reg_default[ ]rt5670_reg\[\][ ]=' sound/soc/codecs/rt5670.c
+    accept 'FW=["][$]FWPATH[/]test-firmware\.bin["]' 'tools/testing/selftests/firmware/fw_\(filesystem\|userhelper\)\.sh'
+    blobname 'qat_895xcc\.bin' drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h
+    blobname 'dvb-demod-si2165\.fw' drivers/media/dvb-frontends/si2165_priv.h
+    blobname 'dvb-tuner-si2158-a20-01\.fw' drivers/media/tuners/si2157_priv.h
+    blobname 'brcm[/]brcmfmac43\(602\|5[46]\|570\)-pcie\.bin' drivers/net/wireless/brcm80211/brcmfmac/pcie.c
+    blobname 'r8a779x_usb3_v1\.dlmem' drivers/usb/host/xhci-rcar.c
     ;;
 
   */*freedo*.patch | */*logo*.patch)
diff --git a/freed-ora/current/master/die-floppy-die.patch b/freed-ora/current/master/die-floppy-die.patch
index 8fd0f3f1e..1d616c0db 100644
--- a/freed-ora/current/master/die-floppy-die.patch
+++ b/freed-ora/current/master/die-floppy-die.patch
@@ -1,24 +1,24 @@
-Bugzilla: N/A
-Upstream-status: Fedora mustard
-
-From 4ff58b642f80dedb20533978123d89b5ac9b1ed5 Mon Sep 17 00:00:00 2001
+From df5a47b1b379b6fae5bdc3e5c889abfc88cff0c3 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: die-floppy-die
+Subject: [PATCH] die-floppy-die
 
 Kill the floppy.ko pnp modalias. We were surviving just fine without
 autoloading floppy drivers, tyvm.
 
 Please feel free to register all complaints in the wastepaper bin.
+
+Bugzilla: N/A
+Upstream-status: Fedora mustard
 ---
- drivers/block/floppy.c |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ drivers/block/floppy.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
-index 90c4038..f4a0b90 100644
+index 56d46ffb08e1..1c8db250df88 100644
 --- a/drivers/block/floppy.c
 +++ b/drivers/block/floppy.c
-@@ -4619,8 +4619,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
+@@ -4634,8 +4634,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
  	{"PNP0700", 0},
  	{}
  };
@@ -29,5 +29,5 @@ index 90c4038..f4a0b90 100644
  #else
  
 -- 
-1.7.0.1
+1.9.3
 
diff --git a/freed-ora/current/master/disable-i8042-check-on-apple-mac.patch b/freed-ora/current/master/disable-i8042-check-on-apple-mac.patch
index ec6e48594..cc971c41b 100644
--- a/freed-ora/current/master/disable-i8042-check-on-apple-mac.patch
+++ b/freed-ora/current/master/disable-i8042-check-on-apple-mac.patch
@@ -1,10 +1,7 @@
-Bugzilla: N/A
-Upstream-status: http://lkml.indiana.edu/hypermail/linux/kernel/1005.0/00938.html (and pinged on Dec 17, 2013)
-
-From 2a79554c864ac58fa2ad982f0fcee2cc2aa33eb5 Mon Sep 17 00:00:00 2001
+From 7d858affb3a22802d0d3b390584deeef8c3efe7b Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess@hadess.net>
 Date: Thu, 20 May 2010 10:30:31 -0400
-Subject: Disable i8042 checks on Intel Apple Macs
+Subject: [PATCH] disable i8042 check on apple mac
 
 As those computers never had any i8042 controllers, and the
 current lookup code could potentially lock up/hang/wait for
@@ -12,16 +9,19 @@ timeout for long periods of time.
 
 Fixes intermittent hangs on boot on a MacbookAir1,1
 
+Bugzilla: N/A
+Upstream-status: http://lkml.indiana.edu/hypermail/linux/kernel/1005.0/00938.html (and pinged on Dec 17, 2013)
+
 Signed-off-by: Bastien Nocera <hadess@hadess.net>
 ---
- drivers/input/serio/i8042.c |   22 ++++++++++++++++++++++
- 1 files changed, 22 insertions(+), 0 deletions(-)
+ drivers/input/serio/i8042.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
 
 diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
-index 6440a8f..4d7cf98 100644
+index 9bb95eab6926..4b5015f27f9e 100644
 --- a/drivers/input/serio/i8042.c
 +++ b/drivers/input/serio/i8042.c
-@@ -1451,6 +1451,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 6440a8f..4d7cf98 100644
  static int __init i8042_init(void)
  {
  	struct platform_device *pdev;
-@@ -1458,6 +1474,12 @@ static int __init i8042_init(void)
+@@ -1478,6 +1494,12 @@ static int __init i8042_init(void)
  
  	dbg_init();
  
@@ -58,5 +58,5 @@ index 6440a8f..4d7cf98 100644
  	if (err)
  		return err;
 -- 
-1.7.0.1
+1.9.3
 
diff --git a/freed-ora/current/master/disable-libdw-unwind-on-non-x86.patch b/freed-ora/current/master/disable-libdw-unwind-on-non-x86.patch
index 445fc1942..0258d58ab 100644
--- a/freed-ora/current/master/disable-libdw-unwind-on-non-x86.patch
+++ b/freed-ora/current/master/disable-libdw-unwind-on-non-x86.patch
@@ -1,9 +1,20 @@
+From 2022539fd7aa58b000b0b5436978a1a37e237ff8 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
+
+Bugzilla: 1025603
+Upstream-status: ??
+---
+ tools/perf/config/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
 diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
-index ee21fa9..19ee413 100644
+index 1f67aa02d240..86c21a24da46 100644
 --- a/tools/perf/config/Makefile
 +++ b/tools/perf/config/Makefile
-@@ -34,6 +34,10 @@ ifeq ($(ARCH),arm)
-   LIBUNWIND_LIBS = -lunwind -lunwind-arm
+@@ -52,6 +52,10 @@ ifeq ($(ARCH),powerpc)
+   CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX
  endif
  
 +ifneq ($(ARCH),x86)
@@ -13,3 +24,6 @@ index ee21fa9..19ee413 100644
  ifeq ($(LIBUNWIND_LIBS),)
    NO_LIBUNWIND := 1
  else
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/drm-i915-hush-check-crtc-state.patch b/freed-ora/current/master/drm-i915-hush-check-crtc-state.patch
index 295cad7b7..d5d460b29 100644
--- a/freed-ora/current/master/drm-i915-hush-check-crtc-state.patch
+++ b/freed-ora/current/master/drm-i915-hush-check-crtc-state.patch
@@ -1,15 +1,24 @@
-Bugzilla: 1027037 1028785
-Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/035948.html
+From e0b5f694622e99848146e2da255522f091df4d60 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
 
 This is _by far_ the most common backtrace for i915 on retrace.fp.o, and
 it's mostly useless noise.  There's not enough context when it's generated
 to know if something actually went wrong.  Downgrade the message to
 KMS debugging so we can still get it if we want it.
 
-diff -up linux-3.13.0-0.rc0.git2.1.fc21.x86_64/drivers/gpu/drm/i915/intel_display.c.jx linux-3.13.0-0.rc0.git2.1.fc21.x86_64/drivers/gpu/drm/i915/intel_display.c
---- linux-3.13.0-0.rc0.git2.1.fc21.x86_64/drivers/gpu/drm/i915/intel_display.c.jx	2013-11-03 18:41:51.000000000 -0500
-+++ linux-3.13.0-0.rc0.git2.1.fc21.x86_64/drivers/gpu/drm/i915/intel_display.c	2013-11-13 10:12:05.781301624 -0500
-@@ -8803,7 +8803,7 @@ check_crtc_state(struct drm_device *dev)
+Bugzilla: 1027037 1028785
+Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/035948.html
+---
+ drivers/gpu/drm/i915/intel_display.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index d8324c69fa86..ee0ca36930f8 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -10656,7 +10656,7 @@ check_crtc_state(struct drm_device *dev)
  
  		if (active &&
  		    !intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) {
@@ -18,3 +27,6 @@ diff -up linux-3.13.0-0.rc0.git2.1.fc21.x86_64/drivers/gpu/drm/i915/intel_displa
  			intel_dump_pipe_config(crtc, &pipe_config,
  					       "[hw state]");
  			intel_dump_pipe_config(crtc, &crtc->config,
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/drm-radeon-Disable-writeback-by-default-on-ppc.patch b/freed-ora/current/master/drm-radeon-Disable-writeback-by-default-on-ppc.patch
deleted file mode 100644
index 3aa1b147a..000000000
--- a/freed-ora/current/master/drm-radeon-Disable-writeback-by-default-on-ppc.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Bugzilla: N/A
-Upstream-status: Replaced by http://lists.freedesktop.org/archives/dri-devel/2013-December/050290.html in 3.14
-
-From b67e0a6a7409f9c1a12e573fb7d8d80ee455b103 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 17 Jun 2013 09:59:34 -0400
-Subject: [PATCH] drm/radeon: Disable writeback by default on ppc
-
-At least on an IBM Power 720, this check passes, but several piglit
-tests will reliably trigger GPU resets due to the ring buffer pointers
-not being updated.  There's probably a better way to limit this to just
-affected machines though.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- drivers/gpu/drm/radeon/r600_cp.c       | 7 +++++++
- drivers/gpu/drm/radeon/radeon_cp.c     | 7 +++++++
- drivers/gpu/drm/radeon/radeon_device.c | 4 ++--
- drivers/gpu/drm/radeon/radeon_drv.c    | 2 +-
- 4 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
-index 1c51c08..ef28532 100644
---- a/drivers/gpu/drm/radeon/r600_cp.c
-+++ b/drivers/gpu/drm/radeon/r600_cp.c
-@@ -552,6 +552,13 @@ static void r600_test_writeback(drm_radeon_private_t *dev_priv)
- 		dev_priv->writeback_works = 0;
- 		DRM_INFO("writeback test failed\n");
- 	}
-+#if defined(__ppc__) || defined(__ppc64__)
-+	/* the test might succeed on ppc, but it's usually not reliable */
-+	if (radeon_no_wb == -1) {
-+		radeon_no_wb = 1;
-+		DRM_INFO("not trusting writeback test due to arch quirk\n");
-+	}
-+#endif
- 	if (radeon_no_wb == 1) {
- 		dev_priv->writeback_works = 0;
- 		DRM_INFO("writeback forced off\n");
-diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index efc4f64..a967b33 100644
---- a/drivers/gpu/drm/radeon/radeon_cp.c
-+++ b/drivers/gpu/drm/radeon/radeon_cp.c
-@@ -892,6 +892,13 @@ static void radeon_test_writeback(drm_radeon_private_t * dev_priv)
- 		dev_priv->writeback_works = 0;
- 		DRM_INFO("writeback test failed\n");
- 	}
-+#if defined(__ppc__) || defined(__ppc64__)
-+	/* the test might succeed on ppc, but it's usually not reliable */
-+	if (radeon_no_wb == -1) {
-+		radeon_no_wb = 1;
-+		DRM_INFO("not trusting writeback test due to arch quirk\n");
-+	}
-+#endif
- 	if (radeon_no_wb == 1) {
- 		dev_priv->writeback_works = 0;
- 		DRM_INFO("writeback forced off\n");
-diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index 1899738..524046e 100644
---- a/drivers/gpu/drm/radeon/radeon_device.c
-+++ b/drivers/gpu/drm/radeon/radeon_device.c
-@@ -322,8 +322,8 @@ int radeon_wb_init(struct radeon_device *rdev)
- 	/* disable event_write fences */
- 	rdev->wb.use_event = false;
- 	/* disabled via module param */
--	if (radeon_no_wb == 1) {
--		rdev->wb.enabled = false;
-+	if (radeon_no_wb != -1) {
-+		rdev->wb.enabled = !!radeon_no_wb;
- 	} else {
- 		if (rdev->flags & RADEON_IS_AGP) {
- 			/* often unreliable on AGP */
-diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
-index 094e7e5..04809d4 100644
---- a/drivers/gpu/drm/radeon/radeon_drv.c
-+++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -146,7 +146,7 @@ static inline void radeon_register_atpx_handler(void) {}
- static inline void radeon_unregister_atpx_handler(void) {}
- #endif
- 
--int radeon_no_wb;
-+int radeon_no_wb = -1;
- int radeon_modeset = -1;
- int radeon_dynclks = -1;
- int radeon_r4xx_atom = 0;
--- 
-1.8.2.1
-
diff --git a/freed-ora/current/master/drm-vmwgfx-Fix-drm.h-include.patch b/freed-ora/current/master/drm-vmwgfx-Fix-drm.h-include.patch
new file mode 100644
index 000000000..b2844b934
--- /dev/null
+++ b/freed-ora/current/master/drm-vmwgfx-Fix-drm.h-include.patch
@@ -0,0 +1,35 @@
+From 8e5faf7fe1509690473c40f38ff2eb1cff544c3b 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
+
diff --git a/freed-ora/current/master/eeepc-wmi-Add-no-backlight-quirk-for-Asus-H87I-PLUS-.patch b/freed-ora/current/master/eeepc-wmi-Add-no-backlight-quirk-for-Asus-H87I-PLUS-.patch
deleted file mode 100644
index 4cb493325..000000000
--- a/freed-ora/current/master/eeepc-wmi-Add-no-backlight-quirk-for-Asus-H87I-PLUS-.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Bugzilla: 1097463
-Upstream-status: Sent for 3.16
-
-From 7ad066ecd4dfb4c36fb00f9f9eb1a5d6099db834 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Mon, 2 Jun 2014 17:41:02 +0200
-Subject: [PATCH 05/14] eeepc-wmi: Add no backlight quirk for Asus H87I-PLUS
- Motherboard
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1097436
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/platform/x86/eeepc-wmi.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
-index 6112933f6278..a7286bbfe28e 100644
---- a/drivers/platform/x86/eeepc-wmi.c
-+++ b/drivers/platform/x86/eeepc-wmi.c
-@@ -114,6 +114,10 @@ static struct quirk_entry quirk_asus_x101ch = {
- 	.wmi_backlight_power = true,
- };
- 
-+static struct quirk_entry quirk_asus_no_backlight = {
-+	.no_backlight = true,
-+};
-+
- static struct quirk_entry *quirks;
- 
- static void et2012_quirks(void)
-@@ -182,6 +186,15 @@ static struct dmi_system_id asus_quirks[] = {
- 		},
- 		.driver_data = &quirk_asus_x101ch,
- 	},
-+	{
-+		.callback = dmi_matched,
-+		.ident = "ASUSTeK Computer INC. H87I-PLUS",
-+		.matches = {
-+			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),
-+			DMI_MATCH(DMI_BOARD_NAME, "H87I-PLUS"),
-+		},
-+		.driver_data = &quirk_asus_no_backlight,
-+	},
- 	{},
- };
- 
--- 
-1.9.0
-
diff --git a/freed-ora/current/master/efi-Add-EFI_SECURE_BOOT-bit.patch b/freed-ora/current/master/efi-Add-EFI_SECURE_BOOT-bit.patch
new file mode 100644
index 000000000..3fa545d83
--- /dev/null
+++ b/freed-ora/current/master/efi-Add-EFI_SECURE_BOOT-bit.patch
@@ -0,0 +1,43 @@
+From d913d1ab9275f93afaafdac0e2a87669c2faa368 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
+
+UEFI machines can be booted in Secure Boot mode.  Add a EFI_SECURE_BOOT bit
+for use with efi_enabled.
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ arch/x86/kernel/setup.c | 2 ++
+ include/linux/efi.h     | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
+index 5a5cf7395724..fb282ff6a802 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -1144,7 +1144,9 @@ void __init setup_arch(char **cmdline_p)
+ 
+ #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
+ 	if (boot_params.secure_boot) {
++		set_bit(EFI_SECURE_BOOT, &efi.flags);
+ 		enforce_signed_modules();
++		pr_info("Secure boot enabled\n");
+ 	}
+ #endif
+ 
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index 45cb4ffdea62..ebe6a24cc1e1 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -923,6 +923,7 @@ extern int __init efi_setup_pcdp_console(char *);
+ #define EFI_64BIT		5	/* Is the firmware 64-bit? */
+ #define EFI_PARAVIRT		6	/* Access is via a paravirt interface */
+ #define EFI_ARCH_1		7	/* First arch-specific bit */
++#define EFI_SECURE_BOOT		8	/* Are we in Secure Boot mode? */
+ 
+ #ifdef CONFIG_EFI
+ /*
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch b/freed-ora/current/master/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
new file mode 100644
index 000000000..c4f703180
--- /dev/null
+++ b/freed-ora/current/master/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
@@ -0,0 +1,58 @@
+From 4ca56713f1f9eaed46f428b07da249ed5ed19dfd 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
+
+A user can manually tell the shim boot loader to disable validation of
+images it loads.  When a user does this, it creates a UEFI variable called
+MokSBState that does not have the runtime attribute set.  Given that the
+user explicitly disabled validation, we can honor that and not enable
+secure boot mode if that variable is set.
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ arch/x86/boot/compressed/eboot.c | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
+index baab83bcec44..c32bc46bd699 100644
+--- a/arch/x86/boot/compressed/eboot.c
++++ b/arch/x86/boot/compressed/eboot.c
+@@ -806,8 +806,9 @@ out:
+ 
+ static int get_secure_boot(void)
+ {
+-	u8 sb, setup;
++	u8 sb, setup, moksbstate;
+ 	unsigned long datasize = sizeof(sb);
++	u32 attr;
+ 	efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID;
+ 	efi_status_t status;
+ 
+@@ -831,6 +832,23 @@ static int get_secure_boot(void)
+ 	if (setup == 1)
+ 		return 0;
+ 
++	/* See if a user has put shim into insecure_mode.  If so, and the variable
++	 * doesn't have the runtime attribute set, we might as well honor that.
++	 */
++	var_guid = EFI_SHIM_LOCK_GUID;
++	status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
++				L"MokSBState", &var_guid, &attr, &datasize,
++				&moksbstate);
++
++	/* If it fails, we don't care why.  Default to secure */
++	if (status != EFI_SUCCESS)
++		return 1;
++
++	if (!(attr & EFI_VARIABLE_RUNTIME_ACCESS)) {
++		if (moksbstate == 1)
++			return 0;
++	}
++
+ 	return 1;
+ }
+ 
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch b/freed-ora/current/master/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
new file mode 100644
index 000000000..08c3f830d
--- /dev/null
+++ b/freed-ora/current/master/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
@@ -0,0 +1,30 @@
+From 6a4875cbdf7eda22b845e4575ac185d9cf5de432 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
+
+The functionality of the config option is dependent upon the platform being
+UEFI based.  Reflect this in the config deps.
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ arch/x86/Kconfig | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index 61542c282e70..e5ee669e87b6 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -1567,7 +1567,8 @@ config EFI_MIXED
+ 	   If unsure, say N.
+ 
+ config EFI_SECURE_BOOT_SIG_ENFORCE
+-        def_bool n
++	def_bool n
++	depends on EFI
+ 	prompt "Force module signing when UEFI Secure Boot is enabled"
+ 	---help---
+ 	  UEFI Secure Boot provides a mechanism for ensuring that the
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/filter-ppc.sh b/freed-ora/current/master/filter-ppc.sh
deleted file mode 100644
index 8ff7a3b9d..000000000
--- a/freed-ora/current/master/filter-ppc.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-# This is the ppc override file for the core/drivers package split.  The
-# module directories listed here and in the generic list in filter-modules.sh
-# will be moved to the resulting kernel-modules package for this arch.
-# Anything not listed in those files will be in the kernel-core package.
-#
-# Please review the default list in filter-modules.sh before making
-# modifications to the overrides below.  If something should be removed across
-# all arches, remove it in the default instead of per-arch.
-
-driverdirs="atm auxdisplay bcma bluetooth fmc infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging uio uwb"
-
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs iscsi_tcp megaraid pmcraid qla1280 9pnet_rdma svcrdma xprtrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject"
diff --git a/freed-ora/current/master/hibernate-Disable-in-a-signed-modules-environment.patch b/freed-ora/current/master/hibernate-Disable-in-a-signed-modules-environment.patch
new file mode 100644
index 000000000..c87039af1
--- /dev/null
+++ b/freed-ora/current/master/hibernate-Disable-in-a-signed-modules-environment.patch
@@ -0,0 +1,39 @@
+From 4756eeacb072920a3fd78df0a536e9f6de6e9987 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
+
+There is currently no way to verify the resume image when returning
+from hibernate.  This might compromise the signed modules trust model,
+so until we can work with signed hibernate images we disable it in
+a secure modules environment.
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ kernel/power/hibernate.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
+index a9dfa79b6bab..14c7356ff53a 100644
+--- a/kernel/power/hibernate.c
++++ b/kernel/power/hibernate.c
+@@ -28,6 +28,7 @@
+ #include <linux/syscore_ops.h>
+ #include <linux/ctype.h>
+ #include <linux/genhd.h>
++#include <linux/module.h>
+ #include <trace/events/power.h>
+ 
+ #include "power.h"
+@@ -65,7 +66,7 @@ static const struct platform_hibernation_ops *hibernation_ops;
+ 
+ bool hibernation_available(void)
+ {
+-	return (nohibernate == 0);
++	return ((nohibernate == 0) && !secure_modules());
+ }
+ 
+ /**
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/input-kill-stupid-messages.patch b/freed-ora/current/master/input-kill-stupid-messages.patch
index 754bf8a30..483b787a0 100644
--- a/freed-ora/current/master/input-kill-stupid-messages.patch
+++ b/freed-ora/current/master/input-kill-stupid-messages.patch
@@ -1,11 +1,19 @@
+From 4165671cca2bc79a68f15f4a43f06ed67985664a 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
+
 Bugzilla: N/A
 Upstream-status: Fedora mustard
+---
+ drivers/input/keyboard/atkbd.c | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
-index add5ffd..5eb2f03 100644
+index 6f5d79569136..95469f6ecfa5 100644
 --- a/drivers/input/keyboard/atkbd.c
 +++ b/drivers/input/keyboard/atkbd.c
-@@ -430,11 +430,15 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
+@@ -436,11 +436,15 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
  		goto out;
  	case ATKBD_RET_ACK:
  	case ATKBD_RET_NAK:
@@ -21,3 +29,6 @@ index add5ffd..5eb2f03 100644
  		goto out;
  	case ATKBD_RET_ERR:
  		atkbd->err_count++;
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/silence-noise.patch b/freed-ora/current/master/input-silence-i8042-noise.patch
index 1058f70dd..432fe50c7 100644
--- a/freed-ora/current/master/silence-noise.patch
+++ b/freed-ora/current/master/input-silence-i8042-noise.patch
@@ -1,37 +1,51 @@
-Bugzilla: N/A
-Upstream-status: Fedora mustard
-
-From b4e96f34c17e5a79cd28774cc722bb33e7e02c6e Mon Sep 17 00:00:00 2001
+From 65fb7ec4b6b10edf10f7b138291a2675c651062c Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Thu, 25 Sep 2008 16:23:33 -0400
-Subject: [PATCH] Don't print an error message just because there's no i8042 chip.
+Subject: [PATCH] input: silence i8042 noise
 
+Don't print an error message just because there's no i8042 chip.
 Some systems, such as EFI-based Apple systems, won't necessarily have an
 i8042 to initialize.  We shouldn't be printing an error message in this
 case, since not detecting the chip is the correct behavior.
+
+Bugzilla: N/A
+Upstream-status: Fedora mustard
 ---
+ drivers/base/power/main.c   | 2 --
+ drivers/input/serio/i8042.c | 1 -
+ net/can/af_can.c            | 8 ++------
+ 3 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
+index b67d9aef9fe4..dd58b0fdaafd 100644
+--- a/drivers/base/power/main.c
++++ b/drivers/base/power/main.c
+@@ -122,8 +122,6 @@ void device_pm_unlock(void)
+  */
+ void device_pm_add(struct device *dev)
+ {
+-	pr_debug("PM: Adding info for %s:%s\n",
+-		 dev->bus ? dev->bus->name : "No Bus", dev_name(dev));
+ 	mutex_lock(&dpm_list_mtx);
+ 	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 52c9ebf..c374a96 100644
+index f5a98af3b325..9bb95eab6926 100644
 --- a/drivers/input/serio/i8042.c
 +++ b/drivers/input/serio/i8042.c
-@@ -855,7 +855,6 @@ static int __init i8042_check_aux(void)
+@@ -857,7 +857,6 @@ static int __init i8042_check_aux(void)
  static int i8042_controller_check(void)
  {
  	if (i8042_flush()) {
 -		pr_err("No controller found\n");
  		return -ENODEV;
  	}
-
---
  
-Socket fuzzers like sfuzz will trigger this printk a lot, even though it's
-ratelimited. It isn't particularly useful, so just remove it.
-
-Signed-off-by: Dave Jones <davej@redhat.com>
-
+diff --git a/net/can/af_can.c b/net/can/af_can.c
+index ce82337521f6..a3fee4becc93 100644
 --- a/net/can/af_can.c
 +++ b/net/can/af_can.c
-@@ -157,13 +157,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
+@@ -158,13 +158,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
  		err = request_module("can-proto-%d", protocol);
  
  		/*
@@ -47,22 +61,6 @@ Signed-off-by: Dave Jones <davej@redhat.com>
  
  		cp = can_get_proto(protocol);
  	}
- 
-This was removed in revision 1.6 of linux-2.6-silence-noise.patch
-in ye olde CVS tree. I have no idea why. Originally the pr_debug in
-device_pm_remove was nuked as well, but that seems to have gotten lost in
-the r1.634 of kernel.spec (2.6.26-rc2-git5.)
+-- 
+1.9.3
 
-diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
-index 2a52270..bacbdd2 100644
---- a/drivers/base/power/main.c
-+++ b/drivers/base/power/main.c
-@@ -87,8 +87,6 @@ void device_pm_unlock(void)
-  */
- void device_pm_add(struct device *dev)
- {
--	pr_debug("PM: Adding info for %s:%s\n",
--		 dev->bus ? dev->bus->name : "No Bus", dev_name(dev));
- 	mutex_lock(&dpm_list_mtx);
- 	if (dev->parent && dev->parent->power.is_prepared)
- 		dev_warn(dev, "parent %s should not be sleeping\n",
diff --git a/freed-ora/current/master/makefile-after_link.patch b/freed-ora/current/master/kbuild-AFTER_LINK.patch
index ac7c5e159..3f3bd4e64 100644
--- a/freed-ora/current/master/makefile-after_link.patch
+++ b/freed-ora/current/master/kbuild-AFTER_LINK.patch
@@ -1,7 +1,4 @@
-Bugzilla: N/A
-Upstream-status: ??
-
-From fd4e7f06ecc891474dea3a93df083de5f8c50cdc Mon Sep 17 00:00:00 2001
+From 58400cfe3012f79205418cbac400ca29596b0f4a 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
@@ -9,6 +6,9 @@ Subject: [PATCH] kbuild: AFTER_LINK
 If the make variable AFTER_LINK is set, it is a command line to run
 after each final link.  This includes vmlinux itself and vDSO images.
 
+Bugzilla: N/A
+Upstream-status: ??
+
 Signed-off-by: Roland McGrath <roland@redhat.com>
 ---
  arch/arm64/kernel/vdso/Makefile     | 3 ++-
@@ -21,17 +21,17 @@ Signed-off-by: Roland McGrath <roland@redhat.com>
  7 files changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
-index 6d20b7d162d8..863a01bde0bf 100644
+index ff3bddea482d..d8a439dd6351 100644
 --- a/arch/arm64/kernel/vdso/Makefile
 +++ b/arch/arm64/kernel/vdso/Makefile
-@@ -48,7 +48,8 @@ $(obj-vdso): %.o: %.S
+@@ -48,7 +48,8 @@ $(obj-vdso): %.o: %.S FORCE
  
  # Actual build commands
- quiet_cmd_vdsold = VDSOL $@
+ quiet_cmd_vdsold = VDSOL   $@
 -      cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $^ -o $@
 +      cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $^ -o $@ \
-+				   $(if $(AFTER_LINK),;$(AFTER_LINK))
- quiet_cmd_vdsoas = VDSOA $@
++				    $(if $(AFTER_LINK),;$(AFTER_LINK))
+ quiet_cmd_vdsoas = VDSOA   $@
        cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
  
 diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile
@@ -91,10 +91,10 @@ index 2a8ddfd12a5b..452ca53561fe 100644
        cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
  
 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
-index 9206ac7961a5..3d7f533f6757 100644
+index 5a4affe025e8..8ff38ce94c8e 100644
 --- a/arch/x86/vdso/Makefile
 +++ b/arch/x86/vdso/Makefile
-@@ -181,8 +181,9 @@ $(obj)/vdso32-syms.lds: $(vdso32.so-y:%=$(obj)/vdso32-%-syms.lds) FORCE
+@@ -171,8 +171,9 @@ $(vdso32-images:%=$(obj)/%.dbg): $(obj)/vdso32-%.so.dbg: FORCE \
  quiet_cmd_vdso = VDSO    $@
        cmd_vdso = $(CC) -nostdlib -o $@ \
  		       $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
@@ -105,9 +105,9 @@ index 9206ac7961a5..3d7f533f6757 100644
 +		sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
  
  VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
- 		$(LTO_CFLAGS)
+ 	$(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
-index 2dcb37736d84..25e170e92ef1 100644
+index 86a4fe75f453..161637ed5611 100644
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
 @@ -65,6 +65,10 @@ vmlinux_link()
@@ -122,5 +122,5 @@ index 2dcb37736d84..25e170e92ef1 100644
  
  
 -- 
-1.8.5.3
+1.9.3
 
diff --git a/freed-ora/current/master/kernel-arm64.patch b/freed-ora/current/master/kernel-arm64.patch
index 25f0479c8..5334f7229 100644
--- a/freed-ora/current/master/kernel-arm64.patch
+++ b/freed-ora/current/master/kernel-arm64.patch
@@ -1,1146 +1,36 @@
-commit db044807ca763c21bae298388239be6177c6ccec
-Merge: 649c9e3 26bcd8b
-Author: Kyle McMartin <kmcmarti@redhat.com>
-Date:   Wed Jul 30 14:31:24 2014 -0400
+ .../devicetree/bindings/pci/xgene-pci.txt          |  52 ++
+ MAINTAINERS                                        |   7 +
+ arch/arm64/Kconfig                                 |  19 +-
+ arch/arm64/boot/dts/apm-mustang.dts                |   8 +
+ arch/arm64/boot/dts/apm-storm.dtsi                 | 180 ++++-
+ arch/arm64/include/asm/Kbuild                      |   1 +
+ arch/arm64/include/asm/elf.h                       |   3 +-
+ arch/arm64/include/asm/io.h                        |   3 +-
+ arch/arm64/include/asm/pci.h                       |  49 ++
+ arch/arm64/kernel/Makefile                         |   1 +
+ arch/arm64/kernel/efi-stub.c                       |  16 +-
+ arch/arm64/kernel/efi.c                            |  11 +
+ arch/arm64/kernel/head.S                           |   6 +-
+ arch/arm64/kernel/pci.c                            |  38 ++
+ arch/arm64/kernel/process.c                        |   6 +
+ arch/arm64/kernel/smp_spin_table.c                 |  21 +-
+ drivers/ata/ahci_xgene.c                           |   3 +-
+ drivers/irqchip/irq-gic.c                          |  32 +-
+ drivers/of/address.c                               | 108 +++
+ drivers/of/of_pci.c                                | 136 ++++
+ drivers/pci/host-bridge.c                          |  18 +-
+ drivers/pci/host/Kconfig                           |  10 +
+ drivers/pci/host/Makefile                          |   1 +
+ drivers/pci/host/pci-xgene.c                       | 725 +++++++++++++++++++++
+ drivers/pci/pci.c                                  |  37 ++
+ drivers/pci/probe.c                                |  68 +-
+ include/asm-generic/io.h                           |   2 +-
+ include/linux/of_address.h                         |  14 +-
+ include/linux/of_pci.h                             |  10 +
+ include/linux/pci.h                                |  15 +
+ tools/perf/arch/arm64/include/perf_regs.h          |   2 +
+ 31 files changed, 1533 insertions(+), 69 deletions(-)
 
-    Merge branch 'master' into devel
-    
-    Conflicts:
-    	virt/kvm/arm/vgic.c
-
-commit 649c9e3a45e81852daf80c126a332297b75cb109
-Author: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Date:   Tue Jul 29 12:49:10 2014 +0200
-
-    arm64/efi: efistub: don't abort if base of DRAM is occupied
-    
-    If we cannot relocate the kernel Image to its preferred offset of base of DRAM
-    plus TEXT_OFFSET, instead relocate it to the lowest available 2 MB boundary plus
-    TEXT_OFFSET. We may lose a bit of memory at the low end, but we can still
-    proceed normally otherwise.
-    
-    Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-
-commit 5102fd06b12467a0518537061805483a759bc856
-Author: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Date:   Tue Jul 29 12:49:09 2014 +0200
-
-    arm64/efi: efistub: cover entire static mem footprint in PE/COFF .text
-    
-    The static memory footprint of a kernel Image at boot is larger than the
-    Image file itself. Things like .bss data and initial page tables are allocated
-    statically but populated dynamically so their content is not contained in the
-    Image file.
-    
-    However, if EFI (or GRUB) has loaded the Image at precisely the desired offset
-    of base of DRAM + TEXT_OFFSET, the Image will be booted in place, and we have
-    to make sure that the allocation done by the PE/COFF loader is large enough.
-    
-    Fix this by growing the PE/COFF .text section to cover the entire static
-    memory footprint. The part of the section that is not covered by the payload
-    will be zero initialised by the PE/COFF loader.
-    
-    Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-
-commit 3b4dfb00a401b7fecf01d3c89b154907167dff52
-Author: Mark Rutland <mark.rutland@arm.com>
-Date:   Tue Jul 29 12:49:08 2014 +0200
-
-    arm64: spin-table: handle unmapped cpu-release-addrs
-    
-    In certain cases the cpu-release-addr of a CPU may not fall in the
-    linear mapping (e.g. when the kernel is loaded above this address due to
-    the presence of other images in memory). This is problematic for the
-    spin-table code as it assumes that it can trivially convert a
-    cpu-release-addr to a valid VA in the linear map.
-    
-    This patch modifies the spin-table code to use a temporary cached
-    mapping to write to a given cpu-release-addr, enabling us to support
-    addresses regardless of whether they are covered by the linear mapping.
-    
-    Signed-off-by: Mark Rutland <mark.rutland@arm.com>
-
-commit a49ad891b2e91338587dc5576c9da73b249a9d13
-Author: Mark Salter <msalter@redhat.com>
-Date:   Mon Jul 14 15:52:06 2014 -0400
-
-    pci/xgene: use pci_remap_iospace() instead of pci_ioremap_io()
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 1a958ec71db226d35ed51756b7164142bb0a60a3
-Author: Tanmay Inamdar <tinamdar@apm.com>
-Date:   Wed Mar 19 16:12:42 2014 -0700
-
-    MAINTAINERS: entry for APM X-Gene PCIe host driver
-    
-    Add entry for AppliedMicro X-Gene PCIe host driver.
-    
-    Signed-off-by: Tanmay Inamdar <tinamdar@apm.com>
-
-commit 03dc92f35b8f8be898ca12e3dc7c15961f414907
-Author: Tanmay Inamdar <tinamdar@apm.com>
-Date:   Wed Mar 19 16:12:41 2014 -0700
-
-    dt-bindings: pci: xgene pcie device tree bindings
-    
-    This patch adds the bindings for X-Gene PCIe driver. The driver resides
-    under 'drivers/pci/host/pci-xgene.c' file.
-    
-    Signed-off-by: Tanmay Inamdar <tinamdar@apm.com>
-
-commit 1f8d894f2066d9db2b251d512f6f6f772ae7147f
-Author: Tanmay Inamdar <tinamdar@apm.com>
-Date:   Wed Mar 19 16:12:40 2014 -0700
-
-    arm64: dts: APM X-Gene PCIe device tree nodes
-    
-    This patch adds the device tree nodes for APM X-Gene PCIe controller and
-    PCIe clock interface. Since X-Gene SOC supports maximum 5 ports, 5 dts
-    nodes are added.
-    
-    Signed-off-by: Tanmay Inamdar <tinamdar@apm.com>
-
-commit c0855fcf0cc9adcb1ba5e6b1318536c56244796d
-Author: Tanmay Inamdar <tinamdar@apm.com>
-Date:   Wed Mar 19 16:12:39 2014 -0700
-
-    pci: APM X-Gene PCIe controller driver
-    
-    This patch adds the AppliedMicro X-Gene SOC PCIe controller driver.
-    X-Gene PCIe controller supports maximum up to 8 lanes and GEN3 speed.
-    X-Gene SOC supports maximum 5 PCIe ports.
-    
-    Signed-off-by: Tanmay Inamdar <tinamdar@apm.com>
-
-commit 1cc0c322237d3b58b08fe39e79e6c2e2f90a8c98
-Author: Liviu Dudau <Liviu.Dudau@arm.com>
-Date:   Tue Jul 1 19:44:00 2014 +0100
-
-    arm64: Add architectural support for PCI
-    
-    Use the generic host bridge functions to provide support for
-    PCI Express on arm64.
-    
-    Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
-
-commit aba1eca911a87959eb4be515110f7a6b8692e9a4
-Author: Liviu Dudau <Liviu.Dudau@arm.com>
-Date:   Tue Jul 1 19:43:34 2014 +0100
-
-    pci: Remap I/O bus resources into CPU space with pci_remap_iospace()
-    
-    Introduce a default implementation for remapping PCI bus I/O resources
-    onto the CPU address space. Architectures with special needs may
-    provide their own version, but most should be able to use this one.
-    
-    Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
-
-commit e1eacc3da10ca19eff1f88fb342a13586092b613
-Author: Liviu Dudau <liviu@dudau.co.uk>
-Date:   Tue Jul 1 21:50:50 2014 +0100
-
-    pci: Add support for creating a generic host_bridge from device tree
-    
-    Several platforms use a rather generic version of parsing
-    the device tree to find the host bridge ranges. Move the common code
-    into the generic PCI code and use it to create a pci_host_bridge
-    structure that can be used by arch code.
-    
-    Based on early attempts by Andrew Murray to unify the code.
-    Used powerpc and microblaze PCI code as starting point.
-    
-    Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
-    Tested-by: Tanmay Inamdar <tinamdar@apm.com>
-
-commit aee55d507eb451223b51b52e6617b06b8e518ea6
-Author: Liviu Dudau <Liviu.Dudau@arm.com>
-Date:   Tue Jul 1 19:43:32 2014 +0100
-
-    pci: of: Parse and map the IRQ when adding the PCI device.
-    
-    Enhance the default implementation of pcibios_add_device() to
-    parse and map the IRQ of the device if a DT binding is available.
-    
-    Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
-
-commit 0cf0470962f0498b598ff44e0c671407df54b22e
-Author: Liviu Dudau <Liviu.Dudau@arm.com>
-Date:   Tue Jul 1 19:43:31 2014 +0100
-
-    pci: Introduce a domain number for pci_host_bridge.
-    
-    Make it easier to discover the domain number of a bus by storing
-    the number in pci_host_bridge for the root bus. Several architectures
-    have their own way of storing this information, so it makes sense
-    to try to unify the code. While at this, add a new function that
-    creates a root bus in a given domain and make pci_create_root_bus()
-    a wrapper around this function.
-    
-    Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
-    Tested-by: Tanmay Inamdar <tinamdar@apm.com>
-
-commit 1bc8fcf01469c202b4aea5f1d0a3a75c9302f3e2
-Author: Liviu Dudau <Liviu.Dudau@arm.com>
-Date:   Tue Jul 1 19:43:30 2014 +0100
-
-    pci: Create pci_host_bridge before its associated bus in pci_create_root_bus.
-    
-    Before commit 7b5436635800 the pci_host_bridge was created before the root bus.
-    As that commit has added a needless dependency on the bus for pci_alloc_host_bridge()
-    the creation order has been changed for no good reason. Revert the order of
-    creation as we are going to depend on the pci_host_bridge structure to retrieve the
-    domain number of the root bus.
-    
-    Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
-    Acked-by: Grant Likely <grant.likely@linaro.org>
-    Tested-by: Tanmay Inamdar <tinamdar@apm.com>
-
-commit 55353327169dc08c1047d994e00b8a38630f5a8d
-Author: Liviu Dudau <Liviu.Dudau@arm.com>
-Date:   Tue Jul 1 19:43:29 2014 +0100
-
-    pci: OF: Fix the conversion of IO ranges into IO resources.
-    
-    The ranges property for a host bridge controller in DT describes
-    the mapping between the PCI bus address and the CPU physical address.
-    The resources framework however expects that the IO resources start
-    at a pseudo "port" address 0 (zero) and have a maximum size of IO_SPACE_LIMIT.
-    The conversion from pci ranges to resources failed to take that into account.
-    
-    In the process move the function into drivers/of/address.c as it now
-    depends on pci_address_to_pio() code and make it return an error message.
-    
-    Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
-    Tested-by: Tanmay Inamdar <tinamdar@apm.com>
-
-commit 34079a20796d5c74e2984c37a99baef4871709a6
-Author: Liviu Dudau <Liviu.Dudau@arm.com>
-Date:   Tue Jul 1 19:43:28 2014 +0100
-
-    pci: Introduce pci_register_io_range() helper function.
-    
-    Some architectures do not have a simple view of the PCI I/O space
-    and instead use a range of CPU addresses that map to bus addresses. For
-    some architectures these ranges will be expressed by OF bindings
-    in a device tree file.
-    
-    Introduce a pci_register_io_range() helper function with a generic
-    implementation that can be used by such architectures to keep track
-    of the I/O ranges described by the PCI bindings. If the PCI_IOBASE
-    macro is not defined that signals lack of support for PCI and we
-    return an error.
-    
-    Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
-
-commit a81abc095ab4b9b90e446ddbd59247e23df9d4ad
-Author: Liviu Dudau <Liviu.Dudau@arm.com>
-Date:   Tue Jul 1 19:43:27 2014 +0100
-
-    pci: Export find_pci_host_bridge() function.
-    
-    This is a useful function and we should make it visible outside the
-    generic PCI code. Export it as a GPL symbol.
-    
-    Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
-    Tested-by: Tanmay Inamdar <tinamdar@apm.com>
-
-commit 78361698444e81bedbf30ec2b7aae1afd110d11f
-Author: Liviu Dudau <Liviu.Dudau@arm.com>
-Date:   Tue Jul 1 19:43:26 2014 +0100
-
-    Fix ioport_map() for !CONFIG_GENERIC_IOMAP cases.
-    
-    The inline version of ioport_map() that gets used when !CONFIG_GENERIC_IOMAP
-    is wrong. It returns a mapped (i.e. virtual) address that can start from
-    zero and completely ignores the PCI_IOBASE and IO_SPACE_LIMIT that most
-    architectures that use !CONFIG_GENERIC_MAP define.
-    
-    Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
-    Acked-by: Arnd Bergmann <arnd@arndb.de>
-    Tested-by: Tanmay Inamdar <tinamdar@apm.com>
-
-commit 5540bbe2eca72e37be2e6a1c18e2fc7e73f0eab6
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:50 2014 +0100
-
-    arm64: KVM: vgic: enable GICv2 emulation on top on GICv3 hardware
-    
-    Add the last missing bits that enable GICv2 emulation on top of
-    GICv3 hardware.
-    
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit f057aaf81a7df641bcaa992965a257e3260ad36e
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:49 2014 +0100
-
-    arm64: KVM: vgic: add GICv3 world switch
-    
-    Introduce the GICv3 world switch code used to save/restore the
-    GICv3 context.
-    
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 7f1b8a791bb375933fdc8420cd08f127d07dd259
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:48 2014 +0100
-
-    KVM: ARM: vgic: add the GICv3 backend
-    
-    Introduce the support code for emulating a GICv2 on top of GICv3
-    hardware.
-    
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 74428905c3b450eab53a21bee74236501629a443
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:47 2014 +0100
-
-    arm64: KVM: move HCR_EL2.{IMO, FMO} manipulation into the vgic switch code
-    
-    GICv3 requires the IMO and FMO bits to be tightly coupled with some
-    of the interrupt controller's register switch.
-    
-    In order to have similar code paths, move the manipulation of these
-    bits to the GICv2 switch code.
-    
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit b691c1f97f1fb5b29c3ae4cc836fdbefe61a11ff
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:46 2014 +0100
-
-    arm64: KVM: split GICv2 world switch from hyp code
-    
-    Move the GICv2 world switch code into its own file, and add the
-    necessary indirection to the arm64 switch code.
-    
-    Also introduce a new type field to the vgic_params structure.
-    
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit d3f4563f1bebed7f60f714bdab640e477a081c4b
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:45 2014 +0100
-
-    arm64: KVM: remove __kvm_hyp_code_{start, end} from hyp.S
-    
-    We already have __hyp_text_{start,end} to express the boundaries
-    of the HYP text section, and __kvm_hyp_code_{start,end} are getting
-    in the way of a more modular world switch code.
-    
-    Just turn __kvm_hyp_code_{start,end} into #defines mapping the
-    linker-emited symbols.
-    
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 8ede261e09ad25ab8229d5efb476d5b4f6dc6434
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:44 2014 +0100
-
-    KVM: ARM: vgic: revisit implementation of irqchip_in_kernel
-    
-    So far, irqchip_in_kernel() was implemented by testing the value of
-    vctrl_base, which worked fine with GICv2.
-    
-    With GICv3, this field is useless, as we're using system registers
-    instead of a emmory mapped interface. To solve this, add a boolean
-    flag indicating if the we're using a vgic or not.
-    
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit ff7faf70feb47e5f1cf1e0f0d02e0f2807da11f5
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:43 2014 +0100
-
-    KVM: ARM: vgic: split GICv2 backend from the main vgic code
-    
-    Brutally hack the innocent vgic code, and move the GICv2 specific code
-    to its own file, using vgic_ops and vgic_params as a way to pass
-    information between the two blocks.
-    
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 63480283c0e1dc92f506e5e5306be0ac9b239499
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:42 2014 +0100
-
-    KVM: ARM: introduce vgic_params structure
-    
-    Move all the data specific to a given GIC implementation into its own
-    little structure.
-    
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit dcb20f9b66d5615a3e7e492424fa7953c1fe9f01
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:41 2014 +0100
-
-    KVM: ARM: vgic: introduce vgic_enable
-    
-    Move the code dealing with enabling the VGIC on to vgic_ops.
-    
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 67e3bcf8dd823eec79c74bc993fa62fb08b1acea
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:40 2014 +0100
-
-    KVM: ARM: vgic: abstract VMCR access
-    
-    Instead of directly messing with with the GICH_VMCR bits for the CPU
-    interface save/restore code, add accessors that encode/decode the
-    entire set of registers exposed by VMCR.
-    
-    Not the most efficient thing, but given that this code is only used
-    by the save/restore code, performance is far from being critical.
-    
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 67caf34f138a4f2516a2afcd5657add2eaaf0ab4
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:39 2014 +0100
-
-    KVM: ARM: vgic: move underflow handling to vgic_ops
-    
-    Move the code dealing with LR underflow handling to its own functions,
-    and make them accessible through vgic_ops.
-    
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 30acb0a340d388135ae89bed7e248bad203ec876
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:38 2014 +0100
-
-    KVM: ARM: vgic: abstract MISR decoding
-    
-    Instead of directly dealing with the GICH_MISR bits, move the code to
-    its own function and use a couple of public flags to represent the
-    actual state.
-    
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 464cbe47011e07b654d161ab4d4bdd05b4d025b3
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:37 2014 +0100
-
-    KVM: ARM: vgic: abstract EISR bitmap access
-    
-    Move the GICH_EISR access to its own function.
-    
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 33930dc5f401e9fc2268c2f128853eb5275e7ab1
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:36 2014 +0100
-
-    KVM: ARM: vgic: abstract access to the ELRSR bitmap
-    
-    Move the GICH_ELRSR access to its own functions, and add them to
-    the vgic_ops structure.
-    
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 0dca962ccd5b96fb7174880c1bc25085dcc09927
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:35 2014 +0100
-
-    KVM: ARM: vgic: introduce vgic_ops and LR manipulation primitives
-    
-    In order to split the various register manipulation from the main vgic
-    code, introduce a vgic_ops structure, and start by abstracting the
-    LR manipulation code with a couple of accessors.
-    
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit e66aa6cbdaa25764c58ba8d21da8d1b7d75e7570
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:34 2014 +0100
-
-    KVM: arm/arm64: vgic: move GICv2 registers to their own structure
-    
-    In order to make way for the GICv3 registers, move the v2-specific
-    registers to their own structure.
-    
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit b04259737c6bb38592c02c93e939fd53909dad04
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:33 2014 +0100
-
-    arm64: boot protocol documentation update for GICv3
-    
-    Linux has some requirements that must be satisfied in order to boot
-    on a system built with a GICv3.
-    
-    Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit a864693311bd4305214d966b7ca0e0015216c2c4
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:32 2014 +0100
-
-    arm64: GICv3 device tree binding documentation
-    
-    Add the necessary documentation to support GICv3.
-    
-    Cc: Thomas Gleixner <tglx@linutronix.de>
-    Cc: Mark Rutland <mark.rutland@arm.com>
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Acked-by: Rob Herring <robh@kernel.org>
-    Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit af3035d3ddddb6e19bac9295f0c785bb2c8e718c
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:31 2014 +0100
-
-    irqchip: arm64: Initial support for GICv3
-    
-    The Generic Interrupt Controller (version 3) offers services that are
-    similar to GICv2, with a number of additional features:
-    - Affinity routing based on the CPU MPIDR (ARE)
-    - System register for the CPU interfaces (SRE)
-    - Support for more that 8 CPUs
-    - Locality-specific Peripheral Interrupts (LPIs)
-    - Interrupt Translation Services (ITS)
-    
-    This patch adds preliminary support for GICv3 with ARE and SRE,
-    non-secure mode only. It relies on higher exception levels to grant ARE
-    and SRE access.
-    
-    Support for LPI and ITS will be added at a later time.
-    
-    Cc: Thomas Gleixner <tglx@linutronix.de>
-    Cc: Jason Cooper <jason@lakedaemon.net>
-    Reviewed-by: Zi Shen Lim <zlim@broadcom.com>
-    Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Reviewed-by: Tirumalesh Chalamarla <tchalamarla@cavium.com>
-    Reviewed-by: Yun Wu <wuyun.wu@huawei.com>
-    Reviewed-by: Zhen Lei <thunder.leizhen@huawei.com>
-    Tested-by: Tirumalesh Chalamarla<tchalamarla@cavium.com>
-    Tested-by: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>
-    Acked-by: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>
-    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit c50b02761c3ad5d37ce8fffe7c0bf6b46d23109e
-Author: Marc Zyngier <marc.zyngier@arm.com>
-Date:   Mon Jun 30 16:01:30 2014 +0100
-
-    irqchip: ARM: GIC: Move some bits of GICv2 to a library-type file
-    
-    A few GICv2 low-level function are actually very useful to GICv3,
-    and it makes some sense to share them across the two drivers.
-    They end-up in their own file, with an additional parameter used
-    to ensure an optional synchronization (unused on GICv2).
-    
-    Cc: Thomas Gleixner <tglx@linutronix.de>
-    Cc: Jason Cooper <jason@lakedaemon.net>
-    Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
-    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 6a6033cdcbf6022c2848e2181ed6d8b7545af02e
-Author: Mark Salter <msalter@redhat.com>
-Date:   Tue Jun 24 23:16:45 2014 -0400
-
-    perf: fix arm64 build error
-    
-    I'm seeing the following build error on arm64:
-    
-      In file included from util/event.c:3:0:
-      util/event.h:95:17: error: 'PERF_REGS_MAX' undeclared here (not in a function)
-        u64 cache_regs[PERF_REGS_MAX];
-                     ^
-    
-    This patch adds a PEFF_REGS_MAX definition for arm64.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 1de8987fa549d421576c1b61282c4041c8c78a5f
-Author: Mark Salter <msalter@redhat.com>
-Date:   Tue Jun 24 09:50:28 2014 -0400
-
-    arm64: use EFI as last resort for reboot and poweroff
-    
-    Wire in support for EFI reboot and poweroff functions. We use these
-    only if no other mechanism has been registered with arm_pm_reboot
-    and/or pm_power_off respectively.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 1c973051e86625be7ffb3db90d4a70b9ca4199c6
-Author: Matt Fleming <matt.fleming@intel.com>
-Date:   Fri Jun 13 12:39:55 2014 +0100
-
-    x86/reboot: Add EFI reboot quirk for ACPI Hardware Reduced flag
-    
-    It appears that the BayTrail-T class of hardware requires EFI in order
-    to powerdown and reboot and no other reliable method exists.
-    
-    This quirk is generally applicable to all hardware that has the ACPI
-    Hardware Reduced bit set, since usually ACPI would be the preferred
-    method.
-    
-    Cc: Len Brown <len.brown@intel.com>
-    Cc: Mark Salter <msalter@redhat.com>
-    Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
-    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-
-commit 621b2a0f1df86bd2f147799303b94575f3acee95
-Author: Matt Fleming <matt.fleming@intel.com>
-Date:   Fri Jun 13 12:35:21 2014 +0100
-
-    efi/reboot: Allow powering off machines using EFI
-    
-    Not only can EfiResetSystem() be used to reboot, it can also be used to
-    power down machines.
-    
-    By and large, this functionality doesn't work very well across the range
-    of EFI machines in the wild, so it should definitely only be used as a
-    last resort. In an ideal world, this wouldn't be needed at all.
-    
-    Unfortunately, we're starting to see machines where EFI is the *only*
-    reliable way to power down, and nothing else, not PCI, not ACPI, works.
-    
-    efi_poweroff_required() should be implemented on a per-architecture
-    basis, since exactly when we should be using EFI runtime services is a
-    platform-specific decision. There's no analogue for reboot because each
-    architecture handles reboot very differently - the x86 code in
-    particular is pretty complex.
-    
-    Patches to enable this for specific classes of hardware will be
-    submitted separately.
-    
-    Cc: Mark Salter <msalter@redhat.com>
-    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-
-commit 6b2e219b20933cad5d5ba34f7af4efc5317c0fb9
-Author: Matt Fleming <matt.fleming@intel.com>
-Date:   Fri Jun 13 12:22:22 2014 +0100
-
-    efi/reboot: Add generic wrapper around EfiResetSystem()
-    
-    Implement efi_reboot(), which is really just a wrapper around the
-    EfiResetSystem() EFI runtime service, but it does at least allow us to
-    funnel all callers through a single location.
-    
-    It also simplifies the callsites since users no longer need to check to
-    see whether EFI_RUNTIME_SERVICES are enabled.
-    
-    Cc: Tony Luck <tony.luck@intel.com>
-    Cc: Mark Salter <msalter@redhat.com>
-    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-
-commit d0d41b99122d97f81ad05868dff38ccf0a3ffd33
-Author: Saurabh Tangri <saurabh.tangri@intel.com>
-Date:   Mon Jun 2 05:18:35 2014 -0700
-
-    x86/efi: Move all workarounds to a separate file quirks.c
-    
-    Currently, it's difficult to find all the workarounds that are
-    applied when running on EFI, because they're littered throughout
-    various code paths. This change moves all of them into a separate
-    file with the hope that it will be come the single location for all
-    our well documented quirks.
-    
-    Signed-off-by: Saurabh Tangri <saurabh.tangri@intel.com>
-    Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-
-commit b5e3a1e8825abb0406ead0e85436df4df20ddcdb
-Author: Don Dutile <ddutile@redhat.com>
-Date:   Tue Mar 25 20:22:26 2014 -0400
-
-    pmu: Adding support for Xgene PMUs
-    
-    Message-id: <1395778948-47814-2-git-send-email-ddutile@redhat.com>
-    Patchwork-id: 78602
-    O-Subject: [PATCH 1/3] pmu: Adding support for Xgene PMUs
-    Bugzilla: 1079110
-    
-    Backport of these two posted (but not upstream) patches.
-    Combined into single patch due to gic-patch dependency.
-    
-    Signed-off-by: Donald Dutile <ddutile@redhat.com>
-
-commit 9f4c27693bb120a3134e3e7e8d452fb02d023e2b
-Author: Mark Salter <msalter@redhat.com>
-Date:   Sun Jun 15 09:06:55 2014 -0400
-
-    arm64: fix up APM Mustang devicetree
-    
-    These are changes needed when loading device tree blob built with
-    kernel. i.e. with grub. These are not needed when using devicetree
-    from Tianocore which will be fixed up at tianocore runtime.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 1f3a5b228be88be3f734d7a43db3b3f81e160443
-Author: Iyappan Subramanian <isubramanian@apm.com>
-Date:   Mon Jul 14 15:18:05 2014 -0700
-
-    drivers: net: Add APM X-Gene SoC ethernet driver support.
-    
-    This patch adds network driver for APM X-Gene SoC ethernet.
-    
-    Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
-    Signed-off-by: Ravi Patel <rapatel@apm.com>
-    Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
-
-commit 54b3fe04c4a953eeb6907ffe9f57aae282f59457
-Author: Iyappan Subramanian <isubramanian@apm.com>
-Date:   Mon Jul 14 15:18:04 2014 -0700
-
-    dts: Add bindings for APM X-Gene SoC ethernet driver
-    
-    This patch adds bindings for APM X-Gene SoC ethernet driver.
-    
-    Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
-    Signed-off-by: Ravi Patel <rapatel@apm.com>
-    Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
-
-commit 85125c4e1c1b1ef53d6cb77966efa89062540f43
-Author: Iyappan Subramanian <isubramanian@apm.com>
-Date:   Mon Jul 14 15:18:03 2014 -0700
-
-    Documentation: dts: Add bindings for APM X-Gene SoC ethernet driver
-    
-    This patch adds documentation for APM X-Gene SoC ethernet DTS binding.
-    
-    Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
-    Signed-off-by: Ravi Patel <rapatel@apm.com>
-    Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
-
-commit fe8ec437eedc45384c23e1e12a09baa82d24fa16
-Author: Iyappan Subramanian <isubramanian@apm.com>
-Date:   Mon Jul 14 15:18:02 2014 -0700
-
-    MAINTAINERS: Add entry for APM X-Gene SoC ethernet driver
-    
-    This patch adds a MAINTAINERS entry for APM X-Gene SoC
-    ethernet driver.
-    
-    Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
-    Signed-off-by: Ravi Patel <rapatel@apm.com>
-    Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
-
-commit 237639e43c3d6587985a736f33264e129123d7a5
-Author: Mark Salter <msalter@redhat.com>
-Date:   Fri Jul 25 15:14:32 2014 -0400
-
-    arm/kvm: WIP fix for stage2 pgd memory leak
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 0794e2900e5e4be4b7aa0b389e6b0bf8b55c5cd7
-Author: Mark Salter <msalter@redhat.com>
-Date:   Thu Jul 17 13:34:50 2014 -0400
-
-    ahci_xgene: add errata workaround for ATA_CMD_SMART
-    
-    commit 2a0bdff6b958d1b2:
-    
-     ahci_xgene: fix the dma state machine lockup for the IDENTIFY DEVICE PIO mode command.
-    
-    added a workaround for X-Gene AHCI controller errata. This was done
-    for all ATA_CMD_ID_ATA commands. The errata also appears to affect
-    ATA_CMD_SMART commands as well. This was discovered when running
-    smartd or just smartctl -x. This patch adds a dma engine restart for
-    ATA_CMD_SMART commands which clears up the issues seen with smartd.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-
-commit 7adf85b63608b8bea1148f2faa84f475252a9e43
-Author: Mark Salter <msalter@redhat.com>
-Date:   Fri Jul 25 15:32:05 2014 -0400
-
-    rtc: ia64: allow other architectures to use EFI RTC
-    
-    Currently, the rtc-efi driver is restricted to ia64 only.  Newer
-    architectures with EFI support may want to also use that driver. This
-    patch moves the platform device setup from ia64 into drivers/rtc and allow
-    any architecture with CONFIG_EFI=y to use the rtc-efi driver.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-    Cc: Alessandro Zummo <a.zummo@towertech.it>
-    Cc: Tony Luck <tony.luck@intel.com>
-    Cc: Fenghua Yu <fenghua.yu@intel.com>
-    Cc: Andrew Morton <akpm@linux-foundation.org>
-
-commit 3b2f96c7a6bfbd46e7dee1d7000081422a7983ce
-Author: Kyle McMartin <kmcmarti@redhat.com>
-Date:   Tue May 13 22:25:26 2014 -0400
-
-    arm64: don't set READ_IMPLIES_EXEC for EM_AARCH64 ELF objects
-    
-    Message-id: <20140513222526.GC26038@redacted.bos.redhat.com>
-    Patchwork-id: 79789
-    O-Subject: [ACADIA PATCH] arm64: don't set READ_IMPLIES_EXEC for EM_AARCH64 ELF objects
-    Bugzilla: 1085528
-    
-    BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1085528
-    Upstream: submitted soon
-    
-    [Sadly this isn't (yet) sufficient... but it fixes at least one issue
-     here... cat /proc/$$/personality shows READ_IMPLIES_EXEC before. I'll
-     try to figure the rest out tomorrow.]
-    
-    Currently, we're accidentally ending up with executable stacks on
-    AArch64 when the ABI says we shouldn't be, and relying on glibc to fix
-    things up for us when we're loaded. However, SELinux will deny us
-    mucking with the stack, and hit us with execmem AVCs.
-    
-    The reason this is happening is somewhat complex:
-    
-    fs/binfmt_elf.c:load_elf_binary()
-     - initializes executable_stack = EXSTACK_DEFAULT implying the
-       architecture should make up its mind.
-     - does a pile of loading goo
-     - runs through the program headers, looking for PT_GNU_STACK
-       and setting (or unsetting) executable_stack if it finds it.
-    
-       This is our first problem, we won't generate these unless an
-       executable stack is explicitly requested.
-    
-     - more ELF loading goo
-     - sets whether we're a compat task or not (TIF_32BIT) based on compat.h
-     - for compat reasons (pre-GNU_STACK) checks if the READ_IMPLIES_EXEC
-       flag should be set for ancient toolchains
-    
-       Here's our second problem, we test if read_implies_exec based on
-       stk != EXSTACK_DISABLE_X, which is true since stk == EXSTACK_DEFAULT.
-    
-       So we set current->personality |= READ_IMPLIES_EXEC like a broken
-       legacy toolchain would want.
-    
-     - Now we call setup_arg_pages to set up the stack...
-    
-    fs/exec.c:setup_arg_pages()
-     - lots of magic happens here
-     - vm_flags gets initialized to VM_STACK_FLAGS
-    
-       Here's our third problem, VM_STACK_FLAGS on arm64 is
-       VM_DEFAULT_DATA_FLAG which tests READ_IMPLIES_EXEC and sets VM_EXEC
-       if it's true. So we end up with an executable stack mapping, since we
-       don't have executable_stack set (it's still EXSTACK_DEFAULT at this
-       point) to unset it anywhere.
-    
-    Bang. execstack AVC when the program starts running.
-    
-    The easiest way I can see to fix this is to test if we're a legacy task
-    and fix it up there. But that's not as simple as it sounds, because
-    the 32-bit ABI depends on what revision of the CPU we've enabled (not
-    that it matters since we're ARMv8...) Regardless, in the compat case,
-    set READ_IMPLIES_EXEC if we've found a GNU_STACK header which explicitly
-    requested it as in arch/arm/kernel/elf.c:arm_elf_read_implies_exec().
-    
-    Signed-off-by: Kyle McMartin <kmcmarti@redhat.com>
-    Signed-off-by: Donald Dutile <ddutile@redhat.com>
-
-commit 4b866971e92b925a44da8d876cb57864942a90b8
-Author: Mark Salter <msalter@redhat.com>
-Date:   Thu Jul 24 15:56:15 2014 +0100
-
-    arm64: fix soft lockup due to large tlb flush range
-    
-    Under certain loads, this soft lockup has been observed:
-    
-       BUG: soft lockup - CPU#2 stuck for 22s! [ip6tables:1016]
-       Modules linked in: ip6t_rpfilter ip6t_REJECT cfg80211 rfkill xt_conntrack ebtable_nat ebtable_broute bridge stp llc ebtable_filter ebtables ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6 ip6table_mangle ip6table_security ip6table_raw ip6table_filter ip6_tables iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4 nf_nat nf_conntrack iptable_mangle iptable_security iptable_raw vfat fat efivarfs xfs libcrc32c
-    
-       CPU: 2 PID: 1016 Comm: ip6tables Not tainted 3.13.0-0.rc7.30.sa2.aarch64 #1
-       task: fffffe03e81d1400 ti: fffffe03f01f8000 task.ti: fffffe03f01f8000
-       PC is at __cpu_flush_kern_tlb_range+0xc/0x40
-       LR is at __purge_vmap_area_lazy+0x28c/0x3ac
-       pc : [<fffffe000009c5cc>] lr : [<fffffe0000182710>] pstate: 80000145
-       sp : fffffe03f01fbb70
-       x29: fffffe03f01fbb70 x28: fffffe03f01f8000
-       x27: fffffe0000b19000 x26: 00000000000000d0
-       x25: 000000000000001c x24: fffffe03f01fbc50
-       x23: fffffe03f01fbc58 x22: fffffe03f01fbc10
-       x21: fffffe0000b2a3f8 x20: 0000000000000802
-       x19: fffffe0000b2a3c8 x18: 000003fffdf52710
-       x17: 000003ff9d8bb910 x16: fffffe000050fbfc
-       x15: 0000000000005735 x14: 000003ff9d7e1a5c
-       x13: 0000000000000000 x12: 000003ff9d7e1a5c
-       x11: 0000000000000007 x10: fffffe0000c09af0
-       x9 : fffffe0000ad1000 x8 : 000000000000005c
-       x7 : fffffe03e8624000 x6 : 0000000000000000
-       x5 : 0000000000000000 x4 : 0000000000000000
-       x3 : fffffe0000c09cc8 x2 : 0000000000000000
-       x1 : 000fffffdfffca80 x0 : 000fffffcd742150
-    
-    The __cpu_flush_kern_tlb_range() function looks like:
-    
-      ENTRY(__cpu_flush_kern_tlb_range)
-    	dsb	sy
-    	lsr	x0, x0, #12
-    	lsr	x1, x1, #12
-      1:	tlbi	vaae1is, x0
-    	add	x0, x0, #1
-    	cmp	x0, x1
-    	b.lo	1b
-    	dsb	sy
-    	isb
-    	ret
-      ENDPROC(__cpu_flush_kern_tlb_range)
-    
-    The above soft lockup shows the PC at tlbi insn with:
-    
-      x0 = 0x000fffffcd742150
-      x1 = 0x000fffffdfffca80
-    
-    So __cpu_flush_kern_tlb_range has 0x128ba930 tlbi flushes left
-    after it has already been looping for 23 seconds!.
-    
-    Looking up one frame at __purge_vmap_area_lazy(), there is:
-    
-    	...
-    	list_for_each_entry_rcu(va, &vmap_area_list, list) {
-    		if (va->flags & VM_LAZY_FREE) {
-    			if (va->va_start < *start)
-    				*start = va->va_start;
-    			if (va->va_end > *end)
-    				*end = va->va_end;
-    			nr += (va->va_end - va->va_start) >> PAGE_SHIFT;
-    			list_add_tail(&va->purge_list, &valist);
-    			va->flags |= VM_LAZY_FREEING;
-    			va->flags &= ~VM_LAZY_FREE;
-    		}
-    	}
-    	...
-    	if (nr || force_flush)
-    		flush_tlb_kernel_range(*start, *end);
-    
-    So if two areas are being freed, the range passed to
-    flush_tlb_kernel_range() may be as large as the vmalloc
-    space. For arm64, this is ~240GB for 4k pagesize and ~2TB
-    for 64kpage size.
-    
-    This patch works around this problem by adding a loop limit.
-    If the range is larger than the limit, use flush_tlb_all()
-    rather than flushing based on individual pages. The limit
-    chosen is arbitrary as the TLB size is implementation
-    specific and not accessible in an architected way. The aim
-    of the arbitrary limit is to avoid soft lockup.
-    
-    Signed-off-by: Mark Salter <msalter@redhat.com>
-    [catalin.marinas@arm.com: commit log update]
-    [catalin.marinas@arm.com: marginal optimisation]
-    [catalin.marinas@arm.com: changed to MAX_TLB_RANGE and added comment]
-    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-
-diff --git a/Documentation/arm64/booting.txt b/Documentation/arm64/booting.txt
-index 37fc4f6..da1d4bf 100644
---- a/Documentation/arm64/booting.txt
-+++ b/Documentation/arm64/booting.txt
-@@ -141,6 +141,14 @@ Before jumping into the kernel, the following conditions must be met:
-   the kernel image will be entered must be initialised by software at a
-   higher exception level to prevent execution in an UNKNOWN state.
- 
-+  For systems with a GICv3 interrupt controller:
-+  - If EL3 is present:
-+    ICC_SRE_EL3.Enable (bit 3) must be initialiased to 0b1.
-+    ICC_SRE_EL3.SRE (bit 0) must be initialised to 0b1.
-+  - If the kernel is entered at EL1:
-+    ICC.SRE_EL2.Enable (bit 3) must be initialised to 0b1
-+    ICC_SRE_EL2.SRE (bit 0) must be initialised to 0b1.
-+
- The requirements described above for CPU mode, caches, MMUs, architected
- timers, coherency and system registers apply to all CPUs.  All CPUs must
- enter the kernel in the same exception level.
-diff --git a/Documentation/devicetree/bindings/arm/gic-v3.txt b/Documentation/devicetree/bindings/arm/gic-v3.txt
-new file mode 100644
-index 0000000..33cd05e
---- /dev/null
-+++ b/Documentation/devicetree/bindings/arm/gic-v3.txt
-@@ -0,0 +1,79 @@
-+* ARM Generic Interrupt Controller, version 3
-+
-+AArch64 SMP cores are often associated with a GICv3, providing Private
-+Peripheral Interrupts (PPI), Shared Peripheral Interrupts (SPI),
-+Software Generated Interrupts (SGI), and Locality-specific Peripheral
-+Interrupts (LPI).
-+
-+Main node required properties:
-+
-+- compatible : should at least contain  "arm,gic-v3".
-+- interrupt-controller : Identifies the node as an interrupt controller
-+- #interrupt-cells : Specifies the number of cells needed to encode an
-+  interrupt source. Must be a single cell with a value of at least 3.
-+
-+  The 1st cell is the interrupt type; 0 for SPI interrupts, 1 for PPI
-+  interrupts. Other values are reserved for future use.
-+
-+  The 2nd cell contains the interrupt number for the interrupt type.
-+  SPI interrupts are in the range [0-987]. PPI interrupts are in the
-+  range [0-15].
-+
-+  The 3rd cell is the flags, encoded as follows:
-+	bits[3:0] trigger type and level flags.
-+		1 = edge triggered
-+		4 = level triggered
-+
-+  Cells 4 and beyond are reserved for future use. When the 1st cell
-+  has a value of 0 or 1, cells 4 and beyond act as padding, and may be
-+  ignored. It is recommended that padding cells have a value of 0.
-+
-+- reg : Specifies base physical address(s) and size of the GIC
-+  registers, in the following order:
-+  - GIC Distributor interface (GICD)
-+  - GIC Redistributors (GICR), one range per redistributor region
-+  - GIC CPU interface (GICC)
-+  - GIC Hypervisor interface (GICH)
-+  - GIC Virtual CPU interface (GICV)
-+
-+  GICC, GICH and GICV are optional.
-+
-+- interrupts : Interrupt source of the VGIC maintenance interrupt.
-+
-+Optional
-+
-+- redistributor-stride : If using padding pages, specifies the stride
-+  of consecutive redistributors. Must be a multiple of 64kB.
-+
-+- #redistributor-regions: The number of independent contiguous regions
-+  occupied by the redistributors. Required if more than one such
-+  region is present.
-+
-+Examples:
-+
-+	gic: interrupt-controller@2cf00000 {
-+		compatible = "arm,gic-v3";
-+		#interrupt-cells = <3>;
-+		interrupt-controller;
-+		reg = <0x0 0x2f000000 0 0x10000>,	// GICD
-+		      <0x0 0x2f100000 0 0x200000>,	// GICR
-+		      <0x0 0x2c000000 0 0x2000>,	// GICC
-+		      <0x0 0x2c010000 0 0x2000>,	// GICH
-+		      <0x0 0x2c020000 0 0x2000>;	// GICV
-+		interrupts = <1 9 4>;
-+	};
-+
-+	gic: interrupt-controller@2c010000 {
-+		compatible = "arm,gic-v3";
-+		#interrupt-cells = <3>;
-+		interrupt-controller;
-+		redistributor-stride = <0x0 0x40000>;	// 256kB stride
-+		#redistributor-regions = <2>;
-+		reg = <0x0 0x2c010000 0 0x10000>,	// GICD
-+		      <0x0 0x2d000000 0 0x800000>,	// GICR 1: CPUs 0-31
-+		      <0x0 0x2e000000 0 0x800000>;	// GICR 2: CPUs 32-63
-+		      <0x0 0x2c040000 0 0x2000>,	// GICC
-+		      <0x0 0x2c060000 0 0x2000>,	// GICH
-+		      <0x0 0x2c080000 0 0x2000>;	// GICV
-+		interrupts = <1 9 4>;
-+	};
-diff --git a/Documentation/devicetree/bindings/net/apm-xgene-enet.txt b/Documentation/devicetree/bindings/net/apm-xgene-enet.txt
-new file mode 100644
-index 0000000..3e2a295
---- /dev/null
-+++ b/Documentation/devicetree/bindings/net/apm-xgene-enet.txt
-@@ -0,0 +1,72 @@
-+APM X-Gene SoC Ethernet nodes
-+
-+Ethernet nodes are defined to describe on-chip ethernet interfaces in
-+APM X-Gene SoC.
-+
-+Required properties:
-+- compatible:		Should be "apm,xgene-enet"
-+- reg: Address and length of the register set for the device. It contains the
-+       information of registers in the same order as described by reg-names
-+- reg-names: Should contain the register set names
-+  "enet_csr":		Ethernet control and status register address space
-+  "ring_csr":		Descriptor ring control and status register address space
-+  "ring_cmd":		Descriptor ring command register address space
-+- interrupts:		Ethernet main interrupt
-+- clocks:		Reference to the clock entry.
-+- local-mac-address:	MAC address assigned to this device
-+- phy-connection-type:	Interface type between ethernet device and PHY device
-+- phy-handle:		Reference to a PHY node connected to this device
-+
-+- mdio: 		Device tree subnode with the following required
-+			properties:
-+
-+	- compatible: Must be "apm,xgene-mdio".
-+	- #address-cells: Must be <1>.
-+	- #size-cells: Must be <0>.
-+
-+	For the phy on the mdio bus, there must be a node with the following
-+	fields:
-+
-+	- compatible: PHY identifier.  Please refer ./phy.txt for the format.
-+	- reg: The ID number for the phy.
-+
-+Optional properties:
-+- status		: Should be "ok" or "disabled" for enabled/disabled.
-+			  Default is "ok".
-+
-+
-+Example:
-+	menetclk: menetclk {
-+		compatible = "apm,xgene-device-clock";
-+		clock-output-names = "menetclk";
-+		status = "ok";
-+	};
-+
-+	menet: ethernet@17020000 {
-+		compatible = "apm,xgene-enet";
-+		status = "disabled";
-+		reg = <0x0 0x17020000 0x0 0xd100>,
-+		      <0x0 0X17030000 0x0 0X400>,
-+		      <0x0 0X10000000 0x0 0X200>;
-+		reg-names = "enet_csr", "ring_csr", "ring_cmd";
-+		interrupts = <0x0 0x3c 0x4>;
-+		clocks = <&menetclk 0>;
-+		local-mac-address = [00 01 73 00 00 01];
-+		phy-connection-type = "rgmii";
-+		phy-handle = <&menetphy>;
-+		mdio {
-+			compatible = "apm,xgene-mdio";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			menetphy: menetphy@3 {
-+				compatible = "ethernet-phy-id001c.c915";
-+				reg = <0x3>;
-+			};
-+
-+		};
-+	};
-+
-+/* Board-specific peripheral configurations */
-+&menet {
-+        status = "ok";
-+};
 diff --git a/Documentation/devicetree/bindings/pci/xgene-pci.txt b/Documentation/devicetree/bindings/pci/xgene-pci.txt
 new file mode 100644
 index 0000000..e19fdb8
@@ -1200,27 +90,12 @@ index 0000000..e19fdb8
 +		status = "ok";
 +	};
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 86efa7e..14a3ef1 100644
+index 2f85f55..8980971 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -699,6 +699,14 @@ S:	Maintained
- F:	drivers/net/appletalk/
- F:	net/appletalk/
- 
-+APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
-+M:	Iyappan Subramanian <isubramanian@apm.com>
-+M:	Keyur Chudgar <kchudgar@apm.com>
-+M:	Ravi Patel <rapatel@apm.com>
-+S:	Supported
-+F:	drivers/net/ethernet/apm/xgene/
-+F:	Documentation/devicetree/bindings/net/apm-xgene-enet.txt
-+
- APTINA CAMERA SENSOR PLL
- M:	Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
- L:	linux-media@vger.kernel.org
-@@ -6851,6 +6859,13 @@ S:	Maintained
- F:	Documentation/devicetree/bindings/pci/host-generic-pci.txt
- F:	drivers/pci/host/pci-host-generic.c
+@@ -6894,6 +6894,13 @@ L:	linux-pci@vger.kernel.org
+ S:	Maintained
+ F:	drivers/pci/host/*spear*
  
 +PCI DRIVER FOR APPLIEDMICRO XGENE
 +M:	Tanmay Inamdar <tinamdar@apm.com>
@@ -1232,128 +107,11 @@ index 86efa7e..14a3ef1 100644
  PCMCIA SUBSYSTEM
  P:	Linux PCMCIA Team
  L:	linux-pcmcia@lists.infradead.org
-diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
-index 193ceaf..d6d5227 100644
---- a/arch/arm/include/asm/kvm_host.h
-+++ b/arch/arm/include/asm/kvm_host.h
-@@ -225,6 +225,11 @@ static inline int kvm_arch_dev_ioctl_check_extension(long ext)
- 	return 0;
- }
- 
-+static inline void vgic_arch_setup(const struct vgic_params *vgic)
-+{
-+	BUG_ON(vgic->type != VGIC_V2);
-+}
-+
- int kvm_perf_init(void);
- int kvm_perf_teardown(void);
- 
-diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
-index 85598b5..713e807 100644
---- a/arch/arm/kernel/asm-offsets.c
-+++ b/arch/arm/kernel/asm-offsets.c
-@@ -182,13 +182,13 @@ int main(void)
-   DEFINE(VCPU_HYP_PC,		offsetof(struct kvm_vcpu, arch.fault.hyp_pc));
- #ifdef CONFIG_KVM_ARM_VGIC
-   DEFINE(VCPU_VGIC_CPU,		offsetof(struct kvm_vcpu, arch.vgic_cpu));
--  DEFINE(VGIC_CPU_HCR,		offsetof(struct vgic_cpu, vgic_hcr));
--  DEFINE(VGIC_CPU_VMCR,		offsetof(struct vgic_cpu, vgic_vmcr));
--  DEFINE(VGIC_CPU_MISR,		offsetof(struct vgic_cpu, vgic_misr));
--  DEFINE(VGIC_CPU_EISR,		offsetof(struct vgic_cpu, vgic_eisr));
--  DEFINE(VGIC_CPU_ELRSR,	offsetof(struct vgic_cpu, vgic_elrsr));
--  DEFINE(VGIC_CPU_APR,		offsetof(struct vgic_cpu, vgic_apr));
--  DEFINE(VGIC_CPU_LR,		offsetof(struct vgic_cpu, vgic_lr));
-+  DEFINE(VGIC_V2_CPU_HCR,	offsetof(struct vgic_cpu, vgic_v2.vgic_hcr));
-+  DEFINE(VGIC_V2_CPU_VMCR,	offsetof(struct vgic_cpu, vgic_v2.vgic_vmcr));
-+  DEFINE(VGIC_V2_CPU_MISR,	offsetof(struct vgic_cpu, vgic_v2.vgic_misr));
-+  DEFINE(VGIC_V2_CPU_EISR,	offsetof(struct vgic_cpu, vgic_v2.vgic_eisr));
-+  DEFINE(VGIC_V2_CPU_ELRSR,	offsetof(struct vgic_cpu, vgic_v2.vgic_elrsr));
-+  DEFINE(VGIC_V2_CPU_APR,	offsetof(struct vgic_cpu, vgic_v2.vgic_apr));
-+  DEFINE(VGIC_V2_CPU_LR,	offsetof(struct vgic_cpu, vgic_v2.vgic_lr));
-   DEFINE(VGIC_CPU_NR_LR,	offsetof(struct vgic_cpu, nr_lr));
- #ifdef CONFIG_KVM_ARM_TIMER
-   DEFINE(VCPU_TIMER_CNTV_CTL,	offsetof(struct kvm_vcpu, arch.timer_cpu.cntv_ctl));
-diff --git a/arch/arm/kvm/Makefile b/arch/arm/kvm/Makefile
-index 789bca9..f7057ed 100644
---- a/arch/arm/kvm/Makefile
-+++ b/arch/arm/kvm/Makefile
-@@ -21,4 +21,5 @@ obj-y += kvm-arm.o init.o interrupts.o
- obj-y += arm.o handle_exit.o guest.o mmu.o emulate.o reset.o
- obj-y += coproc.o coproc_a15.o coproc_a7.o mmio.o psci.o perf.o
- obj-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic.o
-+obj-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic-v2.o
- obj-$(CONFIG_KVM_ARM_TIMER) += $(KVM)/arm/arch_timer.o
-diff --git a/arch/arm/kvm/interrupts_head.S b/arch/arm/kvm/interrupts_head.S
-index 76af9302..e4eaf30 100644
---- a/arch/arm/kvm/interrupts_head.S
-+++ b/arch/arm/kvm/interrupts_head.S
-@@ -421,14 +421,14 @@ vcpu	.req	r0		@ vcpu pointer always in r0
- 	ldr	r9, [r2, #GICH_ELRSR1]
- 	ldr	r10, [r2, #GICH_APR]
- 
--	str	r3, [r11, #VGIC_CPU_HCR]
--	str	r4, [r11, #VGIC_CPU_VMCR]
--	str	r5, [r11, #VGIC_CPU_MISR]
--	str	r6, [r11, #VGIC_CPU_EISR]
--	str	r7, [r11, #(VGIC_CPU_EISR + 4)]
--	str	r8, [r11, #VGIC_CPU_ELRSR]
--	str	r9, [r11, #(VGIC_CPU_ELRSR + 4)]
--	str	r10, [r11, #VGIC_CPU_APR]
-+	str	r3, [r11, #VGIC_V2_CPU_HCR]
-+	str	r4, [r11, #VGIC_V2_CPU_VMCR]
-+	str	r5, [r11, #VGIC_V2_CPU_MISR]
-+	str	r6, [r11, #VGIC_V2_CPU_EISR]
-+	str	r7, [r11, #(VGIC_V2_CPU_EISR + 4)]
-+	str	r8, [r11, #VGIC_V2_CPU_ELRSR]
-+	str	r9, [r11, #(VGIC_V2_CPU_ELRSR + 4)]
-+	str	r10, [r11, #VGIC_V2_CPU_APR]
- 
- 	/* Clear GICH_HCR */
- 	mov	r5, #0
-@@ -436,7 +436,7 @@ vcpu	.req	r0		@ vcpu pointer always in r0
- 
- 	/* Save list registers */
- 	add	r2, r2, #GICH_LR0
--	add	r3, r11, #VGIC_CPU_LR
-+	add	r3, r11, #VGIC_V2_CPU_LR
- 	ldr	r4, [r11, #VGIC_CPU_NR_LR]
- 1:	ldr	r6, [r2], #4
- 	str	r6, [r3], #4
-@@ -463,9 +463,9 @@ vcpu	.req	r0		@ vcpu pointer always in r0
- 	add	r11, vcpu, #VCPU_VGIC_CPU
- 
- 	/* We only restore a minimal set of registers */
--	ldr	r3, [r11, #VGIC_CPU_HCR]
--	ldr	r4, [r11, #VGIC_CPU_VMCR]
--	ldr	r8, [r11, #VGIC_CPU_APR]
-+	ldr	r3, [r11, #VGIC_V2_CPU_HCR]
-+	ldr	r4, [r11, #VGIC_V2_CPU_VMCR]
-+	ldr	r8, [r11, #VGIC_V2_CPU_APR]
- 
- 	str	r3, [r2, #GICH_HCR]
- 	str	r4, [r2, #GICH_VMCR]
-@@ -473,7 +473,7 @@ vcpu	.req	r0		@ vcpu pointer always in r0
- 
- 	/* Restore list registers */
- 	add	r2, r2, #GICH_LR0
--	add	r3, r11, #VGIC_CPU_LR
-+	add	r3, r11, #VGIC_V2_CPU_LR
- 	ldr	r4, [r11, #VGIC_CPU_NR_LR]
- 1:	ldr	r6, [r3], #4
- 	str	r6, [r2], #4
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 839f48c..23871dd 100644
+index fd4e81a..e8559bb 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
-@@ -11,6 +11,7 @@ config ARM64
- 	select ARM_AMBA
- 	select ARM_ARCH_TIMER
- 	select ARM_GIC
-+	select ARM_GIC_V3
- 	select BUILDTIME_EXTABLE_SORT
- 	select CLONE_BACKWARDS
- 	select COMMON_CLK
-@@ -76,7 +77,7 @@ config MMU
+@@ -81,7 +81,7 @@ config MMU
  	def_bool y
  
  config NO_IOPORT_MAP
@@ -1362,7 +120,7 @@ index 839f48c..23871dd 100644
  
  config STACKTRACE_SUPPORT
  	def_bool y
-@@ -151,6 +152,23 @@ menu "Bus support"
+@@ -156,6 +156,23 @@ menu "Bus support"
  config ARM_AMBA
  	bool
  
@@ -1387,18 +145,14 @@ index 839f48c..23871dd 100644
  
  menu "Kernel Features"
 diff --git a/arch/arm64/boot/dts/apm-mustang.dts b/arch/arm64/boot/dts/apm-mustang.dts
-index 6541962..0cb67fc 100644
+index b2f5622..0cb67fc 100644
 --- a/arch/arm64/boot/dts/apm-mustang.dts
 +++ b/arch/arm64/boot/dts/apm-mustang.dts
-@@ -28,3 +28,15 @@
- &serial0 {
+@@ -32,3 +32,11 @@
+ &menet {
  	status = "ok";
  };
 +
-+&menet {
-+	status = "ok";
-+};
-+
 +&pcie0clk {
 +	status = "ok";
 +};
@@ -1407,7 +161,7 @@ index 6541962..0cb67fc 100644
 +	status = "ok";
 +};
 diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
-index 40aa96c..fb2ee54 100644
+index c0aceef..fb2ee54 100644
 --- a/arch/arm64/boot/dts/apm-storm.dtsi
 +++ b/arch/arm64/boot/dts/apm-storm.dtsi
 @@ -24,56 +24,56 @@
@@ -1487,24 +241,7 @@ index 40aa96c..fb2ee54 100644
  	soc {
  		compatible = "simple-bus";
  		#address-cells = <2>;
-@@ -167,14 +172,13 @@
- 				clock-output-names = "ethclk";
- 			};
- 
--			eth8clk: eth8clk {
-+			menetclk: menetclk {
- 				compatible = "apm,xgene-device-clock";
- 				#clock-cells = <1>;
- 				clocks = <&ethclk 0>;
--				clock-names = "eth8clk";
- 				reg = <0x0 0x1702C000 0x0 0x1000>;
- 				reg-names = "csr-reg";
--				clock-output-names = "eth8clk";
-+				clock-output-names = "menetclk";
- 			};
- 
- 			sataphy1clk: sataphy1clk@1f21c000 {
-@@ -270,6 +274,161 @@
+@@ -269,6 +274,161 @@
  				enable-mask = <0x2>;
  				clock-output-names = "rtcclk";
  			};
@@ -1666,7 +403,7 @@ index 40aa96c..fb2ee54 100644
  		};
  
  		serial0: serial@1c020000 {
-@@ -278,7 +437,7 @@
+@@ -277,7 +437,7 @@
  			compatible = "ns16550a";
  			reg = <0 0x1c020000 0x0 0x1000>;
  			reg-shift = <2>;
@@ -1675,37 +412,15 @@ index 40aa96c..fb2ee54 100644
  			interrupt-parent = <&gic>;
  			interrupts = <0x0 0x4c 0x4>;
  		};
-@@ -397,5 +556,30 @@
- 			#clock-cells = <1>;
- 			clocks = <&rtcclk 0>;
- 		};
-+
-+		menet: ethernet@17020000 {
-+			compatible = "apm,xgene-enet";
-+			status = "disabled";
-+			reg = <0x0 0x17020000 0x0 0xd100>,
-+			      <0x0 0X17030000 0x0 0X400>,
-+			      <0x0 0X10000000 0x0 0X200>;
-+			reg-names = "enet_csr", "ring_csr", "ring_cmd";
-+			interrupts = <0x0 0x3c 0x4>;
-+			dma-coherent;
-+			clocks = <&menetclk 0>;
+@@ -407,7 +567,7 @@
+ 			interrupts = <0x0 0x3c 0x4>;
+ 			dma-coherent;
+ 			clocks = <&menetclk 0>;
+-			local-mac-address = [00 01 73 00 00 01];
 +			local-mac-address = [00 00 00 00 00 00];
-+			phy-connection-type = "rgmii";
-+			phy-handle = <&menetphy>;
-+			mdio {
-+				compatible = "apm,xgene-mdio";
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				menetphy: menetphy@3 {
-+					compatible = "ethernet-phy-id001c.c915";
-+					reg = <0x3>;
-+				};
-+
-+			};
-+		};
- 	};
- };
+ 			phy-connection-type = "rgmii";
+ 			phy-handle = <&menetphy>;
+ 			mdio {
 diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
 index 0b3fcf8..07cb417 100644
 --- a/arch/arm64/include/asm/Kbuild
@@ -1746,120 +461,6 @@ index e0ecdcf..dc34039 100644
  #define PCI_IOBASE		((void __iomem *)(MODULES_VADDR - SZ_32M))
  
  static inline u8 inb(unsigned long addr)
-diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
-index 3d69030..cc83520 100644
---- a/arch/arm64/include/asm/kvm_arm.h
-+++ b/arch/arm64/include/asm/kvm_arm.h
-@@ -76,9 +76,10 @@
-  */
- #define HCR_GUEST_FLAGS (HCR_TSC | HCR_TSW | HCR_TWE | HCR_TWI | HCR_VM | \
- 			 HCR_TVM | HCR_BSU_IS | HCR_FB | HCR_TAC | \
--			 HCR_AMO | HCR_IMO | HCR_FMO | \
--			 HCR_SWIO | HCR_TIDCP | HCR_RW)
-+			 HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW)
- #define HCR_VIRT_EXCP_MASK (HCR_VA | HCR_VI | HCR_VF)
-+#define HCR_INT_OVERRIDE   (HCR_FMO | HCR_IMO)
-+
- 
- /* Hyp System Control Register (SCTLR_EL2) bits */
- #define SCTLR_EL2_EE	(1 << 25)
-diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h
-index 9fcd54b..a28c35b 100644
---- a/arch/arm64/include/asm/kvm_asm.h
-+++ b/arch/arm64/include/asm/kvm_asm.h
-@@ -18,6 +18,8 @@
- #ifndef __ARM_KVM_ASM_H__
- #define __ARM_KVM_ASM_H__
- 
-+#include <asm/virt.h>
-+
- /*
-  * 0 is reserved as an invalid value.
-  * Order *must* be kept in sync with the hyp switch code.
-@@ -96,13 +98,21 @@ extern char __kvm_hyp_init_end[];
- 
- extern char __kvm_hyp_vector[];
- 
--extern char __kvm_hyp_code_start[];
--extern char __kvm_hyp_code_end[];
-+#define	__kvm_hyp_code_start	__hyp_text_start
-+#define	__kvm_hyp_code_end	__hyp_text_end
- 
- extern void __kvm_flush_vm_context(void);
- extern void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa);
- 
- extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);
-+
-+extern u64 __vgic_v3_get_ich_vtr_el2(void);
-+
-+extern char __save_vgic_v2_state[];
-+extern char __restore_vgic_v2_state[];
-+extern char __save_vgic_v3_state[];
-+extern char __restore_vgic_v3_state[];
-+
- #endif
- 
- #endif /* __ARM_KVM_ASM_H__ */
-diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
-index 92242ce..4ae9213 100644
---- a/arch/arm64/include/asm/kvm_host.h
-+++ b/arch/arm64/include/asm/kvm_host.h
-@@ -200,4 +200,32 @@ static inline void __cpu_init_hyp_mode(phys_addr_t boot_pgd_ptr,
- 		     hyp_stack_ptr, vector_ptr);
- }
- 
-+struct vgic_sr_vectors {
-+	void	*save_vgic;
-+	void	*restore_vgic;
-+};
-+
-+static inline void vgic_arch_setup(const struct vgic_params *vgic)
-+{
-+	extern struct vgic_sr_vectors __vgic_sr_vectors;
-+
-+	switch(vgic->type)
-+	{
-+	case VGIC_V2:
-+		__vgic_sr_vectors.save_vgic	= __save_vgic_v2_state;
-+		__vgic_sr_vectors.restore_vgic	= __restore_vgic_v2_state;
-+		break;
-+
-+#ifdef CONFIG_ARM_GIC_V3
-+	case VGIC_V3:
-+		__vgic_sr_vectors.save_vgic	= __save_vgic_v3_state;
-+		__vgic_sr_vectors.restore_vgic	= __restore_vgic_v3_state;
-+		break;
-+#endif
-+
-+	default:
-+		BUG();
-+	}
-+}
-+
- #endif /* __ARM64_KVM_HOST_H__ */
-diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
-index 7d29847..d7f77ff 100644
---- a/arch/arm64/include/asm/kvm_mmu.h
-+++ b/arch/arm64/include/asm/kvm_mmu.h
-@@ -122,8 +122,16 @@ static inline void kvm_set_s2pmd_writable(pmd_t *pmd)
- }
- 
- #define kvm_pgd_addr_end(addr, end)	pgd_addr_end(addr, end)
--#define kvm_pud_addr_end(addr, end)	pud_addr_end(addr, end)
--#define kvm_pmd_addr_end(addr, end)	pmd_addr_end(addr, end)
-+
-+#define kvm_pud_addr_end(addr, end)					\
-+({	unsigned long __boundary = ((addr) + PUD_SIZE) & PUD_MASK;	\
-+	(__boundary - 1 < (end) - 1)? __boundary: (end);		\
-+})
-+
-+#define kvm_pmd_addr_end(addr, end)					\
-+({	unsigned long __boundary = ((addr) + PMD_SIZE) & PMD_MASK;	\
-+	(__boundary - 1 < (end) - 1)? __boundary: (end);		\
-+})
- 
- struct kvm;
- 
 diff --git a/arch/arm64/include/asm/pci.h b/arch/arm64/include/asm/pci.h
 new file mode 100644
 index 0000000..3f7856e
@@ -1915,77 +516,8 @@ index 0000000..3f7856e
 +
 +#endif  /* __KERNEL__ */
 +#endif  /* __ASM_PCI_H */
-diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h
-index b9349c4..ecbd081 100644
---- a/arch/arm64/include/asm/tlbflush.h
-+++ b/arch/arm64/include/asm/tlbflush.h
-@@ -98,8 +98,8 @@ static inline void flush_tlb_page(struct vm_area_struct *vma,
- 	dsb(ish);
- }
- 
--static inline void flush_tlb_range(struct vm_area_struct *vma,
--					unsigned long start, unsigned long end)
-+static inline void __flush_tlb_range(struct vm_area_struct *vma,
-+				     unsigned long start, unsigned long end)
- {
- 	unsigned long asid = (unsigned long)ASID(vma->vm_mm) << 48;
- 	unsigned long addr;
-@@ -112,7 +112,7 @@ static inline void flush_tlb_range(struct vm_area_struct *vma,
- 	dsb(ish);
- }
- 
--static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end)
-+static inline void __flush_tlb_kernel_range(unsigned long start, unsigned long end)
- {
- 	unsigned long addr;
- 	start >>= 12;
-@@ -125,6 +125,29 @@ static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end
- }
- 
- /*
-+ * This is meant to avoid soft lock-ups on large TLB flushing ranges and not
-+ * necessarily a performance improvement.
-+ */
-+#define MAX_TLB_RANGE	(1024UL << PAGE_SHIFT)
-+
-+static inline void flush_tlb_range(struct vm_area_struct *vma,
-+				   unsigned long start, unsigned long end)
-+{
-+	if ((end - start) <= MAX_TLB_RANGE)
-+		__flush_tlb_range(vma, start, end);
-+	else
-+		flush_tlb_mm(vma->vm_mm);
-+}
-+
-+static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end)
-+{
-+	if ((end - start) <= MAX_TLB_RANGE)
-+		__flush_tlb_kernel_range(start, end);
-+	else
-+		flush_tlb_all();
-+}
-+
-+/*
-  * On AArch64, the cache coherency is handled via the set_pte_at() function.
-  */
- static inline void update_mmu_cache(struct vm_area_struct *vma,
-diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h
-index 215ad46..7a5df52 100644
---- a/arch/arm64/include/asm/virt.h
-+++ b/arch/arm64/include/asm/virt.h
-@@ -50,6 +50,10 @@ static inline bool is_hyp_mode_mismatched(void)
- 	return __boot_cpu_mode[0] != __boot_cpu_mode[1];
- }
- 
-+/* The section containing the hypervisor text */
-+extern char __hyp_text_start[];
-+extern char __hyp_text_end[];
-+
- #endif /* __ASSEMBLY__ */
- 
- #endif /* ! __ASM__VIRT_H */
 diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
-index cdaedad..36b117a 100644
+index df7ef87..1ed5a06 100644
 --- a/arch/arm64/kernel/Makefile
 +++ b/arch/arm64/kernel/Makefile
 @@ -29,6 +29,7 @@ arm64-obj-$(CONFIG_ARM64_CPU_SUSPEND)	+= sleep.o suspend.o
@@ -1996,47 +528,11 @@ index cdaedad..36b117a 100644
  
  obj-y					+= $(arm64-obj-y) vdso/
  obj-m					+= $(arm64-obj-m)
-diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
-index 646f888..e74654c 100644
---- a/arch/arm64/kernel/asm-offsets.c
-+++ b/arch/arm64/kernel/asm-offsets.c
-@@ -129,13 +129,24 @@ int main(void)
-   DEFINE(KVM_TIMER_ENABLED,	offsetof(struct kvm, arch.timer.enabled));
-   DEFINE(VCPU_KVM,		offsetof(struct kvm_vcpu, kvm));
-   DEFINE(VCPU_VGIC_CPU,		offsetof(struct kvm_vcpu, arch.vgic_cpu));
--  DEFINE(VGIC_CPU_HCR,		offsetof(struct vgic_cpu, vgic_hcr));
--  DEFINE(VGIC_CPU_VMCR,		offsetof(struct vgic_cpu, vgic_vmcr));
--  DEFINE(VGIC_CPU_MISR,		offsetof(struct vgic_cpu, vgic_misr));
--  DEFINE(VGIC_CPU_EISR,		offsetof(struct vgic_cpu, vgic_eisr));
--  DEFINE(VGIC_CPU_ELRSR,	offsetof(struct vgic_cpu, vgic_elrsr));
--  DEFINE(VGIC_CPU_APR,		offsetof(struct vgic_cpu, vgic_apr));
--  DEFINE(VGIC_CPU_LR,		offsetof(struct vgic_cpu, vgic_lr));
-+  DEFINE(VGIC_SAVE_FN,		offsetof(struct vgic_sr_vectors, save_vgic));
-+  DEFINE(VGIC_RESTORE_FN,	offsetof(struct vgic_sr_vectors, restore_vgic));
-+  DEFINE(VGIC_SR_VECTOR_SZ,	sizeof(struct vgic_sr_vectors));
-+  DEFINE(VGIC_V2_CPU_HCR,	offsetof(struct vgic_cpu, vgic_v2.vgic_hcr));
-+  DEFINE(VGIC_V2_CPU_VMCR,	offsetof(struct vgic_cpu, vgic_v2.vgic_vmcr));
-+  DEFINE(VGIC_V2_CPU_MISR,	offsetof(struct vgic_cpu, vgic_v2.vgic_misr));
-+  DEFINE(VGIC_V2_CPU_EISR,	offsetof(struct vgic_cpu, vgic_v2.vgic_eisr));
-+  DEFINE(VGIC_V2_CPU_ELRSR,	offsetof(struct vgic_cpu, vgic_v2.vgic_elrsr));
-+  DEFINE(VGIC_V2_CPU_APR,	offsetof(struct vgic_cpu, vgic_v2.vgic_apr));
-+  DEFINE(VGIC_V2_CPU_LR,	offsetof(struct vgic_cpu, vgic_v2.vgic_lr));
-+  DEFINE(VGIC_V3_CPU_HCR,	offsetof(struct vgic_cpu, vgic_v3.vgic_hcr));
-+  DEFINE(VGIC_V3_CPU_VMCR,	offsetof(struct vgic_cpu, vgic_v3.vgic_vmcr));
-+  DEFINE(VGIC_V3_CPU_MISR,	offsetof(struct vgic_cpu, vgic_v3.vgic_misr));
-+  DEFINE(VGIC_V3_CPU_EISR,	offsetof(struct vgic_cpu, vgic_v3.vgic_eisr));
-+  DEFINE(VGIC_V3_CPU_ELRSR,	offsetof(struct vgic_cpu, vgic_v3.vgic_elrsr));
-+  DEFINE(VGIC_V3_CPU_AP0R,	offsetof(struct vgic_cpu, vgic_v3.vgic_ap0r));
-+  DEFINE(VGIC_V3_CPU_AP1R,	offsetof(struct vgic_cpu, vgic_v3.vgic_ap1r));
-+  DEFINE(VGIC_V3_CPU_LR,	offsetof(struct vgic_cpu, vgic_v3.vgic_lr));
-   DEFINE(VGIC_CPU_NR_LR,	offsetof(struct vgic_cpu, nr_lr));
-   DEFINE(KVM_VTTBR,		offsetof(struct kvm, arch.vttbr));
-   DEFINE(KVM_VGIC_VCTRL,	offsetof(struct kvm, arch.vgic.vctrl_base));
 diff --git a/arch/arm64/kernel/efi-stub.c b/arch/arm64/kernel/efi-stub.c
-index e786e6c..320ef48 100644
+index 1317fef..d27dd98 100644
 --- a/arch/arm64/kernel/efi-stub.c
 +++ b/arch/arm64/kernel/efi-stub.c
-@@ -58,20 +58,16 @@ static efi_status_t handle_kernel_image(efi_system_table_t *sys_table,
+@@ -28,20 +28,16 @@ efi_status_t handle_kernel_image(efi_system_table_t *sys_table,
  	kernel_size = _edata - _text;
  	if (*image_addr != (dram_base + TEXT_OFFSET)) {
  		kernel_memsize = kernel_size + (_end - _edata);
@@ -2053,7 +549,7 @@ index e786e6c..320ef48 100644
 -		if (*image_addr != (dram_base + TEXT_OFFSET)) {
 -			pr_efi_err(sys_table, "Failed to alloc kernel memory\n");
 -			efi_free(sys_table, kernel_memsize, *image_addr);
--			return EFI_ERROR;
+-			return EFI_LOAD_ERROR;
 -		}
 -		*image_size = kernel_memsize;
 +		memcpy((void *)*reserve_addr + TEXT_OFFSET, (void *)*image_addr,
@@ -2064,11 +560,11 @@ index e786e6c..320ef48 100644
  
  
 diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
-index 14db1f6..453b7f8 100644
+index e72f310..72ee260 100644
 --- a/arch/arm64/kernel/efi.c
 +++ b/arch/arm64/kernel/efi.c
-@@ -467,3 +467,14 @@ static int __init arm64_enter_virtual_mode(void)
- 	return 0;
+@@ -475,3 +475,14 @@ err_unmap:
+ 	return -1;
  }
  early_initcall(arm64_enter_virtual_mode);
 +
@@ -2083,18 +579,10 @@ index 14db1f6..453b7f8 100644
 +	return pm_power_off == NULL;
 +}
 diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
-index a2c1195..8df59be 100644
+index 144f105..b6ca95a 100644
 --- a/arch/arm64/kernel/head.S
 +++ b/arch/arm64/kernel/head.S
-@@ -22,6 +22,7 @@
- 
- #include <linux/linkage.h>
- #include <linux/init.h>
-+#include <linux/irqchip/arm-gic-v3.h>
- 
- #include <asm/assembler.h>
- #include <asm/ptrace.h>
-@@ -156,7 +157,7 @@ optional_header:
+@@ -151,7 +151,7 @@ optional_header:
  	.short	0x20b				// PE32+ format
  	.byte	0x02				// MajorLinkerVersion
  	.byte	0x14				// MinorLinkerVersion
@@ -2103,7 +591,7 @@ index a2c1195..8df59be 100644
  	.long	0				// SizeOfInitializedData
  	.long	0				// SizeOfUninitializedData
  	.long	efi_stub_entry - efi_head	// AddressOfEntryPoint
-@@ -174,7 +175,7 @@ extra_header_fields:
+@@ -169,7 +169,7 @@ extra_header_fields:
  	.short	0				// MinorSubsystemVersion
  	.long	0				// Win32VersionValue
  
@@ -2112,7 +600,7 @@ index a2c1195..8df59be 100644
  
  	// Everything before the kernel image is considered part of the header
  	.long	stext - efi_head		// SizeOfHeaders
-@@ -221,7 +222,7 @@ section_table:
+@@ -216,7 +216,7 @@ section_table:
  	.byte	0
  	.byte	0
  	.byte	0        		// end of 0 padding of section name
@@ -2121,42 +609,6 @@ index a2c1195..8df59be 100644
  	.long	stext - efi_head	// VirtualAddress
  	.long	_edata - stext		// SizeOfRawData
  	.long	stext - efi_head	// PointerToRawData
-@@ -295,6 +296,23 @@ CPU_LE(	bic	x0, x0, #(3 << 24)	)	// Clear the EE and E0E bits for EL1
- 	msr	cnthctl_el2, x0
- 	msr	cntvoff_el2, xzr		// Clear virtual offset
- 
-+#ifdef CONFIG_ARM_GIC_V3
-+	/* GICv3 system register access */
-+	mrs	x0, id_aa64pfr0_el1
-+	ubfx	x0, x0, #24, #4
-+	cmp	x0, #1
-+	b.ne	3f
-+
-+	mrs	x0, ICC_SRE_EL2
-+	orr	x0, x0, #ICC_SRE_EL2_SRE	// Set ICC_SRE_EL2.SRE==1
-+	orr	x0, x0, #ICC_SRE_EL2_ENABLE	// Set ICC_SRE_EL2.Enable==1
-+	msr	ICC_SRE_EL2, x0
-+	isb					// Make sure SRE is now set
-+	msr	ICH_HCR_EL2, xzr		// Reset ICC_HCR_EL2 to defaults
-+
-+3:
-+#endif
-+
- 	/* Populate ID registers. */
- 	mrs	x0, midr_el1
- 	mrs	x1, mpidr_el1
-diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
-index 0959611..a272f33 100644
---- a/arch/arm64/kernel/hyp-stub.S
-+++ b/arch/arm64/kernel/hyp-stub.S
-@@ -19,6 +19,7 @@
- 
- #include <linux/init.h>
- #include <linux/linkage.h>
-+#include <linux/irqchip/arm-gic-v3.h>
- 
- #include <asm/assembler.h>
- #include <asm/ptrace.h>
 diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
 new file mode 100644
 index 0000000..955d6d1
@@ -2202,7 +654,7 @@ index 0000000..955d6d1
 +	return res->start;
 +}
 diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
-index 43b7c34..ec5cbbe 100644
+index 1309d64..8ff5208 100644
 --- a/arch/arm64/kernel/process.c
 +++ b/arch/arm64/kernel/process.c
 @@ -43,6 +43,7 @@
@@ -2213,7 +665,7 @@ index 43b7c34..ec5cbbe 100644
  
  #include <asm/compat.h>
  #include <asm/cacheflush.h>
-@@ -176,6 +177,11 @@ void machine_restart(char *cmd)
+@@ -182,6 +183,11 @@ void machine_restart(char *cmd)
  		arm_pm_restart(reboot_mode, cmd);
  
  	/*
@@ -2281,1346 +733,11 @@ index 0347d38..70181c1 100644
  	return 0;
  }
  
-diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile
-index 72a9fd5..32a0961 100644
---- a/arch/arm64/kvm/Makefile
-+++ b/arch/arm64/kvm/Makefile
-@@ -20,4 +20,8 @@ kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o
- kvm-$(CONFIG_KVM_ARM_HOST) += guest.o reset.o sys_regs.o sys_regs_generic_v8.o
- 
- kvm-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic.o
-+kvm-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic-v2.o
-+kvm-$(CONFIG_KVM_ARM_VGIC) += vgic-v2-switch.o
-+kvm-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic-v3.o
-+kvm-$(CONFIG_KVM_ARM_VGIC) += vgic-v3-switch.o
- kvm-$(CONFIG_KVM_ARM_TIMER) += $(KVM)/arm/arch_timer.o
-diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S
-index b0d1512..5945f3b 100644
---- a/arch/arm64/kvm/hyp.S
-+++ b/arch/arm64/kvm/hyp.S
-@@ -16,7 +16,6 @@
-  */
- 
- #include <linux/linkage.h>
--#include <linux/irqchip/arm-gic.h>
- 
- #include <asm/assembler.h>
- #include <asm/memory.h>
-@@ -36,9 +35,6 @@
- 	.pushsection	.hyp.text, "ax"
- 	.align	PAGE_SHIFT
- 
--__kvm_hyp_code_start:
--	.globl __kvm_hyp_code_start
--
- .macro save_common_regs
- 	// x2: base address for cpu context
- 	// x3: tmp register
-@@ -339,11 +335,8 @@ __kvm_hyp_code_start:
- .endm
- 
- .macro activate_traps
--	ldr	x2, [x0, #VCPU_IRQ_LINES]
--	ldr	x1, [x0, #VCPU_HCR_EL2]
--	orr	x2, x2, x1
--	msr	hcr_el2, x2
--
-+	ldr     x2, [x0, #VCPU_HCR_EL2]
-+	msr     hcr_el2, x2
- 	ldr	x2, =(CPTR_EL2_TTA)
- 	msr	cptr_el2, x2
- 
-@@ -379,100 +372,33 @@ __kvm_hyp_code_start:
- .endm
- 
- /*
-- * Save the VGIC CPU state into memory
-- * x0: Register pointing to VCPU struct
-- * Do not corrupt x1!!!
-+ * Call into the vgic backend for state saving
-  */
- .macro save_vgic_state
--	/* Get VGIC VCTRL base into x2 */
--	ldr	x2, [x0, #VCPU_KVM]
--	kern_hyp_va	x2
--	ldr	x2, [x2, #KVM_VGIC_VCTRL]
--	kern_hyp_va	x2
--	cbz	x2, 2f		// disabled
--
--	/* Compute the address of struct vgic_cpu */
--	add	x3, x0, #VCPU_VGIC_CPU
--
--	/* Save all interesting registers */
--	ldr	w4, [x2, #GICH_HCR]
--	ldr	w5, [x2, #GICH_VMCR]
--	ldr	w6, [x2, #GICH_MISR]
--	ldr	w7, [x2, #GICH_EISR0]
--	ldr	w8, [x2, #GICH_EISR1]
--	ldr	w9, [x2, #GICH_ELRSR0]
--	ldr	w10, [x2, #GICH_ELRSR1]
--	ldr	w11, [x2, #GICH_APR]
--CPU_BE(	rev	w4,  w4  )
--CPU_BE(	rev	w5,  w5  )
--CPU_BE(	rev	w6,  w6  )
--CPU_BE(	rev	w7,  w7  )
--CPU_BE(	rev	w8,  w8  )
--CPU_BE(	rev	w9,  w9  )
--CPU_BE(	rev	w10, w10 )
--CPU_BE(	rev	w11, w11 )
--
--	str	w4, [x3, #VGIC_CPU_HCR]
--	str	w5, [x3, #VGIC_CPU_VMCR]
--	str	w6, [x3, #VGIC_CPU_MISR]
--	str	w7, [x3, #VGIC_CPU_EISR]
--	str	w8, [x3, #(VGIC_CPU_EISR + 4)]
--	str	w9, [x3, #VGIC_CPU_ELRSR]
--	str	w10, [x3, #(VGIC_CPU_ELRSR + 4)]
--	str	w11, [x3, #VGIC_CPU_APR]
--
--	/* Clear GICH_HCR */
--	str	wzr, [x2, #GICH_HCR]
--
--	/* Save list registers */
--	add	x2, x2, #GICH_LR0
--	ldr	w4, [x3, #VGIC_CPU_NR_LR]
--	add	x3, x3, #VGIC_CPU_LR
--1:	ldr	w5, [x2], #4
--CPU_BE(	rev	w5, w5 )
--	str	w5, [x3], #4
--	sub	w4, w4, #1
--	cbnz	w4, 1b
--2:
-+	adr	x24, __vgic_sr_vectors
-+	ldr	x24, [x24, VGIC_SAVE_FN]
-+	kern_hyp_va	x24
-+	blr	x24
-+	mrs	x24, hcr_el2
-+	mov	x25, #HCR_INT_OVERRIDE
-+	neg	x25, x25
-+	and	x24, x24, x25
-+	msr	hcr_el2, x24
- .endm
- 
- /*
-- * Restore the VGIC CPU state from memory
-- * x0: Register pointing to VCPU struct
-+ * Call into the vgic backend for state restoring
-  */
- .macro restore_vgic_state
--	/* Get VGIC VCTRL base into x2 */
--	ldr	x2, [x0, #VCPU_KVM]
--	kern_hyp_va	x2
--	ldr	x2, [x2, #KVM_VGIC_VCTRL]
--	kern_hyp_va	x2
--	cbz	x2, 2f		// disabled
--
--	/* Compute the address of struct vgic_cpu */
--	add	x3, x0, #VCPU_VGIC_CPU
--
--	/* We only restore a minimal set of registers */
--	ldr	w4, [x3, #VGIC_CPU_HCR]
--	ldr	w5, [x3, #VGIC_CPU_VMCR]
--	ldr	w6, [x3, #VGIC_CPU_APR]
--CPU_BE(	rev	w4, w4 )
--CPU_BE(	rev	w5, w5 )
--CPU_BE(	rev	w6, w6 )
--
--	str	w4, [x2, #GICH_HCR]
--	str	w5, [x2, #GICH_VMCR]
--	str	w6, [x2, #GICH_APR]
--
--	/* Restore list registers */
--	add	x2, x2, #GICH_LR0
--	ldr	w4, [x3, #VGIC_CPU_NR_LR]
--	add	x3, x3, #VGIC_CPU_LR
--1:	ldr	w5, [x3], #4
--CPU_BE(	rev	w5, w5 )
--	str	w5, [x2], #4
--	sub	w4, w4, #1
--	cbnz	w4, 1b
--2:
-+	mrs	x24, hcr_el2
-+	ldr	x25, [x0, #VCPU_IRQ_LINES]
-+	orr	x24, x24, #HCR_INT_OVERRIDE
-+	orr	x24, x24, x25
-+	msr	hcr_el2, x24
-+	adr	x24, __vgic_sr_vectors
-+	ldr	x24, [x24, #VGIC_RESTORE_FN]
-+	kern_hyp_va	x24
-+	blr	x24
- .endm
- 
- .macro save_timer_state
-@@ -653,6 +579,12 @@ ENTRY(__kvm_flush_vm_context)
- 	ret
- ENDPROC(__kvm_flush_vm_context)
- 
-+	// struct vgic_sr_vectors __vgi_sr_vectors;
-+	.align 3
-+ENTRY(__vgic_sr_vectors)
-+	.skip	VGIC_SR_VECTOR_SZ
-+ENDPROC(__vgic_sr_vectors)
-+
- __kvm_hyp_panic:
- 	// Guess the context by looking at VTTBR:
- 	// If zero, then we're already a host.
-@@ -880,7 +812,4 @@ ENTRY(__kvm_hyp_vector)
- 	ventry	el1_error_invalid		// Error 32-bit EL1
- ENDPROC(__kvm_hyp_vector)
- 
--__kvm_hyp_code_end:
--	.globl	__kvm_hyp_code_end
--
- 	.popsection
-diff --git a/arch/arm64/kvm/vgic-v2-switch.S b/arch/arm64/kvm/vgic-v2-switch.S
-new file mode 100644
-index 0000000..ae21177
---- /dev/null
-+++ b/arch/arm64/kvm/vgic-v2-switch.S
-@@ -0,0 +1,133 @@
-+/*
-+ * Copyright (C) 2012,2013 - ARM Ltd
-+ * Author: Marc Zyngier <marc.zyngier@arm.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/linkage.h>
-+#include <linux/irqchip/arm-gic.h>
-+
-+#include <asm/assembler.h>
-+#include <asm/memory.h>
-+#include <asm/asm-offsets.h>
-+#include <asm/kvm.h>
-+#include <asm/kvm_asm.h>
-+#include <asm/kvm_arm.h>
-+#include <asm/kvm_mmu.h>
-+
-+	.text
-+	.pushsection	.hyp.text, "ax"
-+
-+/*
-+ * Save the VGIC CPU state into memory
-+ * x0: Register pointing to VCPU struct
-+ * Do not corrupt x1!!!
-+ */
-+ENTRY(__save_vgic_v2_state)
-+__save_vgic_v2_state:
-+	/* Get VGIC VCTRL base into x2 */
-+	ldr	x2, [x0, #VCPU_KVM]
-+	kern_hyp_va	x2
-+	ldr	x2, [x2, #KVM_VGIC_VCTRL]
-+	kern_hyp_va	x2
-+	cbz	x2, 2f		// disabled
-+
-+	/* Compute the address of struct vgic_cpu */
-+	add	x3, x0, #VCPU_VGIC_CPU
-+
-+	/* Save all interesting registers */
-+	ldr	w4, [x2, #GICH_HCR]
-+	ldr	w5, [x2, #GICH_VMCR]
-+	ldr	w6, [x2, #GICH_MISR]
-+	ldr	w7, [x2, #GICH_EISR0]
-+	ldr	w8, [x2, #GICH_EISR1]
-+	ldr	w9, [x2, #GICH_ELRSR0]
-+	ldr	w10, [x2, #GICH_ELRSR1]
-+	ldr	w11, [x2, #GICH_APR]
-+CPU_BE(	rev	w4,  w4  )
-+CPU_BE(	rev	w5,  w5  )
-+CPU_BE(	rev	w6,  w6  )
-+CPU_BE(	rev	w7,  w7  )
-+CPU_BE(	rev	w8,  w8  )
-+CPU_BE(	rev	w9,  w9  )
-+CPU_BE(	rev	w10, w10 )
-+CPU_BE(	rev	w11, w11 )
-+
-+	str	w4, [x3, #VGIC_V2_CPU_HCR]
-+	str	w5, [x3, #VGIC_V2_CPU_VMCR]
-+	str	w6, [x3, #VGIC_V2_CPU_MISR]
-+	str	w7, [x3, #VGIC_V2_CPU_EISR]
-+	str	w8, [x3, #(VGIC_V2_CPU_EISR + 4)]
-+	str	w9, [x3, #VGIC_V2_CPU_ELRSR]
-+	str	w10, [x3, #(VGIC_V2_CPU_ELRSR + 4)]
-+	str	w11, [x3, #VGIC_V2_CPU_APR]
-+
-+	/* Clear GICH_HCR */
-+	str	wzr, [x2, #GICH_HCR]
-+
-+	/* Save list registers */
-+	add	x2, x2, #GICH_LR0
-+	ldr	w4, [x3, #VGIC_CPU_NR_LR]
-+	add	x3, x3, #VGIC_V2_CPU_LR
-+1:	ldr	w5, [x2], #4
-+CPU_BE(	rev	w5, w5 )
-+	str	w5, [x3], #4
-+	sub	w4, w4, #1
-+	cbnz	w4, 1b
-+2:
-+	ret
-+ENDPROC(__save_vgic_v2_state)
-+
-+/*
-+ * Restore the VGIC CPU state from memory
-+ * x0: Register pointing to VCPU struct
-+ */
-+ENTRY(__restore_vgic_v2_state)
-+__restore_vgic_v2_state:
-+	/* Get VGIC VCTRL base into x2 */
-+	ldr	x2, [x0, #VCPU_KVM]
-+	kern_hyp_va	x2
-+	ldr	x2, [x2, #KVM_VGIC_VCTRL]
-+	kern_hyp_va	x2
-+	cbz	x2, 2f		// disabled
-+
-+	/* Compute the address of struct vgic_cpu */
-+	add	x3, x0, #VCPU_VGIC_CPU
-+
-+	/* We only restore a minimal set of registers */
-+	ldr	w4, [x3, #VGIC_V2_CPU_HCR]
-+	ldr	w5, [x3, #VGIC_V2_CPU_VMCR]
-+	ldr	w6, [x3, #VGIC_V2_CPU_APR]
-+CPU_BE(	rev	w4, w4 )
-+CPU_BE(	rev	w5, w5 )
-+CPU_BE(	rev	w6, w6 )
-+
-+	str	w4, [x2, #GICH_HCR]
-+	str	w5, [x2, #GICH_VMCR]
-+	str	w6, [x2, #GICH_APR]
-+
-+	/* Restore list registers */
-+	add	x2, x2, #GICH_LR0
-+	ldr	w4, [x3, #VGIC_CPU_NR_LR]
-+	add	x3, x3, #VGIC_V2_CPU_LR
-+1:	ldr	w5, [x3], #4
-+CPU_BE(	rev	w5, w5 )
-+	str	w5, [x2], #4
-+	sub	w4, w4, #1
-+	cbnz	w4, 1b
-+2:
-+	ret
-+ENDPROC(__restore_vgic_v2_state)
-+
-+	.popsection
-diff --git a/arch/arm64/kvm/vgic-v3-switch.S b/arch/arm64/kvm/vgic-v3-switch.S
-new file mode 100644
-index 0000000..21e68f6
---- /dev/null
-+++ b/arch/arm64/kvm/vgic-v3-switch.S
-@@ -0,0 +1,267 @@
-+/*
-+ * Copyright (C) 2012,2013 - ARM Ltd
-+ * Author: Marc Zyngier <marc.zyngier@arm.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/linkage.h>
-+#include <linux/irqchip/arm-gic-v3.h>
-+
-+#include <asm/assembler.h>
-+#include <asm/memory.h>
-+#include <asm/asm-offsets.h>
-+#include <asm/kvm.h>
-+#include <asm/kvm_asm.h>
-+#include <asm/kvm_arm.h>
-+
-+	.text
-+	.pushsection	.hyp.text, "ax"
-+
-+/*
-+ * We store LRs in reverse order to let the CPU deal with streaming
-+ * access. Use this macro to make it look saner...
-+ */
-+#define LR_OFFSET(n)	(VGIC_V3_CPU_LR + (15 - n) * 8)
-+
-+/*
-+ * Save the VGIC CPU state into memory
-+ * x0: Register pointing to VCPU struct
-+ * Do not corrupt x1!!!
-+ */
-+.macro	save_vgic_v3_state
-+	// Compute the address of struct vgic_cpu
-+	add	x3, x0, #VCPU_VGIC_CPU
-+
-+	// Make sure stores to the GIC via the memory mapped interface
-+	// are now visible to the system register interface
-+	dsb	st
-+
-+	// Save all interesting registers
-+	mrs	x4, ICH_HCR_EL2
-+	mrs	x5, ICH_VMCR_EL2
-+	mrs	x6, ICH_MISR_EL2
-+	mrs	x7, ICH_EISR_EL2
-+	mrs	x8, ICH_ELSR_EL2
-+
-+	str	w4, [x3, #VGIC_V3_CPU_HCR]
-+	str	w5, [x3, #VGIC_V3_CPU_VMCR]
-+	str	w6, [x3, #VGIC_V3_CPU_MISR]
-+	str	w7, [x3, #VGIC_V3_CPU_EISR]
-+	str	w8, [x3, #VGIC_V3_CPU_ELRSR]
-+
-+	msr	ICH_HCR_EL2, xzr
-+
-+	mrs	x21, ICH_VTR_EL2
-+	mvn	w22, w21
-+	ubfiz	w23, w22, 2, 4	// w23 = (15 - ListRegs) * 4
-+
-+	adr	x24, 1f
-+	add	x24, x24, x23
-+	br	x24
-+
-+1:
-+	mrs	x20, ICH_LR15_EL2
-+	mrs	x19, ICH_LR14_EL2
-+	mrs	x18, ICH_LR13_EL2
-+	mrs	x17, ICH_LR12_EL2
-+	mrs	x16, ICH_LR11_EL2
-+	mrs	x15, ICH_LR10_EL2
-+	mrs	x14, ICH_LR9_EL2
-+	mrs	x13, ICH_LR8_EL2
-+	mrs	x12, ICH_LR7_EL2
-+	mrs	x11, ICH_LR6_EL2
-+	mrs	x10, ICH_LR5_EL2
-+	mrs	x9, ICH_LR4_EL2
-+	mrs	x8, ICH_LR3_EL2
-+	mrs	x7, ICH_LR2_EL2
-+	mrs	x6, ICH_LR1_EL2
-+	mrs	x5, ICH_LR0_EL2
-+
-+	adr	x24, 1f
-+	add	x24, x24, x23
-+	br	x24
-+
-+1:
-+	str	x20, [x3, #LR_OFFSET(15)]
-+	str	x19, [x3, #LR_OFFSET(14)]
-+	str	x18, [x3, #LR_OFFSET(13)]
-+	str	x17, [x3, #LR_OFFSET(12)]
-+	str	x16, [x3, #LR_OFFSET(11)]
-+	str	x15, [x3, #LR_OFFSET(10)]
-+	str	x14, [x3, #LR_OFFSET(9)]
-+	str	x13, [x3, #LR_OFFSET(8)]
-+	str	x12, [x3, #LR_OFFSET(7)]
-+	str	x11, [x3, #LR_OFFSET(6)]
-+	str	x10, [x3, #LR_OFFSET(5)]
-+	str	x9, [x3, #LR_OFFSET(4)]
-+	str	x8, [x3, #LR_OFFSET(3)]
-+	str	x7, [x3, #LR_OFFSET(2)]
-+	str	x6, [x3, #LR_OFFSET(1)]
-+	str	x5, [x3, #LR_OFFSET(0)]
-+
-+	tbnz	w21, #29, 6f	// 6 bits
-+	tbz	w21, #30, 5f	// 5 bits
-+				// 7 bits
-+	mrs	x20, ICH_AP0R3_EL2
-+	str	w20, [x3, #(VGIC_V3_CPU_AP0R + 3*4)]
-+	mrs	x19, ICH_AP0R2_EL2
-+	str	w19, [x3, #(VGIC_V3_CPU_AP0R + 2*4)]
-+6:	mrs	x18, ICH_AP0R1_EL2
-+	str	w18, [x3, #(VGIC_V3_CPU_AP0R + 1*4)]
-+5:	mrs	x17, ICH_AP0R0_EL2
-+	str	w17, [x3, #VGIC_V3_CPU_AP0R]
-+
-+	tbnz	w21, #29, 6f	// 6 bits
-+	tbz	w21, #30, 5f	// 5 bits
-+				// 7 bits
-+	mrs	x20, ICH_AP1R3_EL2
-+	str	w20, [x3, #(VGIC_V3_CPU_AP1R + 3*4)]
-+	mrs	x19, ICH_AP1R2_EL2
-+	str	w19, [x3, #(VGIC_V3_CPU_AP1R + 2*4)]
-+6:	mrs	x18, ICH_AP1R1_EL2
-+	str	w18, [x3, #(VGIC_V3_CPU_AP1R + 1*4)]
-+5:	mrs	x17, ICH_AP1R0_EL2
-+	str	w17, [x3, #VGIC_V3_CPU_AP1R]
-+
-+	// Restore SRE_EL1 access and re-enable SRE at EL1.
-+	mrs	x5, ICC_SRE_EL2
-+	orr	x5, x5, #ICC_SRE_EL2_ENABLE
-+	msr	ICC_SRE_EL2, x5
-+	isb
-+	mov	x5, #1
-+	msr	ICC_SRE_EL1, x5
-+.endm
-+
-+/*
-+ * Restore the VGIC CPU state from memory
-+ * x0: Register pointing to VCPU struct
-+ */
-+.macro	restore_vgic_v3_state
-+	// Disable SRE_EL1 access. Necessary, otherwise
-+	// ICH_VMCR_EL2.VFIQEn becomes one, and FIQ happens...
-+	msr	ICC_SRE_EL1, xzr
-+	isb
-+
-+	// Compute the address of struct vgic_cpu
-+	add	x3, x0, #VCPU_VGIC_CPU
-+
-+	// Restore all interesting registers
-+	ldr	w4, [x3, #VGIC_V3_CPU_HCR]
-+	ldr	w5, [x3, #VGIC_V3_CPU_VMCR]
-+
-+	msr	ICH_HCR_EL2, x4
-+	msr	ICH_VMCR_EL2, x5
-+
-+	mrs	x21, ICH_VTR_EL2
-+
-+	tbnz	w21, #29, 6f	// 6 bits
-+	tbz	w21, #30, 5f	// 5 bits
-+				// 7 bits
-+	ldr	w20, [x3, #(VGIC_V3_CPU_AP1R + 3*4)]
-+	msr	ICH_AP1R3_EL2, x20
-+	ldr	w19, [x3, #(VGIC_V3_CPU_AP1R + 2*4)]
-+	msr	ICH_AP1R2_EL2, x19
-+6:	ldr	w18, [x3, #(VGIC_V3_CPU_AP1R + 1*4)]
-+	msr	ICH_AP1R1_EL2, x18
-+5:	ldr	w17, [x3, #VGIC_V3_CPU_AP1R]
-+	msr	ICH_AP1R0_EL2, x17
-+
-+	tbnz	w21, #29, 6f	// 6 bits
-+	tbz	w21, #30, 5f	// 5 bits
-+				// 7 bits
-+	ldr	w20, [x3, #(VGIC_V3_CPU_AP0R + 3*4)]
-+	msr	ICH_AP0R3_EL2, x20
-+	ldr	w19, [x3, #(VGIC_V3_CPU_AP0R + 2*4)]
-+	msr	ICH_AP0R2_EL2, x19
-+6:	ldr	w18, [x3, #(VGIC_V3_CPU_AP0R + 1*4)]
-+	msr	ICH_AP0R1_EL2, x18
-+5:	ldr	w17, [x3, #VGIC_V3_CPU_AP0R]
-+	msr	ICH_AP0R0_EL2, x17
-+
-+	and	w22, w21, #0xf
-+	mvn	w22, w21
-+	ubfiz	w23, w22, 2, 4	// w23 = (15 - ListRegs) * 4
-+
-+	adr	x24, 1f
-+	add	x24, x24, x23
-+	br	x24
-+
-+1:
-+	ldr	x20, [x3, #LR_OFFSET(15)]
-+	ldr	x19, [x3, #LR_OFFSET(14)]
-+	ldr	x18, [x3, #LR_OFFSET(13)]
-+	ldr	x17, [x3, #LR_OFFSET(12)]
-+	ldr	x16, [x3, #LR_OFFSET(11)]
-+	ldr	x15, [x3, #LR_OFFSET(10)]
-+	ldr	x14, [x3, #LR_OFFSET(9)]
-+	ldr	x13, [x3, #LR_OFFSET(8)]
-+	ldr	x12, [x3, #LR_OFFSET(7)]
-+	ldr	x11, [x3, #LR_OFFSET(6)]
-+	ldr	x10, [x3, #LR_OFFSET(5)]
-+	ldr	x9, [x3, #LR_OFFSET(4)]
-+	ldr	x8, [x3, #LR_OFFSET(3)]
-+	ldr	x7, [x3, #LR_OFFSET(2)]
-+	ldr	x6, [x3, #LR_OFFSET(1)]
-+	ldr	x5, [x3, #LR_OFFSET(0)]
-+
-+	adr	x24, 1f
-+	add	x24, x24, x23
-+	br	x24
-+
-+1:
-+	msr	ICH_LR15_EL2, x20
-+	msr	ICH_LR14_EL2, x19
-+	msr	ICH_LR13_EL2, x18
-+	msr	ICH_LR12_EL2, x17
-+	msr	ICH_LR11_EL2, x16
-+	msr	ICH_LR10_EL2, x15
-+	msr	ICH_LR9_EL2,  x14
-+	msr	ICH_LR8_EL2,  x13
-+	msr	ICH_LR7_EL2,  x12
-+	msr	ICH_LR6_EL2,  x11
-+	msr	ICH_LR5_EL2,  x10
-+	msr	ICH_LR4_EL2,   x9
-+	msr	ICH_LR3_EL2,   x8
-+	msr	ICH_LR2_EL2,   x7
-+	msr	ICH_LR1_EL2,   x6
-+	msr	ICH_LR0_EL2,   x5
-+
-+	// Ensure that the above will have reached the
-+	// (re)distributors. This ensure the guest will read
-+	// the correct values from the memory-mapped interface.
-+	isb
-+	dsb	sy
-+
-+	// Prevent the guest from touching the GIC system registers
-+	mrs	x5, ICC_SRE_EL2
-+	and	x5, x5, #~ICC_SRE_EL2_ENABLE
-+	msr	ICC_SRE_EL2, x5
-+.endm
-+
-+ENTRY(__save_vgic_v3_state)
-+	save_vgic_v3_state
-+	ret
-+ENDPROC(__save_vgic_v3_state)
-+
-+ENTRY(__restore_vgic_v3_state)
-+	restore_vgic_v3_state
-+	ret
-+ENDPROC(__restore_vgic_v3_state)
-+
-+ENTRY(__vgic_v3_get_ich_vtr_el2)
-+	mrs	x0, ICH_VTR_EL2
-+	ret
-+ENDPROC(__vgic_v3_get_ich_vtr_el2)
-+
-+	.popsection
-diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
-index 55d4ba4..deed6fa 100644
---- a/arch/ia64/kernel/process.c
-+++ b/arch/ia64/kernel/process.c
-@@ -662,7 +662,7 @@ void
- machine_restart (char *restart_cmd)
- {
- 	(void) notify_die(DIE_MACHINE_RESTART, restart_cmd, NULL, 0, 0, 0);
--	(*efi.reset_system)(EFI_RESET_WARM, 0, 0, NULL);
-+	efi_reboot(REBOOT_WARM, NULL);
- }
- 
- void
-diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
-index 71c52bc..a149c67 100644
---- a/arch/ia64/kernel/time.c
-+++ b/arch/ia64/kernel/time.c
-@@ -384,21 +384,6 @@ static struct irqaction timer_irqaction = {
- 	.name =		"timer"
- };
- 
--static struct platform_device rtc_efi_dev = {
--	.name = "rtc-efi",
--	.id = -1,
--};
--
--static int __init rtc_init(void)
--{
--	if (platform_device_register(&rtc_efi_dev) < 0)
--		printk(KERN_ERR "unable to register rtc device...\n");
--
--	/* not necessarily an error */
--	return 0;
--}
--module_init(rtc_init);
--
- void read_persistent_clock(struct timespec *ts)
- {
- 	efi_gettimeofday(ts);
-diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
-index 1eb5f64..5d71d0e 100644
---- a/arch/x86/include/asm/efi.h
-+++ b/arch/x86/include/asm/efi.h
-@@ -104,6 +104,8 @@ extern void __init runtime_code_page_mkexec(void);
- extern void __init efi_runtime_mkexec(void);
- extern void __init efi_dump_pagetable(void);
- extern void __init efi_apply_memmap_quirks(void);
-+extern int __init efi_reuse_config(u64 tables, int nr_tables);
-+extern void efi_delete_dummy_variable(void);
- 
- struct efi_setup_data {
- 	u64 fw_vendor;
-@@ -156,6 +158,8 @@ static inline efi_status_t efi_thunk_set_virtual_address_map(
- 	return EFI_SUCCESS;
- }
- #endif /* CONFIG_EFI_MIXED */
-+
-+extern bool efi_reboot_required(void);
- #else
- /*
-  * IF EFI is not configured, have the EFI calls return -ENOSYS.
-@@ -168,6 +172,10 @@ static inline efi_status_t efi_thunk_set_virtual_address_map(
- #define efi_call5(_f, _a1, _a2, _a3, _a4, _a5)		(-ENOSYS)
- #define efi_call6(_f, _a1, _a2, _a3, _a4, _a5, _a6)	(-ENOSYS)
- static inline void parse_efi_setup(u64 phys_addr, u32 data_len) {}
-+static inline bool efi_reboot_required(void)
-+{
-+	return false;
-+}
- #endif /* CONFIG_EFI */
- 
- #endif /* _ASM_X86_EFI_H */
-diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
-index 52b1157..17962e6 100644
---- a/arch/x86/kernel/reboot.c
-+++ b/arch/x86/kernel/reboot.c
-@@ -28,6 +28,7 @@
- #include <linux/mc146818rtc.h>
- #include <asm/realmode.h>
- #include <asm/x86_init.h>
-+#include <asm/efi.h>
- 
- /*
-  * Power off function, if any
-@@ -401,12 +402,25 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
- 
- static int __init reboot_init(void)
- {
-+	int rv;
-+
- 	/*
- 	 * Only do the DMI check if reboot_type hasn't been overridden
- 	 * on the command line
- 	 */
--	if (reboot_default)
--		dmi_check_system(reboot_dmi_table);
-+	if (!reboot_default)
-+		return 0;
-+
-+	/*
-+	 * The DMI quirks table takes precedence. If no quirks entry
-+	 * matches and the ACPI Hardware Reduced bit is set, force EFI
-+	 * reboot.
-+	 */
-+	rv = dmi_check_system(reboot_dmi_table);
-+
-+	if (!rv && efi_reboot_required())
-+		reboot_type = BOOT_EFI;
-+
- 	return 0;
- }
- core_initcall(reboot_init);
-@@ -528,11 +542,7 @@ static void native_machine_emergency_restart(void)
- 			break;
- 
- 		case BOOT_EFI:
--			if (efi_enabled(EFI_RUNTIME_SERVICES))
--				efi.reset_system(reboot_mode == REBOOT_WARM ?
--						 EFI_RESET_WARM :
--						 EFI_RESET_COLD,
--						 EFI_SUCCESS, 0, NULL);
-+			efi_reboot(reboot_mode, NULL);
- 			reboot_type = BOOT_BIOS;
- 			break;
- 
-diff --git a/arch/x86/platform/efi/Makefile b/arch/x86/platform/efi/Makefile
-index d51045a..2846aaa 100644
---- a/arch/x86/platform/efi/Makefile
-+++ b/arch/x86/platform/efi/Makefile
-@@ -1,4 +1,4 @@
--obj-$(CONFIG_EFI) 		+= efi.o efi_$(BITS).o efi_stub_$(BITS).o
-+obj-$(CONFIG_EFI) 		+= quirks.o efi.o efi_$(BITS).o efi_stub_$(BITS).o
- obj-$(CONFIG_ACPI_BGRT) += efi-bgrt.o
- obj-$(CONFIG_EARLY_PRINTK_EFI)	+= early_printk.o
- obj-$(CONFIG_EFI_MIXED)		+= efi_thunk_$(BITS).o
-diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
-index 87fc96b..f852443 100644
---- a/arch/x86/platform/efi/efi.c
-+++ b/arch/x86/platform/efi/efi.c
-@@ -56,13 +56,6 @@
- 
- #define EFI_DEBUG
- 
--#define EFI_MIN_RESERVE 5120
--
--#define EFI_DUMMY_GUID \
--	EFI_GUID(0x4424ac57, 0xbe4b, 0x47dd, 0x9e, 0x97, 0xed, 0x50, 0xf0, 0x9f, 0x92, 0xa9)
--
--static efi_char16_t efi_dummy_name[6] = { 'D', 'U', 'M', 'M', 'Y', 0 };
--
- struct efi_memory_map memmap;
- 
- static struct efi efi_phys __initdata;
-@@ -95,15 +88,6 @@ static int __init setup_add_efi_memmap(char *arg)
- }
- early_param("add_efi_memmap", setup_add_efi_memmap);
- 
--static bool efi_no_storage_paranoia;
--
--static int __init setup_storage_paranoia(char *arg)
--{
--	efi_no_storage_paranoia = true;
--	return 0;
--}
--early_param("efi_no_storage_paranoia", setup_storage_paranoia);
--
- static efi_status_t virt_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
- {
- 	unsigned long flags;
-@@ -392,37 +376,6 @@ static void __init print_efi_memmap(void)
- #endif  /*  EFI_DEBUG  */
- }
- 
--void __init efi_reserve_boot_services(void)
--{
--	void *p;
--
--	for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
--		efi_memory_desc_t *md = p;
--		u64 start = md->phys_addr;
--		u64 size = md->num_pages << EFI_PAGE_SHIFT;
--
--		if (md->type != EFI_BOOT_SERVICES_CODE &&
--		    md->type != EFI_BOOT_SERVICES_DATA)
--			continue;
--		/* Only reserve where possible:
--		 * - Not within any already allocated areas
--		 * - Not over any memory area (really needed, if above?)
--		 * - Not within any part of the kernel
--		 * - Not the bios reserved area
--		*/
--		if ((start + size > __pa_symbol(_text)
--				&& start <= __pa_symbol(_end)) ||
--			!e820_all_mapped(start, start+size, E820_RAM) ||
--			memblock_is_region_reserved(start, size)) {
--			/* Could not reserve, skip it */
--			md->num_pages = 0;
--			memblock_dbg("Could not reserve boot range [0x%010llx-0x%010llx]\n",
--				     start, start+size-1);
--		} else
--			memblock_reserve(start, size);
--	}
--}
--
- void __init efi_unmap_memmap(void)
- {
- 	clear_bit(EFI_MEMMAP, &efi.flags);
-@@ -432,29 +385,6 @@ void __init efi_unmap_memmap(void)
- 	}
- }
- 
--void __init efi_free_boot_services(void)
--{
--	void *p;
--
--	for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
--		efi_memory_desc_t *md = p;
--		unsigned long long start = md->phys_addr;
--		unsigned long long size = md->num_pages << EFI_PAGE_SHIFT;
--
--		if (md->type != EFI_BOOT_SERVICES_CODE &&
--		    md->type != EFI_BOOT_SERVICES_DATA)
--			continue;
--
--		/* Could not reserve boot area */
--		if (!size)
--			continue;
--
--		free_bootmem_late(start, size);
--	}
--
--	efi_unmap_memmap();
--}
--
- static int __init efi_systab_init(void *phys)
- {
- 	if (efi_enabled(EFI_64BIT)) {
-@@ -649,62 +579,6 @@ static int __init efi_memmap_init(void)
- 	return 0;
- }
- 
--/*
-- * A number of config table entries get remapped to virtual addresses
-- * after entering EFI virtual mode. However, the kexec kernel requires
-- * their physical addresses therefore we pass them via setup_data and
-- * correct those entries to their respective physical addresses here.
-- *
-- * Currently only handles smbios which is necessary for some firmware
-- * implementation.
-- */
--static int __init efi_reuse_config(u64 tables, int nr_tables)
--{
--	int i, sz, ret = 0;
--	void *p, *tablep;
--	struct efi_setup_data *data;
--
--	if (!efi_setup)
--		return 0;
--
--	if (!efi_enabled(EFI_64BIT))
--		return 0;
--
--	data = early_memremap(efi_setup, sizeof(*data));
--	if (!data) {
--		ret = -ENOMEM;
--		goto out;
--	}
--
--	if (!data->smbios)
--		goto out_memremap;
--
--	sz = sizeof(efi_config_table_64_t);
--
--	p = tablep = early_memremap(tables, nr_tables * sz);
--	if (!p) {
--		pr_err("Could not map Configuration table!\n");
--		ret = -ENOMEM;
--		goto out_memremap;
--	}
--
--	for (i = 0; i < efi.systab->nr_tables; i++) {
--		efi_guid_t guid;
--
--		guid = ((efi_config_table_64_t *)p)->guid;
--
--		if (!efi_guidcmp(guid, SMBIOS_TABLE_GUID))
--			((efi_config_table_64_t *)p)->table = data->smbios;
--		p += sz;
--	}
--	early_iounmap(tablep, nr_tables * sz);
--
--out_memremap:
--	early_iounmap(data, sizeof(*data));
--out:
--	return ret;
--}
--
- void __init efi_init(void)
- {
- 	efi_char16_t *c16;
-@@ -1057,11 +931,7 @@ static void __init kexec_enter_virtual_mode(void)
- 		runtime_code_page_mkexec();
- 
- 	/* clean DUMMY object */
--	efi.set_variable(efi_dummy_name, &EFI_DUMMY_GUID,
--			 EFI_VARIABLE_NON_VOLATILE |
--			 EFI_VARIABLE_BOOTSERVICE_ACCESS |
--			 EFI_VARIABLE_RUNTIME_ACCESS,
--			 0, NULL);
-+	efi_delete_dummy_variable();
- #endif
- }
- 
-@@ -1179,11 +1049,7 @@ static void __init __efi_enter_virtual_mode(void)
- 	free_pages((unsigned long)new_memmap, pg_shift);
- 
- 	/* clean DUMMY object */
--	efi.set_variable(efi_dummy_name, &EFI_DUMMY_GUID,
--			 EFI_VARIABLE_NON_VOLATILE |
--			 EFI_VARIABLE_BOOTSERVICE_ACCESS |
--			 EFI_VARIABLE_RUNTIME_ACCESS,
--			 0, NULL);
-+	efi_delete_dummy_variable();
- }
- 
- void __init efi_enter_virtual_mode(void)
-@@ -1230,86 +1096,6 @@ u64 efi_mem_attributes(unsigned long phys_addr)
- 	return 0;
- }
- 
--/*
-- * Some firmware implementations refuse to boot if there's insufficient space
-- * in the variable store. Ensure that we never use more than a safe limit.
-- *
-- * Return EFI_SUCCESS if it is safe to write 'size' bytes to the variable
-- * store.
-- */
--efi_status_t efi_query_variable_store(u32 attributes, unsigned long size)
--{
--	efi_status_t status;
--	u64 storage_size, remaining_size, max_size;
--
--	if (!(attributes & EFI_VARIABLE_NON_VOLATILE))
--		return 0;
--
--	status = efi.query_variable_info(attributes, &storage_size,
--					 &remaining_size, &max_size);
--	if (status != EFI_SUCCESS)
--		return status;
--
--	/*
--	 * We account for that by refusing the write if permitting it would
--	 * reduce the available space to under 5KB. This figure was provided by
--	 * Samsung, so should be safe.
--	 */
--	if ((remaining_size - size < EFI_MIN_RESERVE) &&
--		!efi_no_storage_paranoia) {
--
--		/*
--		 * Triggering garbage collection may require that the firmware
--		 * generate a real EFI_OUT_OF_RESOURCES error. We can force
--		 * that by attempting to use more space than is available.
--		 */
--		unsigned long dummy_size = remaining_size + 1024;
--		void *dummy = kzalloc(dummy_size, GFP_ATOMIC);
--
--		if (!dummy)
--			return EFI_OUT_OF_RESOURCES;
--
--		status = efi.set_variable(efi_dummy_name, &EFI_DUMMY_GUID,
--					  EFI_VARIABLE_NON_VOLATILE |
--					  EFI_VARIABLE_BOOTSERVICE_ACCESS |
--					  EFI_VARIABLE_RUNTIME_ACCESS,
--					  dummy_size, dummy);
--
--		if (status == EFI_SUCCESS) {
--			/*
--			 * This should have failed, so if it didn't make sure
--			 * that we delete it...
--			 */
--			efi.set_variable(efi_dummy_name, &EFI_DUMMY_GUID,
--					 EFI_VARIABLE_NON_VOLATILE |
--					 EFI_VARIABLE_BOOTSERVICE_ACCESS |
--					 EFI_VARIABLE_RUNTIME_ACCESS,
--					 0, dummy);
--		}
--
--		kfree(dummy);
--
--		/*
--		 * The runtime code may now have triggered a garbage collection
--		 * run, so check the variable info again
--		 */
--		status = efi.query_variable_info(attributes, &storage_size,
--						 &remaining_size, &max_size);
--
--		if (status != EFI_SUCCESS)
--			return status;
--
--		/*
--		 * There still isn't enough room, so return an error
--		 */
--		if (remaining_size - size < EFI_MIN_RESERVE)
--			return EFI_OUT_OF_RESOURCES;
--	}
--
--	return EFI_SUCCESS;
--}
--EXPORT_SYMBOL_GPL(efi_query_variable_store);
--
- static int __init parse_efi_cmdline(char *str)
- {
- 	if (*str == '=')
-@@ -1321,22 +1107,3 @@ static int __init parse_efi_cmdline(char *str)
- 	return 0;
- }
- early_param("efi", parse_efi_cmdline);
--
--void __init efi_apply_memmap_quirks(void)
--{
--	/*
--	 * Once setup is done earlier, unmap the EFI memory map on mismatched
--	 * firmware/kernel architectures since there is no support for runtime
--	 * services.
--	 */
--	if (!efi_runtime_supported()) {
--		pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");
--		efi_unmap_memmap();
--	}
--
--	/*
--	 * UV doesn't support the new EFI pagetable mapping yet.
--	 */
--	if (is_uv_system())
--		set_bit(EFI_OLD_MEMMAP, &efi.flags);
--}
-diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
-new file mode 100644
-index 0000000..1b9c4c3
---- /dev/null
-+++ b/arch/x86/platform/efi/quirks.c
-@@ -0,0 +1,290 @@
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/time.h>
-+#include <linux/types.h>
-+#include <linux/efi.h>
-+#include <linux/slab.h>
-+#include <linux/memblock.h>
-+#include <linux/bootmem.h>
-+#include <linux/acpi.h>
-+#include <asm/efi.h>
-+#include <asm/uv/uv.h>
-+
-+#define EFI_MIN_RESERVE 5120
-+
-+#define EFI_DUMMY_GUID \
-+	EFI_GUID(0x4424ac57, 0xbe4b, 0x47dd, 0x9e, 0x97, 0xed, 0x50, 0xf0, 0x9f, 0x92, 0xa9)
-+
-+static efi_char16_t efi_dummy_name[6] = { 'D', 'U', 'M', 'M', 'Y', 0 };
-+
-+static bool efi_no_storage_paranoia;
-+
-+/*
-+ * Some firmware implementations refuse to boot if there's insufficient
-+ * space in the variable store. The implementation of garbage collection
-+ * in some FW versions causes stale (deleted) variables to take up space
-+ * longer than intended and space is only freed once the store becomes
-+ * almost completely full.
-+ *
-+ * Enabling this option disables the space checks in
-+ * efi_query_variable_store() and forces garbage collection.
-+ *
-+ * Only enable this option if deleting EFI variables does not free up
-+ * space in your variable store, e.g. if despite deleting variables
-+ * you're unable to create new ones.
-+ */
-+static int __init setup_storage_paranoia(char *arg)
-+{
-+	efi_no_storage_paranoia = true;
-+	return 0;
-+}
-+early_param("efi_no_storage_paranoia", setup_storage_paranoia);
-+
-+/*
-+ * Deleting the dummy variable which kicks off garbage collection
-+*/
-+void efi_delete_dummy_variable(void)
-+{
-+	efi.set_variable(efi_dummy_name, &EFI_DUMMY_GUID,
-+			 EFI_VARIABLE_NON_VOLATILE |
-+			 EFI_VARIABLE_BOOTSERVICE_ACCESS |
-+			 EFI_VARIABLE_RUNTIME_ACCESS,
-+			 0, NULL);
-+}
-+
-+/*
-+ * Some firmware implementations refuse to boot if there's insufficient space
-+ * in the variable store. Ensure that we never use more than a safe limit.
-+ *
-+ * Return EFI_SUCCESS if it is safe to write 'size' bytes to the variable
-+ * store.
-+ */
-+efi_status_t efi_query_variable_store(u32 attributes, unsigned long size)
-+{
-+	efi_status_t status;
-+	u64 storage_size, remaining_size, max_size;
-+
-+	if (!(attributes & EFI_VARIABLE_NON_VOLATILE))
-+		return 0;
-+
-+	status = efi.query_variable_info(attributes, &storage_size,
-+					 &remaining_size, &max_size);
-+	if (status != EFI_SUCCESS)
-+		return status;
-+
-+	/*
-+	 * We account for that by refusing the write if permitting it would
-+	 * reduce the available space to under 5KB. This figure was provided by
-+	 * Samsung, so should be safe.
-+	 */
-+	if ((remaining_size - size < EFI_MIN_RESERVE) &&
-+		!efi_no_storage_paranoia) {
-+
-+		/*
-+		 * Triggering garbage collection may require that the firmware
-+		 * generate a real EFI_OUT_OF_RESOURCES error. We can force
-+		 * that by attempting to use more space than is available.
-+		 */
-+		unsigned long dummy_size = remaining_size + 1024;
-+		void *dummy = kzalloc(dummy_size, GFP_ATOMIC);
-+
-+		if (!dummy)
-+			return EFI_OUT_OF_RESOURCES;
-+
-+		status = efi.set_variable(efi_dummy_name, &EFI_DUMMY_GUID,
-+					  EFI_VARIABLE_NON_VOLATILE |
-+					  EFI_VARIABLE_BOOTSERVICE_ACCESS |
-+					  EFI_VARIABLE_RUNTIME_ACCESS,
-+					  dummy_size, dummy);
-+
-+		if (status == EFI_SUCCESS) {
-+			/*
-+			 * This should have failed, so if it didn't make sure
-+			 * that we delete it...
-+			 */
-+			efi_delete_dummy_variable();
-+		}
-+
-+		kfree(dummy);
-+
-+		/*
-+		 * The runtime code may now have triggered a garbage collection
-+		 * run, so check the variable info again
-+		 */
-+		status = efi.query_variable_info(attributes, &storage_size,
-+						 &remaining_size, &max_size);
-+
-+		if (status != EFI_SUCCESS)
-+			return status;
-+
-+		/*
-+		 * There still isn't enough room, so return an error
-+		 */
-+		if (remaining_size - size < EFI_MIN_RESERVE)
-+			return EFI_OUT_OF_RESOURCES;
-+	}
-+
-+	return EFI_SUCCESS;
-+}
-+EXPORT_SYMBOL_GPL(efi_query_variable_store);
-+
-+/*
-+ * The UEFI specification makes it clear that the operating system is free to do
-+ * whatever it wants with boot services code after ExitBootServices() has been
-+ * called. Ignoring this recommendation a significant bunch of EFI implementations 
-+ * continue calling into boot services code (SetVirtualAddressMap). In order to 
-+ * work around such buggy implementations we reserve boot services region during 
-+ * EFI init and make sure it stays executable. Then, after SetVirtualAddressMap(), it
-+* is discarded.
-+*/
-+void __init efi_reserve_boot_services(void)
-+{
-+	void *p;
-+
-+	for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
-+		efi_memory_desc_t *md = p;
-+		u64 start = md->phys_addr;
-+		u64 size = md->num_pages << EFI_PAGE_SHIFT;
-+
-+		if (md->type != EFI_BOOT_SERVICES_CODE &&
-+		    md->type != EFI_BOOT_SERVICES_DATA)
-+			continue;
-+		/* Only reserve where possible:
-+		 * - Not within any already allocated areas
-+		 * - Not over any memory area (really needed, if above?)
-+		 * - Not within any part of the kernel
-+		 * - Not the bios reserved area
-+		*/
-+		if ((start + size > __pa_symbol(_text)
-+				&& start <= __pa_symbol(_end)) ||
-+			!e820_all_mapped(start, start+size, E820_RAM) ||
-+			memblock_is_region_reserved(start, size)) {
-+			/* Could not reserve, skip it */
-+			md->num_pages = 0;
-+			memblock_dbg("Could not reserve boot range [0x%010llx-0x%010llx]\n",
-+				     start, start+size-1);
-+		} else
-+			memblock_reserve(start, size);
-+	}
-+}
-+
-+void __init efi_free_boot_services(void)
-+{
-+	void *p;
-+
-+	for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
-+		efi_memory_desc_t *md = p;
-+		unsigned long long start = md->phys_addr;
-+		unsigned long long size = md->num_pages << EFI_PAGE_SHIFT;
-+
-+		if (md->type != EFI_BOOT_SERVICES_CODE &&
-+		    md->type != EFI_BOOT_SERVICES_DATA)
-+			continue;
-+
-+		/* Could not reserve boot area */
-+		if (!size)
-+			continue;
-+
-+		free_bootmem_late(start, size);
-+	}
-+
-+	efi_unmap_memmap();
-+}
-+
-+/*
-+ * A number of config table entries get remapped to virtual addresses
-+ * after entering EFI virtual mode. However, the kexec kernel requires
-+ * their physical addresses therefore we pass them via setup_data and
-+ * correct those entries to their respective physical addresses here.
-+ *
-+ * Currently only handles smbios which is necessary for some firmware
-+ * implementation.
-+ */
-+int __init efi_reuse_config(u64 tables, int nr_tables)
-+{
-+	int i, sz, ret = 0;
-+	void *p, *tablep;
-+	struct efi_setup_data *data;
-+
-+	if (!efi_setup)
-+		return 0;
-+
-+	if (!efi_enabled(EFI_64BIT))
-+		return 0;
-+
-+	data = early_memremap(efi_setup, sizeof(*data));
-+	if (!data) {
-+		ret = -ENOMEM;
-+		goto out;
-+	}
-+
-+	if (!data->smbios)
-+		goto out_memremap;
-+
-+	sz = sizeof(efi_config_table_64_t);
-+
-+	p = tablep = early_memremap(tables, nr_tables * sz);
-+	if (!p) {
-+		pr_err("Could not map Configuration table!\n");
-+		ret = -ENOMEM;
-+		goto out_memremap;
-+	}
-+
-+	for (i = 0; i < efi.systab->nr_tables; i++) {
-+		efi_guid_t guid;
-+
-+		guid = ((efi_config_table_64_t *)p)->guid;
-+
-+		if (!efi_guidcmp(guid, SMBIOS_TABLE_GUID))
-+			((efi_config_table_64_t *)p)->table = data->smbios;
-+		p += sz;
-+	}
-+	early_iounmap(tablep, nr_tables * sz);
-+
-+out_memremap:
-+	early_iounmap(data, sizeof(*data));
-+out:
-+	return ret;
-+}
-+
-+void __init efi_apply_memmap_quirks(void)
-+{
-+	/*
-+	 * Once setup is done earlier, unmap the EFI memory map on mismatched
-+	 * firmware/kernel architectures since there is no support for runtime
-+	 * services.
-+	 */
-+	if (!efi_runtime_supported()) {
-+		pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");
-+		efi_unmap_memmap();
-+	}
-+
-+	/*
-+	 * UV doesn't support the new EFI pagetable mapping yet.
-+	 */
-+	if (is_uv_system())
-+		set_bit(EFI_OLD_MEMMAP, &efi.flags);
-+}
-+
-+/*
-+ * For most modern platforms the preferred method of powering off is via
-+ * ACPI. However, there are some that are known to require the use of
-+ * EFI runtime services and for which ACPI does not work at all.
-+ *
-+ * Using EFI is a last resort, to be used only if no other option
-+ * exists.
-+ */
-+bool efi_reboot_required(void)
-+{
-+	if (!acpi_gbl_reduced_hardware)
-+		return false;
-+
-+	efi_reboot_quirk_mode = EFI_RESET_WARM;
-+	return true;
-+}
-+
-+bool efi_poweroff_required(void)
-+{
-+	return !!acpi_gbl_reduced_hardware;
-+}
 diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
-index ee3a365..f9431b4 100644
+index bc28111..00e5a0c 100644
 --- a/drivers/ata/ahci_xgene.c
 +++ b/drivers/ata/ahci_xgene.c
-@@ -131,7 +131,8 @@ static unsigned int xgene_ahci_qc_issue(struct ata_queued_cmd *qc)
+@@ -134,7 +134,8 @@ static unsigned int xgene_ahci_qc_issue(struct ata_queued_cmd *qc)
  	struct xgene_ahci_context *ctx = hpriv->plat_data;
  	int rc = 0;
  
@@ -3630,1050 +747,11 @@ index ee3a365..f9431b4 100644
  		xgene_ahci_restart_engine(ap);
  
  	rc = ahci_qc_issue(qc);
-diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
-index 9553496..c135154 100644
---- a/drivers/firmware/efi/Makefile
-+++ b/drivers/firmware/efi/Makefile
-@@ -1,7 +1,7 @@
- #
- # Makefile for linux kernel
- #
--obj-$(CONFIG_EFI)			+= efi.o vars.o
-+obj-$(CONFIG_EFI)			+= efi.o vars.o reboot.o
- obj-$(CONFIG_EFI_VARS)			+= efivars.o
- obj-$(CONFIG_EFI_VARS_PSTORE)		+= efi-pstore.o
- obj-$(CONFIG_UEFI_CPER)			+= cper.o
-diff --git a/drivers/firmware/efi/reboot.c b/drivers/firmware/efi/reboot.c
-new file mode 100644
-index 0000000..f94fb95
---- /dev/null
-+++ b/drivers/firmware/efi/reboot.c
-@@ -0,0 +1,55 @@
-+/*
-+ * Copyright (C) 2014 Intel Corporation; author Matt Fleming
-+ */
-+#include <linux/efi.h>
-+#include <linux/reboot.h>
-+
-+int efi_reboot_quirk_mode = -1;
-+
-+void efi_reboot(enum reboot_mode reboot_mode, const char *__unused)
-+{
-+	int efi_mode;
-+
-+	if (!efi_enabled(EFI_RUNTIME_SERVICES))
-+		return;
-+
-+	switch (reboot_mode) {
-+	case REBOOT_WARM:
-+	case REBOOT_SOFT:
-+		efi_mode = EFI_RESET_WARM;
-+		break;
-+	default:
-+		efi_mode = EFI_RESET_COLD;
-+		break;
-+	}
-+
-+	/*
-+	 * If a quirk forced an EFI reset mode, always use that.
-+	 */
-+	if (efi_reboot_quirk_mode != -1)
-+		efi_mode = efi_reboot_quirk_mode;
-+
-+	efi.reset_system(efi_mode, EFI_SUCCESS, 0, NULL);
-+}
-+
-+bool __weak efi_poweroff_required(void)
-+{
-+	return false;
-+}
-+
-+static void efi_power_off(void)
-+{
-+	efi.reset_system(EFI_RESET_SHUTDOWN, EFI_SUCCESS, 0, NULL);
-+}
-+
-+static int __init efi_shutdown_init(void)
-+{
-+	if (!efi_enabled(EFI_RUNTIME_SERVICES))
-+		return -ENODEV;
-+
-+	if (efi_poweroff_required())
-+		pm_power_off = efi_power_off;
-+
-+	return 0;
-+}
-+late_initcall(efi_shutdown_init);
-diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
-index bbb746e..7f0c2a3 100644
---- a/drivers/irqchip/Kconfig
-+++ b/drivers/irqchip/Kconfig
-@@ -10,6 +10,11 @@ config ARM_GIC
- config GIC_NON_BANKED
- 	bool
- 
-+config ARM_GIC_V3
-+	bool
-+	select IRQ_DOMAIN
-+	select MULTI_IRQ_HANDLER
-+
- config ARM_NVIC
- 	bool
- 	select IRQ_DOMAIN
-diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
-index 62a13e5..c57e642 100644
---- a/drivers/irqchip/Makefile
-+++ b/drivers/irqchip/Makefile
-@@ -15,7 +15,8 @@ obj-$(CONFIG_ORION_IRQCHIP)		+= irq-orion.o
- obj-$(CONFIG_ARCH_SUNXI)		+= irq-sun4i.o
- obj-$(CONFIG_ARCH_SUNXI)		+= irq-sunxi-nmi.o
- obj-$(CONFIG_ARCH_SPEAR3XX)		+= spear-shirq.o
--obj-$(CONFIG_ARM_GIC)			+= irq-gic.o
-+obj-$(CONFIG_ARM_GIC)			+= irq-gic.o irq-gic-common.o
-+obj-$(CONFIG_ARM_GIC_V3)		+= irq-gic-v3.o irq-gic-common.o
- obj-$(CONFIG_ARM_NVIC)			+= irq-nvic.o
- obj-$(CONFIG_ARM_VIC)			+= irq-vic.o
- obj-$(CONFIG_IMGPDC_IRQ)		+= irq-imgpdc.o
-diff --git a/drivers/irqchip/irq-gic-common.c b/drivers/irqchip/irq-gic-common.c
-new file mode 100644
-index 0000000..60ac704
---- /dev/null
-+++ b/drivers/irqchip/irq-gic-common.c
-@@ -0,0 +1,115 @@
-+/*
-+ * Copyright (C) 2002 ARM Limited, All Rights Reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/interrupt.h>
-+#include <linux/io.h>
-+#include <linux/irq.h>
-+#include <linux/irqchip/arm-gic.h>
-+
-+#include "irq-gic-common.h"
-+
-+void gic_configure_irq(unsigned int irq, unsigned int type,
-+		       void __iomem *base, void (*sync_access)(void))
-+{
-+	u32 enablemask = 1 << (irq % 32);
-+	u32 enableoff = (irq / 32) * 4;
-+	u32 confmask = 0x2 << ((irq % 16) * 2);
-+	u32 confoff = (irq / 16) * 4;
-+	bool enabled = false;
-+	u32 val;
-+
-+	/*
-+	 * Read current configuration register, and insert the config
-+	 * for "irq", depending on "type".
-+	 */
-+	val = readl_relaxed(base + GIC_DIST_CONFIG + confoff);
-+	if (type == IRQ_TYPE_LEVEL_HIGH)
-+		val &= ~confmask;
-+	else if (type == IRQ_TYPE_EDGE_RISING)
-+		val |= confmask;
-+
-+	/*
-+	 * As recommended by the spec, disable the interrupt before changing
-+	 * the configuration
-+	 */
-+	if (readl_relaxed(base + GIC_DIST_ENABLE_SET + enableoff) & enablemask) {
-+		writel_relaxed(enablemask, base + GIC_DIST_ENABLE_CLEAR + enableoff);
-+		if (sync_access)
-+			sync_access();
-+		enabled = true;
-+	}
-+
-+	/*
-+	 * Write back the new configuration, and possibly re-enable
-+	 * the interrupt.
-+	 */
-+	writel_relaxed(val, base + GIC_DIST_CONFIG + confoff);
-+
-+	if (enabled)
-+		writel_relaxed(enablemask, base + GIC_DIST_ENABLE_SET + enableoff);
-+
-+	if (sync_access)
-+		sync_access();
-+}
-+
-+void __init gic_dist_config(void __iomem *base, int gic_irqs,
-+			    void (*sync_access)(void))
-+{
-+	unsigned int i;
-+
-+	/*
-+	 * Set all global interrupts to be level triggered, active low.
-+	 */
-+	for (i = 32; i < gic_irqs; i += 16)
-+		writel_relaxed(0, base + GIC_DIST_CONFIG + i / 4);
-+
-+	/*
-+	 * Set priority on all global interrupts.
-+	 */
-+	for (i = 32; i < gic_irqs; i += 4)
-+		writel_relaxed(0xa0a0a0a0, base + GIC_DIST_PRI + i);
-+
-+	/*
-+	 * Disable all interrupts.  Leave the PPI and SGIs alone
-+	 * as they are enabled by redistributor registers.
-+	 */
-+	for (i = 32; i < gic_irqs; i += 32)
-+		writel_relaxed(0xffffffff, base + GIC_DIST_ENABLE_CLEAR + i / 8);
-+
-+	if (sync_access)
-+		sync_access();
-+}
-+
-+void gic_cpu_config(void __iomem *base, void (*sync_access)(void))
-+{
-+	int i;
-+
-+	/*
-+	 * Deal with the banked PPI and SGI interrupts - disable all
-+	 * PPI interrupts, ensure all SGI interrupts are enabled.
-+	 */
-+	writel_relaxed(0xffff0000, base + GIC_DIST_ENABLE_CLEAR);
-+	writel_relaxed(0x0000ffff, base + GIC_DIST_ENABLE_SET);
-+
-+	/*
-+	 * Set priority on PPI and SGI interrupts
-+	 */
-+	for (i = 0; i < 32; i += 4)
-+		writel_relaxed(0xa0a0a0a0, base + GIC_DIST_PRI + i * 4 / 4);
-+
-+	if (sync_access)
-+		sync_access();
-+}
-diff --git a/drivers/irqchip/irq-gic-common.h b/drivers/irqchip/irq-gic-common.h
-new file mode 100644
-index 0000000..b41f024
---- /dev/null
-+++ b/drivers/irqchip/irq-gic-common.h
-@@ -0,0 +1,29 @@
-+/*
-+ * Copyright (C) 2002 ARM Limited, All Rights Reserved.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef _IRQ_GIC_COMMON_H
-+#define _IRQ_GIC_COMMON_H
-+
-+#include <linux/of.h>
-+#include <linux/irqdomain.h>
-+
-+void gic_configure_irq(unsigned int irq, unsigned int type,
-+                       void __iomem *base, void (*sync_access)(void));
-+void gic_dist_config(void __iomem *base, int gic_irqs,
-+		     void (*sync_access)(void));
-+void gic_cpu_config(void __iomem *base, void (*sync_access)(void));
-+
-+#endif /* _IRQ_GIC_COMMON_H */
-diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
-new file mode 100644
-index 0000000..81519ba
---- /dev/null
-+++ b/drivers/irqchip/irq-gic-v3.c
-@@ -0,0 +1,692 @@
-+/*
-+ * Copyright (C) 2013, 2014 ARM Limited, All Rights Reserved.
-+ * Author: Marc Zyngier <marc.zyngier@arm.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/cpu.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+#include <linux/of.h>
-+#include <linux/of_address.h>
-+#include <linux/of_irq.h>
-+#include <linux/percpu.h>
-+#include <linux/slab.h>
-+
-+#include <linux/irqchip/arm-gic-v3.h>
-+
-+#include <asm/cputype.h>
-+#include <asm/exception.h>
-+#include <asm/smp_plat.h>
-+
-+#include "irq-gic-common.h"
-+#include "irqchip.h"
-+
-+struct gic_chip_data {
-+	void __iomem		*dist_base;
-+	void __iomem		**redist_base;
-+	void __percpu __iomem	**rdist;
-+	struct irq_domain	*domain;
-+	u64			redist_stride;
-+	u32			redist_regions;
-+	unsigned int		irq_nr;
-+};
-+
-+static struct gic_chip_data gic_data __read_mostly;
-+
-+#define gic_data_rdist()		(this_cpu_ptr(gic_data.rdist))
-+#define gic_data_rdist_rd_base()	(*gic_data_rdist())
-+#define gic_data_rdist_sgi_base()	(gic_data_rdist_rd_base() + SZ_64K)
-+
-+/* Our default, arbitrary priority value. Linux only uses one anyway. */
-+#define DEFAULT_PMR_VALUE	0xf0
-+
-+static inline unsigned int gic_irq(struct irq_data *d)
-+{
-+	return d->hwirq;
-+}
-+
-+static inline int gic_irq_in_rdist(struct irq_data *d)
-+{
-+	return gic_irq(d) < 32;
-+}
-+
-+static inline void __iomem *gic_dist_base(struct irq_data *d)
-+{
-+	if (gic_irq_in_rdist(d))	/* SGI+PPI -> SGI_base for this CPU */
-+		return gic_data_rdist_sgi_base();
-+
-+	if (d->hwirq <= 1023)		/* SPI -> dist_base */
-+		return gic_data.dist_base;
-+
-+	if (d->hwirq >= 8192)
-+		BUG();		/* LPI Detected!!! */
-+
-+	return NULL;
-+}
-+
-+static void gic_do_wait_for_rwp(void __iomem *base)
-+{
-+	u32 count = 1000000;	/* 1s! */
-+
-+	while (readl_relaxed(base + GICD_CTLR) & GICD_CTLR_RWP) {
-+		count--;
-+		if (!count) {
-+			pr_err_ratelimited("RWP timeout, gone fishing\n");
-+			return;
-+		}
-+		cpu_relax();
-+		udelay(1);
-+	};
-+}
-+
-+/* Wait for completion of a distributor change */
-+static void gic_dist_wait_for_rwp(void)
-+{
-+	gic_do_wait_for_rwp(gic_data.dist_base);
-+}
-+
-+/* Wait for completion of a redistributor change */
-+static void gic_redist_wait_for_rwp(void)
-+{
-+	gic_do_wait_for_rwp(gic_data_rdist_rd_base());
-+}
-+
-+/* Low level accessors */
-+static u64 gic_read_iar(void)
-+{
-+	u64 irqstat;
-+
-+	asm volatile("mrs %0, " __stringify(ICC_IAR1_EL1) : "=r" (irqstat));
-+	return irqstat;
-+}
-+
-+static void gic_write_pmr(u64 val)
-+{
-+	asm volatile("msr " __stringify(ICC_PMR_EL1) ", %0" : : "r" (val));
-+}
-+
-+static void gic_write_ctlr(u64 val)
-+{
-+	asm volatile("msr " __stringify(ICC_CTLR_EL1) ", %0" : : "r" (val));
-+	isb();
-+}
-+
-+static void gic_write_grpen1(u64 val)
-+{
-+	asm volatile("msr " __stringify(ICC_GRPEN1_EL1) ", %0" : : "r" (val));
-+	isb();
-+}
-+
-+static void gic_write_sgi1r(u64 val)
-+{
-+	asm volatile("msr " __stringify(ICC_SGI1R_EL1) ", %0" : : "r" (val));
-+}
-+
-+static void gic_enable_sre(void)
-+{
-+	u64 val;
-+
-+	asm volatile("mrs %0, " __stringify(ICC_SRE_EL1) : "=r" (val));
-+	val |= ICC_SRE_EL1_SRE;
-+	asm volatile("msr " __stringify(ICC_SRE_EL1) ", %0" : : "r" (val));
-+	isb();
-+
-+	/*
-+	 * Need to check that the SRE bit has actually been set. If
-+	 * not, it means that SRE is disabled at EL2. We're going to
-+	 * die painfully, and there is nothing we can do about it.
-+	 *
-+	 * Kindly inform the luser.
-+	 */
-+	asm volatile("mrs %0, " __stringify(ICC_SRE_EL1) : "=r" (val));
-+	if (!(val & ICC_SRE_EL1_SRE))
-+		pr_err("GIC: unable to set SRE (disabled at EL2), panic ahead\n");
-+}
-+
-+static void gic_enable_redist(void)
-+{
-+	void __iomem *rbase;
-+	u32 count = 1000000;	/* 1s! */
-+	u32 val;
-+
-+	rbase = gic_data_rdist_rd_base();
-+
-+	/* Wake up this CPU redistributor */
-+	val = readl_relaxed(rbase + GICR_WAKER);
-+	val &= ~GICR_WAKER_ProcessorSleep;
-+	writel_relaxed(val, rbase + GICR_WAKER);
-+
-+	while (readl_relaxed(rbase + GICR_WAKER) & GICR_WAKER_ChildrenAsleep) {
-+		count--;
-+		if (!count) {
-+			pr_err_ratelimited("redist didn't wake up...\n");
-+			return;
-+		}
-+		cpu_relax();
-+		udelay(1);
-+	};
-+}
-+
-+/*
-+ * Routines to disable, enable, EOI and route interrupts
-+ */
-+static void gic_poke_irq(struct irq_data *d, u32 offset)
-+{
-+	u32 mask = 1 << (gic_irq(d) % 32);
-+	void (*rwp_wait)(void);
-+	void __iomem *base;
-+
-+	if (gic_irq_in_rdist(d)) {
-+		base = gic_data_rdist_sgi_base();
-+		rwp_wait = gic_redist_wait_for_rwp;
-+	} else {
-+		base = gic_data.dist_base;
-+		rwp_wait = gic_dist_wait_for_rwp;
-+	}
-+
-+	writel_relaxed(mask, base + offset + (gic_irq(d) / 32) * 4);
-+	rwp_wait();
-+}
-+
-+static int gic_peek_irq(struct irq_data *d, u32 offset)
-+{
-+	u32 mask = 1 << (gic_irq(d) % 32);
-+	void __iomem *base;
-+
-+	if (gic_irq_in_rdist(d))
-+		base = gic_data_rdist_sgi_base();
-+	else
-+		base = gic_data.dist_base;
-+
-+	return !!(readl_relaxed(base + offset + (gic_irq(d) / 32) * 4) & mask);
-+}
-+
-+static void gic_mask_irq(struct irq_data *d)
-+{
-+	gic_poke_irq(d, GICD_ICENABLER);
-+}
-+
-+static void gic_unmask_irq(struct irq_data *d)
-+{
-+	gic_poke_irq(d, GICD_ISENABLER);
-+}
-+
-+static void gic_eoi_irq(struct irq_data *d)
-+{
-+	gic_write_eoir(gic_irq(d));
-+}
-+
-+static int gic_set_type(struct irq_data *d, unsigned int type)
-+{
-+	unsigned int irq = gic_irq(d);
-+	void (*rwp_wait)(void);
-+	void __iomem *base;
-+
-+	/* Interrupt configuration for SGIs can't be changed */
-+	if (irq < 16)
-+		return -EINVAL;
-+
-+	if (type != IRQ_TYPE_LEVEL_HIGH && type != IRQ_TYPE_EDGE_RISING)
-+		return -EINVAL;
-+
-+	if (gic_irq_in_rdist(d)) {
-+		base = gic_data_rdist_sgi_base();
-+		rwp_wait = gic_redist_wait_for_rwp;
-+	} else {
-+		base = gic_data.dist_base;
-+		rwp_wait = gic_dist_wait_for_rwp;
-+	}
-+
-+	gic_configure_irq(irq, type, base, rwp_wait);
-+
-+	return 0;
-+}
-+
-+static u64 gic_mpidr_to_affinity(u64 mpidr)
-+{
-+	u64 aff;
-+
-+	aff = (MPIDR_AFFINITY_LEVEL(mpidr, 3) << 32 |
-+	       MPIDR_AFFINITY_LEVEL(mpidr, 2) << 16 |
-+	       MPIDR_AFFINITY_LEVEL(mpidr, 1) << 8  |
-+	       MPIDR_AFFINITY_LEVEL(mpidr, 0));
-+
-+	return aff;
-+}
-+
-+static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)
-+{
-+	u64 irqnr;
-+
-+	do {
-+		irqnr = gic_read_iar();
-+
-+		if (likely(irqnr > 15 && irqnr < 1020)) {
-+			u64 irq = irq_find_mapping(gic_data.domain, irqnr);
-+			if (likely(irq)) {
-+				handle_IRQ(irq, regs);
-+				continue;
-+			}
-+
-+			WARN_ONCE(true, "Unexpected SPI received!\n");
-+			gic_write_eoir(irqnr);
-+		}
-+		if (irqnr < 16) {
-+			gic_write_eoir(irqnr);
-+#ifdef CONFIG_SMP
-+			handle_IPI(irqnr, regs);
-+#else
-+			WARN_ONCE(true, "Unexpected SGI received!\n");
-+#endif
-+			continue;
-+		}
-+	} while (irqnr != ICC_IAR1_EL1_SPURIOUS);
-+}
-+
-+static void __init gic_dist_init(void)
-+{
-+	unsigned int i;
-+	u64 affinity;
-+	void __iomem *base = gic_data.dist_base;
-+
-+	/* Disable the distributor */
-+	writel_relaxed(0, base + GICD_CTLR);
-+	gic_dist_wait_for_rwp();
-+
-+	gic_dist_config(base, gic_data.irq_nr, gic_dist_wait_for_rwp);
-+
-+	/* Enable distributor with ARE, Group1 */
-+	writel_relaxed(GICD_CTLR_ARE_NS | GICD_CTLR_ENABLE_G1A | GICD_CTLR_ENABLE_G1,
-+		       base + GICD_CTLR);
-+
-+	/*
-+	 * Set all global interrupts to the boot CPU only. ARE must be
-+	 * enabled.
-+	 */
-+	affinity = gic_mpidr_to_affinity(cpu_logical_map(smp_processor_id()));
-+	for (i = 32; i < gic_data.irq_nr; i++)
-+		writeq_relaxed(affinity, base + GICD_IROUTER + i * 8);
-+}
-+
-+static int gic_populate_rdist(void)
-+{
-+	u64 mpidr = cpu_logical_map(smp_processor_id());
-+	u64 typer;
-+	u32 aff;
-+	int i;
-+
-+	/*
-+	 * Convert affinity to a 32bit value that can be matched to
-+	 * GICR_TYPER bits [63:32].
-+	 */
-+	aff = (MPIDR_AFFINITY_LEVEL(mpidr, 3) << 24 |
-+	       MPIDR_AFFINITY_LEVEL(mpidr, 2) << 16 |
-+	       MPIDR_AFFINITY_LEVEL(mpidr, 1) << 8 |
-+	       MPIDR_AFFINITY_LEVEL(mpidr, 0));
-+
-+	for (i = 0; i < gic_data.redist_regions; i++) {
-+		void __iomem *ptr = gic_data.redist_base[i];
-+		u32 reg;
-+
-+		reg = readl_relaxed(ptr + GICR_PIDR2) & GIC_PIDR2_ARCH_MASK;
-+		if (reg != GIC_PIDR2_ARCH_GICv3 &&
-+		    reg != GIC_PIDR2_ARCH_GICv4) { /* We're in trouble... */
-+			pr_warn("No redistributor present @%p\n", ptr);
-+			break;
-+		}
-+
-+		do {
-+			typer = readq_relaxed(ptr + GICR_TYPER);
-+			if ((typer >> 32) == aff) {
-+				gic_data_rdist_rd_base() = ptr;
-+				pr_info("CPU%d: found redistributor %llx @%p\n",
-+					smp_processor_id(),
-+					(unsigned long long)mpidr, ptr);
-+				return 0;
-+			}
-+
-+			if (gic_data.redist_stride) {
-+				ptr += gic_data.redist_stride;
-+			} else {
-+				ptr += SZ_64K * 2; /* Skip RD_base + SGI_base */
-+				if (typer & GICR_TYPER_VLPIS)
-+					ptr += SZ_64K * 2; /* Skip VLPI_base + reserved page */
-+			}
-+		} while (!(typer & GICR_TYPER_LAST));
-+	}
-+
-+	/* We couldn't even deal with ourselves... */
-+	WARN(true, "CPU%d: mpidr %llx has no re-distributor!\n",
-+	     smp_processor_id(), (unsigned long long)mpidr);
-+	return -ENODEV;
-+}
-+
-+static void gic_cpu_init(void)
-+{
-+	void __iomem *rbase;
-+
-+	/* Register ourselves with the rest of the world */
-+	if (gic_populate_rdist())
-+		return;
-+
-+	gic_enable_redist();
-+
-+	rbase = gic_data_rdist_sgi_base();
-+
-+	gic_cpu_config(rbase, gic_redist_wait_for_rwp);
-+
-+	/* Enable system registers */
-+	gic_enable_sre();
-+
-+	/* Set priority mask register */
-+	gic_write_pmr(DEFAULT_PMR_VALUE);
-+
-+	/* EOI deactivates interrupt too (mode 0) */
-+	gic_write_ctlr(ICC_CTLR_EL1_EOImode_drop_dir);
-+
-+	/* ... and let's hit the road... */
-+	gic_write_grpen1(1);
-+}
-+
-+#ifdef CONFIG_SMP
-+static int gic_secondary_init(struct notifier_block *nfb,
-+			      unsigned long action, void *hcpu)
-+{
-+	if (action == CPU_STARTING || action == CPU_STARTING_FROZEN)
-+		gic_cpu_init();
-+	return NOTIFY_OK;
-+}
-+
-+/*
-+ * Notifier for enabling the GIC CPU interface. Set an arbitrarily high
-+ * priority because the GIC needs to be up before the ARM generic timers.
-+ */
-+static struct notifier_block gic_cpu_notifier = {
-+	.notifier_call = gic_secondary_init,
-+	.priority = 100,
-+};
-+
-+static u16 gic_compute_target_list(int *base_cpu, const struct cpumask *mask,
-+				   u64 cluster_id)
-+{
-+	int cpu = *base_cpu;
-+	u64 mpidr = cpu_logical_map(cpu);
-+	u16 tlist = 0;
-+
-+	while (cpu < nr_cpu_ids) {
-+		/*
-+		 * If we ever get a cluster of more than 16 CPUs, just
-+		 * scream and skip that CPU.
-+		 */
-+		if (WARN_ON((mpidr & 0xff) >= 16))
-+			goto out;
-+
-+		tlist |= 1 << (mpidr & 0xf);
-+
-+		cpu = cpumask_next(cpu, mask);
-+		if (cpu == nr_cpu_ids)
-+			goto out;
-+
-+		mpidr = cpu_logical_map(cpu);
-+
-+		if (cluster_id != (mpidr & ~0xffUL)) {
-+			cpu--;
-+			goto out;
-+		}
-+	}
-+out:
-+	*base_cpu = cpu;
-+	return tlist;
-+}
-+
-+static void gic_send_sgi(u64 cluster_id, u16 tlist, unsigned int irq)
-+{
-+	u64 val;
-+
-+	val = (MPIDR_AFFINITY_LEVEL(cluster_id, 3) << 48	|
-+	       MPIDR_AFFINITY_LEVEL(cluster_id, 2) << 32	|
-+	       irq << 24			    		|
-+	       MPIDR_AFFINITY_LEVEL(cluster_id, 1) << 16	|
-+	       tlist);
-+
-+	pr_debug("CPU%d: ICC_SGI1R_EL1 %llx\n", smp_processor_id(), val);
-+	gic_write_sgi1r(val);
-+}
-+
-+static void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
-+{
-+	int cpu;
-+
-+	if (WARN_ON(irq >= 16))
-+		return;
-+
-+	/*
-+	 * Ensure that stores to Normal memory are visible to the
-+	 * other CPUs before issuing the IPI.
-+	 */
-+	smp_wmb();
-+
-+	for_each_cpu_mask(cpu, *mask) {
-+		u64 cluster_id = cpu_logical_map(cpu) & ~0xffUL;
-+		u16 tlist;
-+
-+		tlist = gic_compute_target_list(&cpu, mask, cluster_id);
-+		gic_send_sgi(cluster_id, tlist, irq);
-+	}
-+
-+	/* Force the above writes to ICC_SGI1R_EL1 to be executed */
-+	isb();
-+}
-+
-+static void gic_smp_init(void)
-+{
-+	set_smp_cross_call(gic_raise_softirq);
-+	register_cpu_notifier(&gic_cpu_notifier);
-+}
-+
-+static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
-+			    bool force)
-+{
-+	unsigned int cpu = cpumask_any_and(mask_val, cpu_online_mask);
-+	void __iomem *reg;
-+	int enabled;
-+	u64 val;
-+
-+	if (gic_irq_in_rdist(d))
-+		return -EINVAL;
-+
-+	/* If interrupt was enabled, disable it first */
-+	enabled = gic_peek_irq(d, GICD_ISENABLER);
-+	if (enabled)
-+		gic_mask_irq(d);
-+
-+	reg = gic_dist_base(d) + GICD_IROUTER + (gic_irq(d) * 8);
-+	val = gic_mpidr_to_affinity(cpu_logical_map(cpu));
-+
-+	writeq_relaxed(val, reg);
-+
-+	/*
-+	 * If the interrupt was enabled, enabled it again. Otherwise,
-+	 * just wait for the distributor to have digested our changes.
-+	 */
-+	if (enabled)
-+		gic_unmask_irq(d);
-+	else
-+		gic_dist_wait_for_rwp();
-+
-+	return IRQ_SET_MASK_OK;
-+}
-+#else
-+#define gic_set_affinity	NULL
-+#define gic_smp_init()		do { } while(0)
-+#endif
-+
-+static struct irq_chip gic_chip = {
-+	.name			= "GICv3",
-+	.irq_mask		= gic_mask_irq,
-+	.irq_unmask		= gic_unmask_irq,
-+	.irq_eoi		= gic_eoi_irq,
-+	.irq_set_type		= gic_set_type,
-+	.irq_set_affinity	= gic_set_affinity,
-+};
-+
-+static int gic_irq_domain_map(struct irq_domain *d, unsigned int irq,
-+			      irq_hw_number_t hw)
-+{
-+	/* SGIs are private to the core kernel */
-+	if (hw < 16)
-+		return -EPERM;
-+	/* PPIs */
-+	if (hw < 32) {
-+		irq_set_percpu_devid(irq);
-+		irq_set_chip_and_handler(irq, &gic_chip,
-+					 handle_percpu_devid_irq);
-+		set_irq_flags(irq, IRQF_VALID | IRQF_NOAUTOEN);
-+	}
-+	/* SPIs */
-+	if (hw >= 32 && hw < gic_data.irq_nr) {
-+		irq_set_chip_and_handler(irq, &gic_chip,
-+					 handle_fasteoi_irq);
-+		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
-+	}
-+	irq_set_chip_data(irq, d->host_data);
-+	return 0;
-+}
-+
-+static int gic_irq_domain_xlate(struct irq_domain *d,
-+				struct device_node *controller,
-+				const u32 *intspec, unsigned int intsize,
-+				unsigned long *out_hwirq, unsigned int *out_type)
-+{
-+	if (d->of_node != controller)
-+		return -EINVAL;
-+	if (intsize < 3)
-+		return -EINVAL;
-+
-+	switch(intspec[0]) {
-+	case 0:			/* SPI */
-+		*out_hwirq = intspec[1] + 32;
-+		break;
-+	case 1:			/* PPI */
-+		*out_hwirq = intspec[1] + 16;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	*out_type = intspec[2] & IRQ_TYPE_SENSE_MASK;
-+	return 0;
-+}
-+
-+static const struct irq_domain_ops gic_irq_domain_ops = {
-+	.map = gic_irq_domain_map,
-+	.xlate = gic_irq_domain_xlate,
-+};
-+
-+static int __init gic_of_init(struct device_node *node, struct device_node *parent)
-+{
-+	void __iomem *dist_base;
-+	void __iomem **redist_base;
-+	u64 redist_stride;
-+	u32 redist_regions;
-+	u32 reg;
-+	int gic_irqs;
-+	int err;
-+	int i;
-+
-+	dist_base = of_iomap(node, 0);
-+	if (!dist_base) {
-+		pr_err("%s: unable to map gic dist registers\n",
-+			node->full_name);
-+		return -ENXIO;
-+	}
-+
-+	reg = readl_relaxed(dist_base + GICD_PIDR2) & GIC_PIDR2_ARCH_MASK;
-+	if (reg != GIC_PIDR2_ARCH_GICv3 && reg != GIC_PIDR2_ARCH_GICv4) {
-+		pr_err("%s: no distributor detected, giving up\n",
-+			node->full_name);
-+		err = -ENODEV;
-+		goto out_unmap_dist;
-+	}
-+
-+	if (of_property_read_u32(node, "#redistributor-regions", &redist_regions))
-+		redist_regions = 1;
-+
-+	redist_base = kzalloc(sizeof(*redist_base) * redist_regions, GFP_KERNEL);
-+	if (!redist_base) {
-+		err = -ENOMEM;
-+		goto out_unmap_dist;
-+	}
-+
-+	for (i = 0; i < redist_regions; i++) {
-+		redist_base[i] = of_iomap(node, 1 + i);
-+		if (!redist_base[i]) {
-+			pr_err("%s: couldn't map region %d\n",
-+			       node->full_name, i);
-+			err = -ENODEV;
-+			goto out_unmap_rdist;
-+		}
-+	}
-+
-+	if (of_property_read_u64(node, "redistributor-stride", &redist_stride))
-+		redist_stride = 0;
-+
-+	gic_data.dist_base = dist_base;
-+	gic_data.redist_base = redist_base;
-+	gic_data.redist_regions = redist_regions;
-+	gic_data.redist_stride = redist_stride;
-+
-+	/*
-+	 * Find out how many interrupts are supported.
-+	 * The GIC only supports up to 1020 interrupt sources (SGI+PPI+SPI)
-+	 */
-+	gic_irqs = readl_relaxed(gic_data.dist_base + GICD_TYPER) & 0x1f;
-+	gic_irqs = (gic_irqs + 1) * 32;
-+	if (gic_irqs > 1020)
-+		gic_irqs = 1020;
-+	gic_data.irq_nr = gic_irqs;
-+
-+	gic_data.domain = irq_domain_add_tree(node, &gic_irq_domain_ops,
-+					      &gic_data);
-+	gic_data.rdist = alloc_percpu(typeof(*gic_data.rdist));
-+
-+	if (WARN_ON(!gic_data.domain) || WARN_ON(!gic_data.rdist)) {
-+		err = -ENOMEM;
-+		goto out_free;
-+	}
-+
-+	set_handle_irq(gic_handle_irq);
-+
-+	gic_smp_init();
-+	gic_dist_init();
-+	gic_cpu_init();
-+
-+	return 0;
-+
-+out_free:
-+	if (gic_data.domain)
-+		irq_domain_remove(gic_data.domain);
-+	free_percpu(gic_data.rdist);
-+out_unmap_rdist:
-+	for (i = 0; i < redist_regions; i++)
-+		if (redist_base[i])
-+			iounmap(redist_base[i]);
-+	kfree(redist_base);
-+out_unmap_dist:
-+	iounmap(dist_base);
-+	return err;
-+}
-+
-+IRQCHIP_DECLARE(gic_v3, "arm,gic-v3", gic_of_init);
 diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
-index 7c131cf..1ddfdde 100644
+index 4b959e6..c36c7ab55 100644
 --- a/drivers/irqchip/irq-gic.c
 +++ b/drivers/irqchip/irq-gic.c
-@@ -47,6 +47,7 @@
- #include <asm/exception.h>
- #include <asm/smp_plat.h>
- 
-+#include "irq-gic-common.h"
- #include "irqchip.h"
- 
- union gic_base {
-@@ -189,12 +190,6 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
- {
- 	void __iomem *base = gic_dist_base(d);
- 	unsigned int gicirq = gic_irq(d);
--	u32 enablemask = 1 << (gicirq % 32);
--	u32 enableoff = (gicirq / 32) * 4;
--	u32 confmask = 0x2 << ((gicirq % 16) * 2);
--	u32 confoff = (gicirq / 16) * 4;
--	bool enabled = false;
--	u32 val;
- 
- 	/* Interrupt configuration for SGIs can't be changed */
- 	if (gicirq < 16)
-@@ -208,25 +203,7 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
- 	if (gic_arch_extn.irq_set_type)
- 		gic_arch_extn.irq_set_type(d, type);
- 
--	val = readl_relaxed(base + GIC_DIST_CONFIG + confoff);
--	if (type == IRQ_TYPE_LEVEL_HIGH)
--		val &= ~confmask;
--	else if (type == IRQ_TYPE_EDGE_RISING)
--		val |= confmask;
--
--	/*
--	 * As recommended by the spec, disable the interrupt before changing
--	 * the configuration
--	 */
--	if (readl_relaxed(base + GIC_DIST_ENABLE_SET + enableoff) & enablemask) {
--		writel_relaxed(enablemask, base + GIC_DIST_ENABLE_CLEAR + enableoff);
--		enabled = true;
--	}
--
--	writel_relaxed(val, base + GIC_DIST_CONFIG + confoff);
--
--	if (enabled)
--		writel_relaxed(enablemask, base + GIC_DIST_ENABLE_SET + enableoff);
-+	gic_configure_irq(gicirq, type, base, NULL);
- 
- 	raw_spin_unlock(&irq_controller_lock);
- 
-@@ -388,12 +365,6 @@ static void __init gic_dist_init(struct gic_chip_data *gic)
- 	writel_relaxed(0, base + GIC_DIST_CTRL);
- 
- 	/*
--	 * Set all global interrupts to be level triggered, active low.
--	 */
--	for (i = 32; i < gic_irqs; i += 16)
--		writel_relaxed(0, base + GIC_DIST_CONFIG + i * 4 / 16);
--
--	/*
- 	 * Set all global interrupts to this CPU only.
- 	 */
- 	cpumask = gic_get_cpumask(gic);
-@@ -402,18 +373,7 @@ static void __init gic_dist_init(struct gic_chip_data *gic)
- 	for (i = 32; i < gic_irqs; i += 4)
- 		writel_relaxed(cpumask, base + GIC_DIST_TARGET + i * 4 / 4);
- 
--	/*
--	 * Set priority on all global interrupts.
--	 */
--	for (i = 32; i < gic_irqs; i += 4)
--		writel_relaxed(0xa0a0a0a0, base + GIC_DIST_PRI + i * 4 / 4);
--
--	/*
--	 * Disable all interrupts.  Leave the PPI and SGIs alone
--	 * as these enables are banked registers.
--	 */
--	for (i = 32; i < gic_irqs; i += 32)
--		writel_relaxed(0xffffffff, base + GIC_DIST_ENABLE_CLEAR + i * 4 / 32);
-+	gic_dist_config(base, gic_irqs, NULL);
- 
- 	writel_relaxed(1, base + GIC_DIST_CTRL);
- }
-@@ -423,6 +383,7 @@ static void gic_cpu_init(struct gic_chip_data *gic)
+@@ -381,6 +381,7 @@ static void gic_cpu_init(struct gic_chip_data *gic)
  	void __iomem *dist_base = gic_data_dist_base(gic);
  	void __iomem *base = gic_data_cpu_base(gic);
  	unsigned int cpu_mask, cpu = smp_processor_id();
@@ -4681,23 +759,8 @@ index 7c131cf..1ddfdde 100644
  	int i;
  
  	/*
-@@ -440,27 +401,32 @@ static void gic_cpu_init(struct gic_chip_data *gic)
- 		if (i != cpu)
- 			gic_cpu_map[i] &= ~cpu_mask;
- 
--	/*
--	 * Deal with the banked PPI and SGI interrupts - disable all
--	 * PPI interrupts, ensure all SGI interrupts are enabled.
--	 */
--	writel_relaxed(0xffff0000, dist_base + GIC_DIST_ENABLE_CLEAR);
--	writel_relaxed(0x0000ffff, dist_base + GIC_DIST_ENABLE_SET);
--
--	/*
--	 * Set priority on PPI and SGI interrupts
--	 */
--	for (i = 0; i < 32; i += 4)
--		writel_relaxed(0xa0a0a0a0, dist_base + GIC_DIST_PRI + i * 4 / 4);
-+	gic_cpu_config(dist_base, NULL);
+@@ -401,13 +402,29 @@ static void gic_cpu_init(struct gic_chip_data *gic)
+ 	gic_cpu_config(dist_base, NULL);
  
  	writel_relaxed(0xf0, base + GIC_CPU_PRIMASK);
 -	writel_relaxed(1, base + GIC_CPU_CTRL);
@@ -4728,7 +791,7 @@ index 7c131cf..1ddfdde 100644
  }
  
  #ifdef CONFIG_CPU_PM
-@@ -571,6 +537,7 @@ static void gic_cpu_restore(unsigned int gic_nr)
+@@ -518,6 +535,7 @@ static void gic_cpu_restore(unsigned int gic_nr)
  {
  	int i;
  	u32 *ptr;
@@ -4736,7 +799,7 @@ index 7c131cf..1ddfdde 100644
  	void __iomem *dist_base;
  	void __iomem *cpu_base;
  
-@@ -595,7 +562,15 @@ static void gic_cpu_restore(unsigned int gic_nr)
+@@ -542,7 +560,15 @@ static void gic_cpu_restore(unsigned int gic_nr)
  		writel_relaxed(0xa0a0a0a0, dist_base + GIC_DIST_PRI + i * 4);
  
  	writel_relaxed(0xf0, cpu_base + GIC_CPU_PRIMASK);
@@ -4753,2423 +816,8 @@ index 7c131cf..1ddfdde 100644
  }
  
  static int gic_notifier(struct notifier_block *self, unsigned long cmd,	void *v)
-diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
-index edb7186..dc7406c 100644
---- a/drivers/net/ethernet/Kconfig
-+++ b/drivers/net/ethernet/Kconfig
-@@ -24,6 +24,7 @@ source "drivers/net/ethernet/allwinner/Kconfig"
- source "drivers/net/ethernet/alteon/Kconfig"
- source "drivers/net/ethernet/altera/Kconfig"
- source "drivers/net/ethernet/amd/Kconfig"
-+source "drivers/net/ethernet/apm/Kconfig"
- source "drivers/net/ethernet/apple/Kconfig"
- source "drivers/net/ethernet/arc/Kconfig"
- source "drivers/net/ethernet/atheros/Kconfig"
-diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
-index 58de333..224a018 100644
---- a/drivers/net/ethernet/Makefile
-+++ b/drivers/net/ethernet/Makefile
-@@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_ALLWINNER) += allwinner/
- obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/
- obj-$(CONFIG_ALTERA_TSE) += altera/
- obj-$(CONFIG_NET_VENDOR_AMD) += amd/
-+obj-$(CONFIG_NET_XGENE) += apm/
- obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
- obj-$(CONFIG_NET_VENDOR_ARC) += arc/
- obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
-diff --git a/drivers/net/ethernet/apm/Kconfig b/drivers/net/ethernet/apm/Kconfig
-new file mode 100644
-index 0000000..ec63d70
---- /dev/null
-+++ b/drivers/net/ethernet/apm/Kconfig
-@@ -0,0 +1 @@
-+source "drivers/net/ethernet/apm/xgene/Kconfig"
-diff --git a/drivers/net/ethernet/apm/Makefile b/drivers/net/ethernet/apm/Makefile
-new file mode 100644
-index 0000000..65ce32a
---- /dev/null
-+++ b/drivers/net/ethernet/apm/Makefile
-@@ -0,0 +1,5 @@
-+#
-+# Makefile for APM X-GENE Ethernet driver.
-+#
-+
-+obj-$(CONFIG_NET_XGENE) += xgene/
-diff --git a/drivers/net/ethernet/apm/xgene/Kconfig b/drivers/net/ethernet/apm/xgene/Kconfig
-new file mode 100644
-index 0000000..616dff6
---- /dev/null
-+++ b/drivers/net/ethernet/apm/xgene/Kconfig
-@@ -0,0 +1,9 @@
-+config NET_XGENE
-+	tristate "APM X-Gene SoC Ethernet Driver"
-+	select PHYLIB
-+	help
-+	  This is the Ethernet driver for the on-chip ethernet interface on the
-+	  APM X-Gene SoC.
-+
-+	  To compile this driver as a module, choose M here. This module will
-+	  be called xgene_enet.
-diff --git a/drivers/net/ethernet/apm/xgene/Makefile b/drivers/net/ethernet/apm/xgene/Makefile
-new file mode 100644
-index 0000000..c643e8a
---- /dev/null
-+++ b/drivers/net/ethernet/apm/xgene/Makefile
-@@ -0,0 +1,6 @@
-+#
-+# Makefile for APM X-Gene Ethernet Driver.
-+#
-+
-+xgene-enet-objs := xgene_enet_hw.o xgene_enet_main.o xgene_enet_ethtool.o
-+obj-$(CONFIG_NET_XGENE) += xgene-enet.o
-diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
-new file mode 100644
-index 0000000..63f2aa5
---- /dev/null
-+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
-@@ -0,0 +1,125 @@
-+/* Applied Micro X-Gene SoC Ethernet Driver
-+ *
-+ * Copyright (c) 2014, Applied Micro Circuits Corporation
-+ * Authors: Iyappan Subramanian <isubramanian@apm.com>
-+ *
-+ * This program is free software; you can redistribute  it and/or modify it
-+ * under  the terms of  the GNU General  Public License as published by the
-+ * Free Software Foundation;  either version 2 of the  License, or (at your
-+ * option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/ethtool.h>
-+#include "xgene_enet_main.h"
-+
-+struct xgene_gstrings_stats {
-+	char name[ETH_GSTRING_LEN];
-+	int offset;
-+};
-+
-+#define XGENE_STAT(m) { #m, offsetof(struct xgene_enet_pdata, stats.m) }
-+
-+static const struct xgene_gstrings_stats gstrings_stats[] = {
-+	XGENE_STAT(rx_packets),
-+	XGENE_STAT(tx_packets),
-+	XGENE_STAT(rx_bytes),
-+	XGENE_STAT(tx_bytes),
-+	XGENE_STAT(rx_errors),
-+	XGENE_STAT(tx_errors),
-+	XGENE_STAT(rx_length_errors),
-+	XGENE_STAT(rx_crc_errors),
-+	XGENE_STAT(rx_frame_errors),
-+	XGENE_STAT(rx_fifo_errors)
-+};
-+
-+#define XGENE_STATS_LEN		ARRAY_SIZE(gstrings_stats)
-+
-+static void xgene_get_drvinfo(struct net_device *ndev,
-+			      struct ethtool_drvinfo *info)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+	struct platform_device *pdev = pdata->pdev;
-+
-+	strcpy(info->driver, "xgene_enet");
-+	strcpy(info->version, XGENE_DRV_VERSION);
-+	snprintf(info->fw_version, ETHTOOL_FWVERS_LEN, "N/A");
-+	sprintf(info->bus_info, "%s", pdev->name);
-+}
-+
-+static int xgene_get_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+	struct phy_device *phydev = pdata->phy_dev;
-+
-+	if (phydev == NULL)
-+		return -ENODEV;
-+
-+	return phy_ethtool_gset(phydev, cmd);
-+}
-+
-+static int xgene_set_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+	struct phy_device *phydev = pdata->phy_dev;
-+
-+	if (phydev == NULL)
-+		return -ENODEV;
-+
-+	return phy_ethtool_sset(phydev, cmd);
-+}
-+
-+static void xgene_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
-+{
-+	int i;
-+	u8 *p = data;
-+
-+	if (stringset != ETH_SS_STATS)
-+		return;
-+
-+	for (i = 0; i < XGENE_STATS_LEN; i++) {
-+		memcpy(p, gstrings_stats[i].name, ETH_GSTRING_LEN);
-+		p += ETH_GSTRING_LEN;
-+	}
-+}
-+
-+static int xgene_get_sset_count(struct net_device *ndev, int sset)
-+{
-+	if (sset != ETH_SS_STATS)
-+		return -EINVAL;
-+
-+	return XGENE_STATS_LEN;
-+}
-+
-+static void xgene_get_ethtool_stats(struct net_device *ndev,
-+				    struct ethtool_stats *dummy,
-+				    u64 *data)
-+{
-+	void *pdata = netdev_priv(ndev);
-+	int i;
-+
-+	for (i = 0; i < XGENE_STATS_LEN; i++)
-+		*data++ = *(u64 *)(pdata + gstrings_stats[i].offset);
-+}
-+
-+static const struct ethtool_ops xgene_ethtool_ops = {
-+	.get_drvinfo = xgene_get_drvinfo,
-+	.get_settings = xgene_get_settings,
-+	.set_settings = xgene_set_settings,
-+	.get_link = ethtool_op_get_link,
-+	.get_strings = xgene_get_strings,
-+	.get_sset_count = xgene_get_sset_count,
-+	.get_ethtool_stats = xgene_get_ethtool_stats
-+};
-+
-+void xgene_enet_set_ethtool_ops(struct net_device *ndev)
-+{
-+	ndev->ethtool_ops = &xgene_ethtool_ops;
-+}
-diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
-new file mode 100644
-index 0000000..e52af60
---- /dev/null
-+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
-@@ -0,0 +1,747 @@
-+/* Applied Micro X-Gene SoC Ethernet Driver
-+ *
-+ * Copyright (c) 2014, Applied Micro Circuits Corporation
-+ * Authors: Iyappan Subramanian <isubramanian@apm.com>
-+ *	    Ravi Patel <rapatel@apm.com>
-+ *	    Keyur Chudgar <kchudgar@apm.com>
-+ *
-+ * This program is free software; you can redistribute  it and/or modify it
-+ * under  the terms of  the GNU General  Public License as published by the
-+ * Free Software Foundation;  either version 2 of the  License, or (at your
-+ * option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include "xgene_enet_main.h"
-+#include "xgene_enet_hw.h"
-+
-+static void xgene_enet_ring_init(struct xgene_enet_desc_ring *ring)
-+{
-+	u32 *ring_cfg = ring->state;
-+	u64 addr = ring->dma;
-+	enum xgene_enet_ring_cfgsize cfgsize = ring->cfgsize;
-+
-+	ring_cfg[4] |= (1 << SELTHRSH_POS) &
-+			CREATE_MASK(SELTHRSH_POS, SELTHRSH_LEN);
-+	ring_cfg[3] |= ACCEPTLERR;
-+	ring_cfg[2] |= QCOHERENT;
-+
-+	addr >>= 8;
-+	ring_cfg[2] |= (addr << RINGADDRL_POS) &
-+			CREATE_MASK_ULL(RINGADDRL_POS, RINGADDRL_LEN);
-+	addr >>= RINGADDRL_LEN;
-+	ring_cfg[3] |= addr & CREATE_MASK_ULL(RINGADDRH_POS, RINGADDRH_LEN);
-+	ring_cfg[3] |= ((u32) cfgsize << RINGSIZE_POS) &
-+			CREATE_MASK(RINGSIZE_POS, RINGSIZE_LEN);
-+}
-+
-+static void xgene_enet_ring_set_type(struct xgene_enet_desc_ring *ring)
-+{
-+	u32 *ring_cfg = ring->state;
-+	bool is_bufpool;
-+	u32 val;
-+
-+	is_bufpool = xgene_enet_is_bufpool(ring->id);
-+	val = (is_bufpool) ? RING_BUFPOOL : RING_REGULAR;
-+	ring_cfg[4] |= (val << RINGTYPE_POS) &
-+			CREATE_MASK(RINGTYPE_POS, RINGTYPE_LEN);
-+
-+	if (is_bufpool) {
-+		ring_cfg[3] |= (BUFPOOL_MODE << RINGMODE_POS) &
-+				CREATE_MASK(RINGMODE_POS, RINGMODE_LEN);
-+	}
-+}
-+
-+static void xgene_enet_ring_set_recombbuf(struct xgene_enet_desc_ring *ring)
-+{
-+	u32 *ring_cfg = ring->state;
-+
-+	ring_cfg[3] |= RECOMBBUF;
-+	ring_cfg[3] |= (0xf << RECOMTIMEOUTL_POS) &
-+			CREATE_MASK(RECOMTIMEOUTL_POS, RECOMTIMEOUTL_LEN);
-+	ring_cfg[4] |= 0x7 & CREATE_MASK(RECOMTIMEOUTH_POS, RECOMTIMEOUTH_LEN);
-+}
-+
-+static void xgene_enet_ring_wr32(struct xgene_enet_desc_ring *ring,
-+				 u32 offset, u32 data)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ring->ndev);
-+
-+	iowrite32(data, pdata->ring_csr_addr + offset);
-+}
-+
-+static void xgene_enet_ring_rd32(struct xgene_enet_desc_ring *ring,
-+				 u32 offset, u32 *data)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ring->ndev);
-+
-+	*data = ioread32(pdata->ring_csr_addr + offset);
-+}
-+
-+static void xgene_enet_write_ring_state(struct xgene_enet_desc_ring *ring)
-+{
-+	int i;
-+
-+	xgene_enet_ring_wr32(ring, CSR_RING_CONFIG, ring->num);
-+	for (i = 0; i < NUM_RING_CONFIG; i++) {
-+		xgene_enet_ring_wr32(ring, CSR_RING_WR_BASE + (i * 4),
-+				     ring->state[i]);
-+	}
-+}
-+
-+static void xgene_enet_clr_ring_state(struct xgene_enet_desc_ring *ring)
-+{
-+	memset(ring->state, 0, sizeof(u32) * NUM_RING_CONFIG);
-+	xgene_enet_write_ring_state(ring);
-+}
-+
-+static void xgene_enet_set_ring_state(struct xgene_enet_desc_ring *ring)
-+{
-+	xgene_enet_ring_set_type(ring);
-+
-+	if (xgene_enet_ring_owner(ring->id) == RING_OWNER_ETH0)
-+		xgene_enet_ring_set_recombbuf(ring);
-+
-+	xgene_enet_ring_init(ring);
-+	xgene_enet_write_ring_state(ring);
-+}
-+
-+static void xgene_enet_set_ring_id(struct xgene_enet_desc_ring *ring)
-+{
-+	u32 ring_id_val, ring_id_buf;
-+	bool is_bufpool;
-+
-+	is_bufpool = xgene_enet_is_bufpool(ring->id);
-+
-+	ring_id_val = ring->id & GENMASK(9, 0);
-+	ring_id_val |= OVERWRITE;
-+
-+	ring_id_buf = (ring->num << 9) & GENMASK(18, 9);
-+	ring_id_buf |= PREFETCH_BUF_EN;
-+	if (is_bufpool)
-+		ring_id_buf |= IS_BUFFER_POOL;
-+
-+	xgene_enet_ring_wr32(ring, CSR_RING_ID, ring_id_val);
-+	xgene_enet_ring_wr32(ring, CSR_RING_ID_BUF, ring_id_buf);
-+}
-+
-+static void xgene_enet_clr_desc_ring_id(struct xgene_enet_desc_ring *ring)
-+{
-+	u32 ring_id;
-+
-+	ring_id = ring->id | OVERWRITE;
-+	xgene_enet_ring_wr32(ring, CSR_RING_ID, ring_id);
-+	xgene_enet_ring_wr32(ring, CSR_RING_ID_BUF, 0);
-+}
-+
-+struct xgene_enet_desc_ring *xgene_enet_setup_ring(
-+					struct xgene_enet_desc_ring *ring)
-+{
-+	u32 size = ring->size;
-+	u32 i, data;
-+	u64 *desc;
-+	bool is_bufpool;
-+
-+	xgene_enet_clr_ring_state(ring);
-+	xgene_enet_set_ring_state(ring);
-+	xgene_enet_set_ring_id(ring);
-+
-+	ring->slots = xgene_enet_get_numslots(ring->id, size);
-+
-+	is_bufpool = xgene_enet_is_bufpool(ring->id);
-+	if (is_bufpool || xgene_enet_ring_owner(ring->id) != RING_OWNER_CPU)
-+		return ring;
-+
-+	for (i = 0; i < ring->slots; i++) {
-+		desc = (u64 *)&ring->raw_desc[i];
-+		desc[EMPTY_SLOT_INDEX] = EMPTY_SLOT;
-+	}
-+
-+	xgene_enet_ring_rd32(ring, CSR_RING_NE_INT_MODE, &data);
-+	data |= BIT(31 - xgene_enet_ring_bufnum(ring->id));
-+	xgene_enet_ring_wr32(ring, CSR_RING_NE_INT_MODE, data);
-+
-+	return ring;
-+}
-+
-+void xgene_enet_clear_ring(struct xgene_enet_desc_ring *ring)
-+{
-+	u32 data;
-+	bool is_bufpool;
-+
-+	is_bufpool = xgene_enet_is_bufpool(ring->id);
-+	if (is_bufpool || xgene_enet_ring_owner(ring->id) != RING_OWNER_CPU)
-+		goto out;
-+
-+	xgene_enet_ring_rd32(ring, CSR_RING_NE_INT_MODE, &data);
-+	data &= ~BIT(31 - xgene_enet_ring_bufnum(ring->id));
-+	xgene_enet_ring_wr32(ring, CSR_RING_NE_INT_MODE, data);
-+
-+out:
-+	xgene_enet_clr_desc_ring_id(ring);
-+	xgene_enet_clr_ring_state(ring);
-+}
-+
-+void xgene_enet_parse_error(struct xgene_enet_desc_ring *ring,
-+			    struct xgene_enet_pdata *pdata,
-+			    enum xgene_enet_err_code status)
-+{
-+	struct rtnl_link_stats64 *stats = &pdata->stats;
-+
-+	switch (status) {
-+	case INGRESS_CRC:
-+		stats->rx_crc_errors++;
-+		break;
-+	case INGRESS_CHECKSUM:
-+	case INGRESS_CHECKSUM_COMPUTE:
-+		stats->rx_errors++;
-+		break;
-+	case INGRESS_TRUNC_FRAME:
-+		stats->rx_frame_errors++;
-+		break;
-+	case INGRESS_PKT_LEN:
-+		stats->rx_length_errors++;
-+		break;
-+	case INGRESS_PKT_UNDER:
-+		stats->rx_frame_errors++;
-+		break;
-+	case INGRESS_FIFO_OVERRUN:
-+		stats->rx_fifo_errors++;
-+		break;
-+	default:
-+		break;
-+	}
-+}
-+
-+static void xgene_enet_wr_csr(struct xgene_enet_pdata *pdata,
-+			      u32 offset, u32 val)
-+{
-+	void __iomem *addr = pdata->eth_csr_addr + offset;
-+
-+	iowrite32(val, addr);
-+}
-+
-+static void xgene_enet_wr_ring_if(struct xgene_enet_pdata *pdata,
-+				  u32 offset, u32 val)
-+{
-+	void __iomem *addr = pdata->eth_ring_if_addr + offset;
-+
-+	iowrite32(val, addr);
-+}
-+
-+static void xgene_enet_wr_diag_csr(struct xgene_enet_pdata *pdata,
-+				   u32 offset, u32 val)
-+{
-+	void __iomem *addr = pdata->eth_diag_csr_addr + offset;
-+
-+	iowrite32(val, addr);
-+}
-+
-+static void xgene_enet_wr_mcx_csr(struct xgene_enet_pdata *pdata,
-+				  u32 offset, u32 val)
-+{
-+	void __iomem *addr = pdata->mcx_mac_csr_addr + offset;
-+
-+	iowrite32(val, addr);
-+}
-+
-+static bool xgene_enet_wr_indirect(void __iomem *addr, void __iomem *wr,
-+				   void __iomem *cmd, void __iomem *cmd_done,
-+				   u32 wr_addr, u32 wr_data)
-+{
-+	u32 done;
-+	u8 wait = 10;
-+
-+	iowrite32(wr_addr, addr);
-+	iowrite32(wr_data, wr);
-+	iowrite32(XGENE_ENET_WR_CMD, cmd);
-+
-+	/* wait for write command to complete */
-+	while (!(done = ioread32(cmd_done)) && wait--)
-+		udelay(1);
-+
-+	if (!done)
-+		return false;
-+
-+	iowrite32(0, cmd);
-+
-+	return true;
-+}
-+
-+static void xgene_enet_wr_mcx_mac(struct xgene_enet_pdata *pdata,
-+				  u32 wr_addr, u32 wr_data)
-+{
-+	void __iomem *addr, *wr, *cmd, *cmd_done;
-+	bool ret;
-+
-+	addr = pdata->mcx_mac_addr + MAC_ADDR_REG_OFFSET;
-+	wr = pdata->mcx_mac_addr + MAC_WRITE_REG_OFFSET;
-+	cmd = pdata->mcx_mac_addr + MAC_COMMAND_REG_OFFSET;
-+	cmd_done = pdata->mcx_mac_addr + MAC_COMMAND_DONE_REG_OFFSET;
-+
-+	ret = xgene_enet_wr_indirect(addr, wr, cmd, cmd_done, wr_addr, wr_data);
-+	if (!ret)
-+		netdev_err(pdata->ndev, "MCX mac write failed, addr: %04x\n",
-+			   wr_addr);
-+}
-+
-+static void xgene_enet_rd_csr(struct xgene_enet_pdata *pdata,
-+			      u32 offset, u32 *val)
-+{
-+	void __iomem *addr = pdata->eth_csr_addr + offset;
-+
-+	*val = ioread32(addr);
-+}
-+
-+static void xgene_enet_rd_diag_csr(struct xgene_enet_pdata *pdata,
-+				   u32 offset, u32 *val)
-+{
-+	void __iomem *addr = pdata->eth_diag_csr_addr + offset;
-+
-+	*val = ioread32(addr);
-+}
-+
-+static void xgene_enet_rd_mcx_csr(struct xgene_enet_pdata *pdata,
-+				  u32 offset, u32 *val)
-+{
-+	void __iomem *addr = pdata->mcx_mac_csr_addr + offset;
-+
-+	*val = ioread32(addr);
-+}
-+
-+static bool xgene_enet_rd_indirect(void __iomem *addr, void __iomem *rd,
-+				   void __iomem *cmd, void __iomem *cmd_done,
-+				   u32 rd_addr, u32 *rd_data)
-+{
-+	u32 done;
-+	u8 wait = 10;
-+
-+	iowrite32(rd_addr, addr);
-+	iowrite32(XGENE_ENET_RD_CMD, cmd);
-+
-+	/* wait for read command to complete */
-+	while (!(done = ioread32(cmd_done)) && wait--)
-+		udelay(1);
-+
-+	if (!done)
-+		return false;
-+
-+	*rd_data = ioread32(rd);
-+	iowrite32(0, cmd);
-+
-+	return true;
-+}
-+
-+static void xgene_enet_rd_mcx_mac(struct xgene_enet_pdata *pdata,
-+				  u32 rd_addr, u32 *rd_data)
-+{
-+	void __iomem *addr, *rd, *cmd, *cmd_done;
-+	bool ret;
-+
-+	addr = pdata->mcx_mac_addr + MAC_ADDR_REG_OFFSET;
-+	rd = pdata->mcx_mac_addr + MAC_READ_REG_OFFSET;
-+	cmd = pdata->mcx_mac_addr + MAC_COMMAND_REG_OFFSET;
-+	cmd_done = pdata->mcx_mac_addr + MAC_COMMAND_DONE_REG_OFFSET;
-+
-+	ret = xgene_enet_rd_indirect(addr, rd, cmd, cmd_done, rd_addr, rd_data);
-+	if (!ret)
-+		netdev_err(pdata->ndev, "MCX mac read failed, addr: %04x\n",
-+			   rd_addr);
-+}
-+
-+static int xgene_mii_phy_write(struct xgene_enet_pdata *pdata, int phy_id,
-+			       u32 reg, u16 data)
-+{
-+	u32 addr = 0, wr_data = 0;
-+	u32 done;
-+	u8 wait = 10;
-+
-+	PHY_ADDR_SET(&addr, phy_id);
-+	REG_ADDR_SET(&addr, reg);
-+	xgene_enet_wr_mcx_mac(pdata, MII_MGMT_ADDRESS_ADDR, addr);
-+
-+	PHY_CONTROL_SET(&wr_data, data);
-+	xgene_enet_wr_mcx_mac(pdata, MII_MGMT_CONTROL_ADDR, wr_data);
-+	do {
-+		usleep_range(5, 10);
-+		xgene_enet_rd_mcx_mac(pdata, MII_MGMT_INDICATORS_ADDR, &done);
-+	} while ((done & BUSY_MASK) && wait--);
-+
-+	if (done & BUSY_MASK) {
-+		netdev_err(pdata->ndev, "MII_MGMT write failed\n");
-+		return -1;
-+	}
-+
-+	return 0;
-+}
-+
-+static int xgene_mii_phy_read(struct xgene_enet_pdata *pdata,
-+			      u8 phy_id, u32 reg)
-+{
-+	u32 addr = 0;
-+	u32 data, done;
-+	u8 wait = 10;
-+
-+	PHY_ADDR_SET(&addr, phy_id);
-+	REG_ADDR_SET(&addr, reg);
-+	xgene_enet_wr_mcx_mac(pdata, MII_MGMT_ADDRESS_ADDR, addr);
-+	xgene_enet_wr_mcx_mac(pdata, MII_MGMT_COMMAND_ADDR, READ_CYCLE_MASK);
-+	do {
-+		usleep_range(5, 10);
-+		xgene_enet_rd_mcx_mac(pdata, MII_MGMT_INDICATORS_ADDR, &done);
-+	} while ((done & BUSY_MASK) && wait--);
-+
-+	if (done & BUSY_MASK) {
-+		netdev_err(pdata->ndev, "MII_MGMT read failed\n");
-+		return -1;
-+	}
-+
-+	xgene_enet_rd_mcx_mac(pdata, MII_MGMT_STATUS_ADDR, &data);
-+	xgene_enet_wr_mcx_mac(pdata, MII_MGMT_COMMAND_ADDR, 0);
-+
-+	return data;
-+}
-+
-+void xgene_gmac_set_mac_addr(struct xgene_enet_pdata *pdata)
-+{
-+	u32 addr0, addr1;
-+	u8 *dev_addr = pdata->ndev->dev_addr;
-+
-+	addr0 = (dev_addr[3] << 24) | (dev_addr[2] << 16) |
-+		(dev_addr[1] << 8) | dev_addr[0];
-+	addr1 = (dev_addr[5] << 24) | (dev_addr[4] << 16);
-+	addr1 |= pdata->phy_addr & 0xFFFF;
-+
-+	xgene_enet_wr_mcx_mac(pdata, STATION_ADDR0_ADDR, addr0);
-+	xgene_enet_wr_mcx_mac(pdata, STATION_ADDR1_ADDR, addr1);
-+}
-+
-+static int xgene_enet_ecc_init(struct xgene_enet_pdata *pdata)
-+{
-+	struct net_device *ndev = pdata->ndev;
-+	u32 data;
-+	u8 wait = 10;
-+
-+	xgene_enet_wr_diag_csr(pdata, ENET_CFG_MEM_RAM_SHUTDOWN_ADDR, 0x0);
-+	do {
-+		usleep_range(100, 110);
-+		xgene_enet_rd_diag_csr(pdata, ENET_BLOCK_MEM_RDY_ADDR, &data);
-+	} while ((data != 0xffffffff) && wait--);
-+
-+	if (data != 0xffffffff) {
-+		netdev_err(ndev, "Failed to release memory from shutdown\n");
-+		return -ENODEV;
-+	}
-+
-+	return 0;
-+}
-+
-+void xgene_gmac_reset(struct xgene_enet_pdata *pdata)
-+{
-+	xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_1_ADDR, SOFT_RESET1);
-+	xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_1_ADDR, 0);
-+}
-+
-+void xgene_gmac_init(struct xgene_enet_pdata *pdata, int speed)
-+{
-+	u32 value, mc2;
-+	u32 intf_ctl, rgmii;
-+	u32 icm0, icm2;
-+
-+	xgene_gmac_reset(pdata);
-+
-+	xgene_enet_rd_mcx_csr(pdata, ICM_CONFIG0_REG_0_ADDR, &icm0);
-+	xgene_enet_rd_mcx_csr(pdata, ICM_CONFIG2_REG_0_ADDR, &icm2);
-+	xgene_enet_rd_mcx_mac(pdata, MAC_CONFIG_2_ADDR, &mc2);
-+	xgene_enet_rd_mcx_mac(pdata, INTERFACE_CONTROL_ADDR, &intf_ctl);
-+	xgene_enet_rd_csr(pdata, RGMII_REG_0_ADDR, &rgmii);
-+
-+	switch (speed) {
-+	case SPEED_10:
-+		ENET_INTERFACE_MODE2_SET(&mc2, 1);
-+		CFG_MACMODE_SET(&icm0, 0);
-+		CFG_WAITASYNCRD_SET(&icm2, 500);
-+		rgmii &= ~CFG_SPEED_1250;
-+		break;
-+	case SPEED_100:
-+		ENET_INTERFACE_MODE2_SET(&mc2, 1);
-+		intf_ctl |= ENET_LHD_MODE;
-+		CFG_MACMODE_SET(&icm0, 1);
-+		CFG_WAITASYNCRD_SET(&icm2, 80);
-+		rgmii &= ~CFG_SPEED_1250;
-+		break;
-+	default:
-+		ENET_INTERFACE_MODE2_SET(&mc2, 2);
-+		intf_ctl |= ENET_GHD_MODE;
-+		CFG_TXCLK_MUXSEL0_SET(&rgmii, 4);
-+		xgene_enet_rd_csr(pdata, DEBUG_REG_ADDR, &value);
-+		value |= CFG_BYPASS_UNISEC_TX | CFG_BYPASS_UNISEC_RX;
-+		xgene_enet_wr_csr(pdata, DEBUG_REG_ADDR, value);
-+		break;
-+	}
-+
-+	mc2 |= FULL_DUPLEX2;
-+	xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_2_ADDR, mc2);
-+	xgene_enet_wr_mcx_mac(pdata, INTERFACE_CONTROL_ADDR, intf_ctl);
-+
-+	xgene_gmac_set_mac_addr(pdata);
-+
-+	/* Adjust MDC clock frequency */
-+	xgene_enet_rd_mcx_mac(pdata, MII_MGMT_CONFIG_ADDR, &value);
-+	MGMT_CLOCK_SEL_SET(&value, 7);
-+	xgene_enet_wr_mcx_mac(pdata, MII_MGMT_CONFIG_ADDR, value);
-+
-+	/* Enable drop if bufpool not available */
-+	xgene_enet_rd_csr(pdata, RSIF_CONFIG_REG_ADDR, &value);
-+	value |= CFG_RSIF_FPBUFF_TIMEOUT_EN;
-+	xgene_enet_wr_csr(pdata, RSIF_CONFIG_REG_ADDR, value);
-+
-+	/* Rtype should be copied from FP */
-+	xgene_enet_wr_csr(pdata, RSIF_RAM_DBG_REG0_ADDR, 0);
-+	xgene_enet_wr_csr(pdata, RGMII_REG_0_ADDR, rgmii);
-+
-+	/* Rx-Tx traffic resume */
-+	xgene_enet_wr_csr(pdata, CFG_LINK_AGGR_RESUME_0_ADDR, TX_PORT0);
-+
-+	xgene_enet_wr_mcx_csr(pdata, ICM_CONFIG0_REG_0_ADDR, icm0);
-+	xgene_enet_wr_mcx_csr(pdata, ICM_CONFIG2_REG_0_ADDR, icm2);
-+
-+	xgene_enet_rd_mcx_csr(pdata, RX_DV_GATE_REG_0_ADDR, &value);
-+	value &= ~TX_DV_GATE_EN0;
-+	value &= ~RX_DV_GATE_EN0;
-+	value |= RESUME_RX0;
-+	xgene_enet_wr_mcx_csr(pdata, RX_DV_GATE_REG_0_ADDR, value);
-+
-+	xgene_enet_wr_csr(pdata, CFG_BYPASS_ADDR, RESUME_TX);
-+}
-+
-+static void xgene_enet_config_ring_if_assoc(struct xgene_enet_pdata *pdata)
-+{
-+	u32 val = 0xffffffff;
-+
-+	xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIWQASSOC_ADDR, val);
-+	xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIFPQASSOC_ADDR, val);
-+	xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIQMLITEWQASSOC_ADDR, val);
-+	xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIQMLITEFPQASSOC_ADDR, val);
-+}
-+
-+void xgene_enet_cle_bypass(struct xgene_enet_pdata *pdata,
-+			   u32 dst_ring_num, u16 bufpool_id)
-+{
-+	u32 cb;
-+	u32 fpsel;
-+
-+	fpsel = xgene_enet_ring_bufnum(bufpool_id) - 0x20;
-+
-+	xgene_enet_rd_csr(pdata, CLE_BYPASS_REG0_0_ADDR, &cb);
-+	cb |= CFG_CLE_BYPASS_EN0;
-+	CFG_CLE_IP_PROTOCOL0_SET(&cb, 3);
-+	xgene_enet_wr_csr(pdata, CLE_BYPASS_REG0_0_ADDR, cb);
-+
-+	xgene_enet_rd_csr(pdata, CLE_BYPASS_REG1_0_ADDR, &cb);
-+	CFG_CLE_DSTQID0_SET(&cb, dst_ring_num);
-+	CFG_CLE_FPSEL0_SET(&cb, fpsel);
-+	xgene_enet_wr_csr(pdata, CLE_BYPASS_REG1_0_ADDR, cb);
-+}
-+
-+void xgene_gmac_rx_enable(struct xgene_enet_pdata *pdata)
-+{
-+	u32 data;
-+
-+	xgene_enet_rd_mcx_mac(pdata, MAC_CONFIG_1_ADDR, &data);
-+	xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_1_ADDR, data | RX_EN);
-+}
-+
-+void xgene_gmac_tx_enable(struct xgene_enet_pdata *pdata)
-+{
-+	u32 data;
-+
-+	xgene_enet_rd_mcx_mac(pdata, MAC_CONFIG_1_ADDR, &data);
-+	xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_1_ADDR, data | TX_EN);
-+}
-+
-+void xgene_gmac_rx_disable(struct xgene_enet_pdata *pdata)
-+{
-+	u32 data;
-+
-+	xgene_enet_rd_mcx_mac(pdata, MAC_CONFIG_1_ADDR, &data);
-+	xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_1_ADDR, data & ~RX_EN);
-+}
-+
-+void xgene_gmac_tx_disable(struct xgene_enet_pdata *pdata)
-+{
-+	u32 data;
-+
-+	xgene_enet_rd_mcx_mac(pdata, MAC_CONFIG_1_ADDR, &data);
-+	xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_1_ADDR, data & ~TX_EN);
-+}
-+
-+void xgene_enet_reset(struct xgene_enet_pdata *pdata)
-+{
-+	u32 val;
-+
-+	clk_prepare_enable(pdata->clk);
-+	clk_disable_unprepare(pdata->clk);
-+	clk_prepare_enable(pdata->clk);
-+	xgene_enet_ecc_init(pdata);
-+	xgene_enet_config_ring_if_assoc(pdata);
-+
-+	/* Enable auto-incr for scanning */
-+	xgene_enet_rd_mcx_mac(pdata, MII_MGMT_CONFIG_ADDR, &val);
-+	val |= SCAN_AUTO_INCR;
-+	MGMT_CLOCK_SEL_SET(&val, 1);
-+	xgene_enet_wr_mcx_mac(pdata, MII_MGMT_CONFIG_ADDR, val);
-+}
-+
-+void xgene_gport_shutdown(struct xgene_enet_pdata *pdata)
-+{
-+	clk_disable_unprepare(pdata->clk);
-+}
-+
-+static int xgene_enet_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
-+{
-+	struct xgene_enet_pdata *pdata = bus->priv;
-+	u32 val;
-+
-+	val = xgene_mii_phy_read(pdata, mii_id, regnum);
-+	netdev_dbg(pdata->ndev, "mdio_rd: bus=%d reg=%d val=%x\n",
-+		   mii_id, regnum, val);
-+
-+	return val;
-+}
-+
-+static int xgene_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
-+				 u16 val)
-+{
-+	struct xgene_enet_pdata *pdata = bus->priv;
-+	int ret;
-+
-+	netdev_dbg(pdata->ndev, "mdio_wr: bus=%d reg=%d val=%x\n",
-+		   mii_id, regnum, val);
-+	ret = xgene_mii_phy_write(pdata, mii_id, regnum, val);
-+
-+	return ret;
-+}
-+
-+static void xgene_enet_adjust_link(struct net_device *ndev)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+	struct phy_device *phydev = pdata->phy_dev;
-+
-+	if (phydev->link) {
-+		if (pdata->phy_speed != phydev->speed) {
-+			xgene_gmac_init(pdata, phydev->speed);
-+			xgene_gmac_rx_enable(pdata);
-+			xgene_gmac_tx_enable(pdata);
-+			pdata->phy_speed = phydev->speed;
-+			phy_print_status(phydev);
-+		}
-+	} else {
-+		xgene_gmac_rx_disable(pdata);
-+		xgene_gmac_tx_disable(pdata);
-+		pdata->phy_speed = SPEED_UNKNOWN;
-+		phy_print_status(phydev);
-+	}
-+}
-+
-+static int xgene_enet_phy_connect(struct net_device *ndev)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+	struct device_node *phy_np;
-+	struct phy_device *phy_dev;
-+	struct device *dev = &pdata->pdev->dev;
-+
-+	phy_np = of_parse_phandle(dev->of_node, "phy-handle", 0);
-+	if (!phy_np) {
-+		netdev_dbg(ndev, "No phy-handle found\n");
-+		return -ENODEV;
-+	}
-+
-+	phy_dev = of_phy_connect(ndev, phy_np, &xgene_enet_adjust_link,
-+				 0, pdata->phy_mode);
-+	if (!phy_dev) {
-+		netdev_err(ndev, "Could not connect to PHY\n");
-+		return  -ENODEV;
-+	}
-+
-+	pdata->phy_speed = SPEED_UNKNOWN;
-+	phy_dev->supported &= ~SUPPORTED_10baseT_Half &
-+			      ~SUPPORTED_100baseT_Half &
-+			      ~SUPPORTED_1000baseT_Half;
-+	phy_dev->advertising = phy_dev->supported;
-+	pdata->phy_dev = phy_dev;
-+
-+	return 0;
-+}
-+
-+int xgene_enet_mdio_config(struct xgene_enet_pdata *pdata)
-+{
-+	struct net_device *ndev = pdata->ndev;
-+	struct device *dev = &pdata->pdev->dev;
-+	struct device_node *child_np;
-+	struct device_node *mdio_np = NULL;
-+	struct mii_bus *mdio_bus;
-+	int ret;
-+
-+	for_each_child_of_node(dev->of_node, child_np) {
-+		if (of_device_is_compatible(child_np, "apm,xgene-mdio")) {
-+			mdio_np = child_np;
-+			break;
-+		}
-+	}
-+
-+	if (!mdio_np) {
-+		netdev_dbg(ndev, "No mdio node in the dts\n");
-+		return -1;
-+	}
-+
-+	mdio_bus = mdiobus_alloc();
-+	if (!mdio_bus)
-+		return -ENOMEM;
-+
-+	mdio_bus->name = "APM X-Gene MDIO bus";
-+	mdio_bus->read = xgene_enet_mdio_read;
-+	mdio_bus->write = xgene_enet_mdio_write;
-+	snprintf(mdio_bus->id, MII_BUS_ID_SIZE, "%s-%s", "xgene-mii",
-+		 ndev->name);
-+
-+	mdio_bus->priv = pdata;
-+	mdio_bus->parent = &ndev->dev;
-+
-+	ret = of_mdiobus_register(mdio_bus, mdio_np);
-+	if (ret) {
-+		netdev_err(ndev, "Failed to register MDIO bus\n");
-+		goto err;
-+	}
-+	pdata->mdio_bus = mdio_bus;
-+
-+	ret = xgene_enet_phy_connect(ndev);
-+	if (ret)
-+		goto err;
-+
-+	return ret;
-+
-+err:
-+	mdiobus_free(mdio_bus);
-+
-+	return ret;
-+}
-+
-+int xgene_enet_mdio_remove(struct xgene_enet_pdata *pdata)
-+{
-+	struct mii_bus *mdio_bus;
-+
-+	mdio_bus = pdata->mdio_bus;
-+	mdiobus_unregister(mdio_bus);
-+	mdiobus_free(mdio_bus);
-+	pdata->mdio_bus = NULL;
-+
-+	return 0;
-+}
-diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
-new file mode 100644
-index 0000000..2041313
---- /dev/null
-+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
-@@ -0,0 +1,375 @@
-+/* Applied Micro X-Gene SoC Ethernet Driver
-+ *
-+ * Copyright (c) 2014, Applied Micro Circuits Corporation
-+ * Authors: Iyappan Subramanian <isubramanian@apm.com>
-+ *	    Ravi Patel <rapatel@apm.com>
-+ *	    Keyur Chudgar <kchudgar@apm.com>
-+ *
-+ * This program is free software; you can redistribute  it and/or modify it
-+ * under  the terms of  the GNU General  Public License as published by the
-+ * Free Software Foundation;  either version 2 of the  License, or (at your
-+ * option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef __XGENE_ENET_HW_H__
-+#define __XGENE_ENET_HW_H__
-+
-+#include "xgene_enet_main.h"
-+
-+struct xgene_enet_pdata;
-+struct xgene_enet_stats;
-+
-+/* clears and then set bits */
-+static inline void xgene_set_bits(u32 *dst, u32 val, u32 start, u32 len)
-+{
-+	u32 end = start + len - 1;
-+	u32 mask = GENMASK(end, start);
-+
-+	*dst &= ~mask;
-+	*dst |= (val << start) & mask;
-+}
-+
-+static inline u32 xgene_get_bits(u32 val, u32 start, u32 end)
-+{
-+	return (val & GENMASK(end, start)) >> start;
-+}
-+
-+#define CSR_RING_ID		0x0008
-+#define OVERWRITE		BIT(31)
-+#define IS_BUFFER_POOL		BIT(20)
-+#define PREFETCH_BUF_EN		BIT(21)
-+#define CSR_RING_ID_BUF		0x000c
-+#define CSR_RING_NE_INT_MODE	0x017c
-+#define CSR_RING_CONFIG		0x006c
-+#define CSR_RING_WR_BASE	0x0070
-+#define NUM_RING_CONFIG		5
-+#define BUFPOOL_MODE		3
-+#define RM3			3
-+#define INC_DEC_CMD_ADDR	0x002c
-+#define UDP_HDR_SIZE		2
-+#define BUF_LEN_CODE_2K		0x5000
-+
-+#define CREATE_MASK(pos, len)		GENMASK((pos)+(len)-1, (pos))
-+#define CREATE_MASK_ULL(pos, len)	GENMASK_ULL((pos)+(len)-1, (pos))
-+
-+/* Empty slot soft signature */
-+#define EMPTY_SLOT_INDEX	1
-+#define EMPTY_SLOT		~0ULL
-+
-+#define WORK_DESC_SIZE		32
-+#define BUFPOOL_DESC_SIZE	16
-+
-+#define RING_OWNER_MASK		GENMASK(9, 6)
-+#define RING_BUFNUM_MASK	GENMASK(5, 0)
-+
-+#define SELTHRSH_POS		3
-+#define SELTHRSH_LEN		3
-+#define RINGADDRL_POS		5
-+#define RINGADDRL_LEN		27
-+#define RINGADDRH_POS		0
-+#define RINGADDRH_LEN		6
-+#define RINGSIZE_POS		23
-+#define RINGSIZE_LEN		3
-+#define RINGTYPE_POS		19
-+#define RINGTYPE_LEN		2
-+#define RINGMODE_POS		20
-+#define RINGMODE_LEN		3
-+#define RECOMTIMEOUTL_POS	28
-+#define RECOMTIMEOUTL_LEN	3
-+#define RECOMTIMEOUTH_POS	0
-+#define RECOMTIMEOUTH_LEN	2
-+#define NUMMSGSINQ_POS		1
-+#define NUMMSGSINQ_LEN		16
-+#define ACCEPTLERR		BIT(19)
-+#define QCOHERENT		BIT(4)
-+#define RECOMBBUF		BIT(27)
-+
-+#define BLOCK_ETH_CSR_OFFSET		0x2000
-+#define BLOCK_ETH_RING_IF_OFFSET	0x9000
-+#define BLOCK_ETH_CLKRST_CSR_OFFSET	0xC000
-+#define BLOCK_ETH_DIAG_CSR_OFFSET	0xD000
-+
-+#define BLOCK_ETH_MAC_OFFSET		0x0000
-+#define BLOCK_ETH_STATS_OFFSET		0x0014
-+#define BLOCK_ETH_MAC_CSR_OFFSET	0x2800
-+
-+#define MAC_ADDR_REG_OFFSET		0x00
-+#define MAC_COMMAND_REG_OFFSET		0x04
-+#define MAC_WRITE_REG_OFFSET		0x08
-+#define MAC_READ_REG_OFFSET		0x0c
-+#define MAC_COMMAND_DONE_REG_OFFSET	0x10
-+
-+#define STAT_ADDR_REG_OFFSET		0x00
-+#define STAT_COMMAND_REG_OFFSET		0x04
-+#define STAT_WRITE_REG_OFFSET		0x08
-+#define STAT_READ_REG_OFFSET		0x0c
-+#define STAT_COMMAND_DONE_REG_OFFSET	0x10
-+
-+#define MII_MGMT_CONFIG_ADDR		0x20
-+#define MII_MGMT_COMMAND_ADDR		0x24
-+#define MII_MGMT_ADDRESS_ADDR		0x28
-+#define MII_MGMT_CONTROL_ADDR		0x2c
-+#define MII_MGMT_STATUS_ADDR		0x30
-+#define MII_MGMT_INDICATORS_ADDR	0x34
-+
-+#define BUSY_MASK			BIT(0)
-+#define READ_CYCLE_MASK			BIT(0)
-+#define PHY_CONTROL_SET(dst, val)	xgene_set_bits(dst, val, 0, 16)
-+
-+#define ENET_SPARE_CFG_REG_ADDR		0x0750
-+#define RSIF_CONFIG_REG_ADDR		0x0010
-+#define RSIF_RAM_DBG_REG0_ADDR		0x0048
-+#define RGMII_REG_0_ADDR		0x07e0
-+#define CFG_LINK_AGGR_RESUME_0_ADDR	0x07c8
-+#define DEBUG_REG_ADDR			0x0700
-+#define CFG_BYPASS_ADDR			0x0294
-+#define CLE_BYPASS_REG0_0_ADDR		0x0490
-+#define CLE_BYPASS_REG1_0_ADDR		0x0494
-+#define CFG_RSIF_FPBUFF_TIMEOUT_EN	BIT(31)
-+#define RESUME_TX			BIT(0)
-+#define CFG_SPEED_1250			BIT(24)
-+#define TX_PORT0			BIT(0)
-+#define CFG_BYPASS_UNISEC_TX		BIT(2)
-+#define CFG_BYPASS_UNISEC_RX		BIT(1)
-+#define CFG_CLE_BYPASS_EN0		BIT(31)
-+#define CFG_TXCLK_MUXSEL0_SET(dst, val)	xgene_set_bits(dst, val, 29, 3)
-+
-+#define CFG_CLE_IP_PROTOCOL0_SET(dst, val)	xgene_set_bits(dst, val, 16, 2)
-+#define CFG_CLE_DSTQID0_SET(dst, val)		xgene_set_bits(dst, val, 0, 12)
-+#define CFG_CLE_FPSEL0_SET(dst, val)		xgene_set_bits(dst, val, 16, 4)
-+#define CFG_MACMODE_SET(dst, val)		xgene_set_bits(dst, val, 18, 2)
-+#define CFG_WAITASYNCRD_SET(dst, val)		xgene_set_bits(dst, val, 0, 16)
-+#define ICM_CONFIG0_REG_0_ADDR		0x0400
-+#define ICM_CONFIG2_REG_0_ADDR		0x0410
-+#define RX_DV_GATE_REG_0_ADDR		0x05fc
-+#define TX_DV_GATE_EN0			BIT(2)
-+#define RX_DV_GATE_EN0			BIT(1)
-+#define RESUME_RX0			BIT(0)
-+#define ENET_CFGSSQMIWQASSOC_ADDR		0xe0
-+#define ENET_CFGSSQMIFPQASSOC_ADDR		0xdc
-+#define ENET_CFGSSQMIQMLITEFPQASSOC_ADDR	0xf0
-+#define ENET_CFGSSQMIQMLITEWQASSOC_ADDR		0xf4
-+#define ENET_CFG_MEM_RAM_SHUTDOWN_ADDR		0x70
-+#define ENET_BLOCK_MEM_RDY_ADDR			0x74
-+#define MAC_CONFIG_1_ADDR			0x00
-+#define MAC_CONFIG_2_ADDR			0x04
-+#define MAX_FRAME_LEN_ADDR			0x10
-+#define INTERFACE_CONTROL_ADDR			0x38
-+#define STATION_ADDR0_ADDR			0x40
-+#define STATION_ADDR1_ADDR			0x44
-+#define PHY_ADDR_SET(dst, val)			xgene_set_bits(dst, val, 8, 5)
-+#define REG_ADDR_SET(dst, val)			xgene_set_bits(dst, val, 0, 5)
-+#define ENET_INTERFACE_MODE2_SET(dst, val)	xgene_set_bits(dst, val, 8, 2)
-+#define MGMT_CLOCK_SEL_SET(dst, val)		xgene_set_bits(dst, val, 0, 3)
-+#define SOFT_RESET1			BIT(31)
-+#define TX_EN				BIT(0)
-+#define RX_EN				BIT(2)
-+#define ENET_LHD_MODE			BIT(25)
-+#define ENET_GHD_MODE			BIT(26)
-+#define FULL_DUPLEX2			BIT(0)
-+#define SCAN_AUTO_INCR			BIT(5)
-+#define TBYT_ADDR			0x38
-+#define TPKT_ADDR			0x39
-+#define TDRP_ADDR			0x45
-+#define TFCS_ADDR			0x47
-+#define TUND_ADDR			0x4a
-+
-+#define TSO_IPPROTO_TCP			1
-+#define	FULL_DUPLEX			2
-+
-+#define USERINFO_POS			0
-+#define USERINFO_LEN			32
-+#define FPQNUM_POS			32
-+#define FPQNUM_LEN			12
-+#define LERR_POS			60
-+#define LERR_LEN			3
-+#define STASH_POS			52
-+#define STASH_LEN			2
-+#define BUFDATALEN_POS			48
-+#define BUFDATALEN_LEN			12
-+#define DATAADDR_POS			0
-+#define DATAADDR_LEN			42
-+#define COHERENT_POS			63
-+#define HENQNUM_POS			48
-+#define HENQNUM_LEN			12
-+#define TYPESEL_POS			44
-+#define TYPESEL_LEN			4
-+#define ETHHDR_POS			12
-+#define IC_POS				35	/* Insert CRC */
-+#define TCPHDR_POS			0
-+#define TCPHDR_LEN			6
-+#define IPHDR_POS			6
-+#define IPHDR_LEN			6
-+#define EC_POS				22	/* Enable checksum */
-+#define IS_POS				24	/* IP protocol select */
-+
-+#define DATAADDR_MASK		CREATE_MASK_ULL(DATAADDR_POS, DATAADDR_LEN)
-+#define BUFDATALEN_MASK		CREATE_MASK_ULL(BUFDATALEN_POS, BUFDATALEN_LEN)
-+#define USERINFO_MASK		CREATE_MASK_ULL(USERINFO_POS, USERINFO_LEN)
-+#define FPQNUM_MASK		CREATE_MASK_ULL(FPQNUM_POS, FPQNUM_LEN)
-+#define LERR_MASK		CREATE_MASK_ULL(LERR_POS, LERR_LEN)
-+#define STASHING_MASK		CREATE_MASK_ULL(STASH_POS, STASH_LEN)
-+#define COHERENT_MASK		BIT_ULL(COHERENT_POS)
-+#define HENQNUM_MASK		CREATE_MASK_ULL(HENQNUM_POS, HENQNUM_LEN)
-+#define TCPHDR_MASK		CREATE_MASK(TCPHDR_POS, TCPHDR_LEN)
-+#define IPHDR_MASK		CREATE_MASK(IPHDR_POS, IPHDR_LEN)
-+#define EC_MASK			BIT(EC_POS)
-+#define IS_MASK			BIT(IS_POS)
-+#define INSERT_CRC		BIT_ULL(IC_POS)
-+#define TYPE_ETH_WORK_MESSAGE	BIT_ULL(44)
-+
-+struct xgene_enet_raw_desc {
-+	u64 m0;
-+	u64 m1;
-+	u64 m2;
-+	u64 m3;
-+};
-+
-+struct xgene_enet_raw_desc16 {
-+	u64 m0;
-+	u64 m1;
-+};
-+
-+static inline void xgene_enet_cpu_to_le64(void *desc_ptr, int count)
-+{
-+	u64 *desc = desc_ptr;
-+	int i;
-+
-+	for (i = 0; i < count; i++)
-+		desc[i] = cpu_to_le64(desc[i]);
-+}
-+
-+static inline void xgene_enet_le64_to_cpu(void *desc_ptr, int count)
-+{
-+	u64 *desc = desc_ptr;
-+	int i;
-+
-+	for (i = 0; i < count; i++)
-+		desc[i] = le64_to_cpu(desc[i]);
-+}
-+
-+static inline void xgene_enet_desc16_to_le64(void *desc_ptr)
-+{
-+	u64 *desc;
-+
-+	desc = desc_ptr;
-+	desc[1] = cpu_to_le64(desc[1]);
-+}
-+
-+static inline void xgene_enet_le64_to_desc16(void *desc_ptr)
-+{
-+	u64 *desc;
-+
-+	desc = desc_ptr;
-+	desc[1] = le64_to_cpu(desc[1]);
-+}
-+
-+enum xgene_enet_ring_cfgsize {
-+	RING_CFGSIZE_512B,
-+	RING_CFGSIZE_2KB,
-+	RING_CFGSIZE_16KB,
-+	RING_CFGSIZE_64KB,
-+	RING_CFGSIZE_512KB,
-+	RING_CFGSIZE_INVALID
-+};
-+
-+enum xgene_enet_ring_type {
-+	RING_DISABLED,
-+	RING_REGULAR,
-+	RING_BUFPOOL
-+};
-+
-+enum xgene_ring_owner {
-+	RING_OWNER_ETH0,
-+	RING_OWNER_CPU = 15,
-+	RING_OWNER_INVALID
-+};
-+
-+enum xgene_enet_ring_bufnum {
-+	RING_BUFNUM_REGULAR = 0x0,
-+	RING_BUFNUM_BUFPOOL = 0x20,
-+	RING_BUFNUM_INVALID
-+};
-+
-+enum xgene_enet_cmd {
-+	XGENE_ENET_WR_CMD = BIT(31),
-+	XGENE_ENET_RD_CMD = BIT(30)
-+};
-+
-+enum xgene_enet_err_code {
-+	HBF_READ_DATA = 3,
-+	HBF_LL_READ = 4,
-+	BAD_WORK_MSG = 6,
-+	BUFPOOL_TIMEOUT = 15,
-+	INGRESS_CRC = 16,
-+	INGRESS_CHECKSUM = 17,
-+	INGRESS_TRUNC_FRAME = 18,
-+	INGRESS_PKT_LEN = 19,
-+	INGRESS_PKT_UNDER = 20,
-+	INGRESS_FIFO_OVERRUN = 21,
-+	INGRESS_CHECKSUM_COMPUTE = 26,
-+	ERR_CODE_INVALID
-+};
-+
-+static inline enum xgene_ring_owner xgene_enet_ring_owner(u16 id)
-+{
-+	return (id & RING_OWNER_MASK) >> 6;
-+}
-+
-+static inline u8 xgene_enet_ring_bufnum(u16 id)
-+{
-+	return id & RING_BUFNUM_MASK;
-+}
-+
-+static inline bool xgene_enet_is_bufpool(u16 id)
-+{
-+	return ((id & RING_BUFNUM_MASK) >= 0x20) ? true : false;
-+}
-+
-+static inline u16 xgene_enet_get_numslots(u16 id, u32 size)
-+{
-+	bool is_bufpool = xgene_enet_is_bufpool(id);
-+
-+	return (is_bufpool) ? size / BUFPOOL_DESC_SIZE :
-+		      size / WORK_DESC_SIZE;
-+}
-+
-+struct xgene_enet_desc_ring *xgene_enet_setup_ring(
-+		struct xgene_enet_desc_ring *ring);
-+void xgene_enet_clear_ring(struct xgene_enet_desc_ring *ring);
-+
-+void xgene_set_tx_desc(struct xgene_enet_desc_ring *ring,
-+		       struct xgene_enet_raw_desc *raw_desc);
-+void xgene_get_desc(struct xgene_enet_desc_ring *ring,
-+		    struct xgene_enet_raw_desc *raw_desc);
-+void xgene_get_bufpool_desc(struct xgene_enet_desc_ring *ring,
-+			    struct xgene_enet_raw_desc16 *raw_desc);
-+void xgene_enet_parse_error(struct xgene_enet_desc_ring *ring,
-+			    struct xgene_enet_pdata *pdata,
-+			    enum xgene_enet_err_code status);
-+
-+void xgene_enet_reset(struct xgene_enet_pdata *priv);
-+void xgene_gmac_reset(struct xgene_enet_pdata *priv);
-+void xgene_gmac_init(struct xgene_enet_pdata *priv, int speed);
-+void xgene_gmac_tx_enable(struct xgene_enet_pdata *priv);
-+void xgene_gmac_rx_enable(struct xgene_enet_pdata *priv);
-+void xgene_gmac_tx_disable(struct xgene_enet_pdata *priv);
-+void xgene_gmac_rx_disable(struct xgene_enet_pdata *priv);
-+void xgene_gmac_set_mac_addr(struct xgene_enet_pdata *pdata);
-+void xgene_enet_cle_bypass(struct xgene_enet_pdata *pdata,
-+			   u32 dst_ring_num, u16 bufpool_id);
-+void xgene_gport_shutdown(struct xgene_enet_pdata *priv);
-+void xgene_gmac_get_tx_stats(struct xgene_enet_pdata *pdata);
-+
-+int xgene_enet_mdio_config(struct xgene_enet_pdata *pdata);
-+int xgene_enet_mdio_remove(struct xgene_enet_pdata *pdata);
-+
-+#endif /* __XGENE_ENET_HW_H__ */
-diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
-new file mode 100644
-index 0000000..756523a
---- /dev/null
-+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
-@@ -0,0 +1,962 @@
-+/* Applied Micro X-Gene SoC Ethernet Driver
-+ *
-+ * Copyright (c) 2014, Applied Micro Circuits Corporation
-+ * Authors: Iyappan Subramanian <isubramanian@apm.com>
-+ *	    Ravi Patel <rapatel@apm.com>
-+ *	    Keyur Chudgar <kchudgar@apm.com>
-+ *
-+ * This program is free software; you can redistribute  it and/or modify it
-+ * under  the terms of  the GNU General  Public License as published by the
-+ * Free Software Foundation;  either version 2 of the  License, or (at your
-+ * option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include "xgene_enet_main.h"
-+#include "xgene_enet_hw.h"
-+
-+static void xgene_enet_init_bufpool(struct xgene_enet_desc_ring *buf_pool)
-+{
-+	struct xgene_enet_raw_desc16 *raw_desc;
-+	int i;
-+
-+	for (i = 0; i < buf_pool->slots; i++) {
-+		raw_desc = &buf_pool->raw_desc16[i];
-+
-+		/* Hardware expects descriptor in little endian format */
-+		raw_desc->m0 = cpu_to_le64(i |
-+			       (((u64)buf_pool->dst_ring_num << FPQNUM_POS) &
-+			       FPQNUM_MASK) | STASHING_MASK);
-+	}
-+}
-+
-+static struct device *ndev_to_dev(struct net_device *ndev)
-+{
-+	return ndev->dev.parent;
-+}
-+
-+static int xgene_enet_refill_bufpool(struct xgene_enet_desc_ring *buf_pool,
-+				     u32 nbuf)
-+{
-+	struct sk_buff *skb;
-+	struct xgene_enet_raw_desc16 *raw_desc;
-+	struct net_device *ndev;
-+	struct device *dev;
-+	dma_addr_t dma_addr;
-+	u32 tail = buf_pool->tail;
-+	u32 slots = buf_pool->slots - 1;
-+	u16 bufdatalen, len;
-+	int i;
-+
-+	ndev = buf_pool->ndev;
-+	dev = ndev_to_dev(buf_pool->ndev);
-+	bufdatalen = BUF_LEN_CODE_2K | (SKB_BUFFER_SIZE & GENMASK(11, 0));
-+	len = XGENE_ENET_MAX_MTU;
-+
-+	for (i = 0; i < nbuf; i++) {
-+		raw_desc = &buf_pool->raw_desc16[tail];
-+
-+		skb = netdev_alloc_skb_ip_align(ndev, len);
-+		if (unlikely(!skb))
-+			return -ENOMEM;
-+		buf_pool->rx_skb[tail] = skb;
-+
-+		dma_addr = dma_map_single(dev, skb->data, len, DMA_FROM_DEVICE);
-+		if (dma_mapping_error(dev, dma_addr)) {
-+			netdev_err(ndev, "DMA mapping error\n");
-+			dev_kfree_skb_any(skb);
-+			return -EINVAL;
-+		}
-+
-+		raw_desc->m1 = cpu_to_le64((dma_addr & DATAADDR_MASK) |
-+			       (((u64)bufdatalen << BUFDATALEN_POS) &
-+			       BUFDATALEN_MASK) | COHERENT_MASK);
-+		tail = (tail + 1) & slots;
-+	}
-+
-+	iowrite32(nbuf, buf_pool->cmd);
-+	buf_pool->tail = tail;
-+
-+	return 0;
-+}
-+
-+static u16 xgene_enet_dst_ring_num(struct xgene_enet_desc_ring *ring)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ring->ndev);
-+
-+	return ((u16)pdata->rm << 10) | ring->num;
-+}
-+
-+static u8 xgene_enet_hdr_len(const void *data)
-+{
-+	const struct ethhdr *eth = data;
-+
-+	return (eth->h_proto == htons(ETH_P_8021Q)) ? VLAN_ETH_HLEN : ETH_HLEN;
-+}
-+
-+static u32 xgene_enet_ring_len(struct xgene_enet_desc_ring *ring)
-+{
-+	u32 *cmd_base = ring->cmd_base;
-+	u32 ring_state, num_msgs;
-+
-+	ring_state = ioread32(&cmd_base[1]);
-+	num_msgs = ring_state & CREATE_MASK(NUMMSGSINQ_POS, NUMMSGSINQ_LEN);
-+
-+	return num_msgs >> NUMMSGSINQ_POS;
-+}
-+
-+static void xgene_enet_delete_bufpool(struct xgene_enet_desc_ring *buf_pool)
-+{
-+	struct xgene_enet_raw_desc16 *raw_desc;
-+	u32 slots = buf_pool->slots - 1;
-+	u32 tail = buf_pool->tail;
-+	u32 userinfo;
-+	int i, len;
-+
-+	len = xgene_enet_ring_len(buf_pool);
-+	for (i = 0; i < len; i++) {
-+		tail = (tail - 1) & slots;
-+		raw_desc = &buf_pool->raw_desc16[tail];
-+
-+		/* Hardware stores descriptor in little endian format */
-+		userinfo = le64_to_cpu(raw_desc->m0) & USERINFO_MASK;
-+		dev_kfree_skb_any(buf_pool->rx_skb[userinfo]);
-+	}
-+
-+	iowrite32(-len, buf_pool->cmd);
-+	buf_pool->tail = tail;
-+}
-+
-+static irqreturn_t xgene_enet_rx_irq(const int irq, void *data)
-+{
-+	struct xgene_enet_desc_ring *rx_ring = data;
-+
-+	if (napi_schedule_prep(&rx_ring->napi)) {
-+		disable_irq_nosync(irq);
-+		__napi_schedule(&rx_ring->napi);
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static int xgene_enet_tx_completion(struct xgene_enet_desc_ring *cp_ring,
-+				    struct xgene_enet_raw_desc *raw_desc)
-+{
-+	struct sk_buff *skb;
-+	struct device *dev;
-+	u16 skb_index;
-+	u8 status;
-+	int ret = 0;
-+
-+	skb_index = raw_desc->m0 & USERINFO_MASK;
-+	skb = cp_ring->cp_skb[skb_index];
-+
-+	dev = ndev_to_dev(cp_ring->ndev);
-+	dma_unmap_single(dev, raw_desc->m1 & DATAADDR_MASK,
-+			 (raw_desc->m1 & BUFDATALEN_MASK) >> BUFDATALEN_POS,
-+			 DMA_TO_DEVICE);
-+
-+	/* Checking for error */
-+	status = (raw_desc->m0 & LERR_MASK) >> LERR_POS;
-+	if (unlikely(status > 2)) {
-+		xgene_enet_parse_error(cp_ring, netdev_priv(cp_ring->ndev),
-+				       status);
-+		ret = -1;
-+	}
-+
-+	if (likely(skb)) {
-+		dev_kfree_skb_any(skb);
-+	} else {
-+		netdev_err(cp_ring->ndev, "completion skb is NULL\n");
-+		ret = -1;
-+	}
-+
-+	return ret;
-+}
-+
-+static u64 xgene_enet_work_msg(struct sk_buff *skb)
-+{
-+	struct iphdr *iph;
-+	u8 l3hlen, l4hlen = 0;
-+	u8 csum_enable = 0;
-+	u8 proto = 0;
-+	u8 ethhdr;
-+	u64 hopinfo;
-+
-+	if (unlikely(skb->protocol != htons(ETH_P_IP)) &&
-+	    unlikely(skb->protocol != htons(ETH_P_8021Q)))
-+		goto out;
-+
-+	if (unlikely(!(skb->dev->features & NETIF_F_IP_CSUM)))
-+		goto out;
-+
-+	iph = ip_hdr(skb);
-+	if (unlikely(ip_is_fragment(iph)))
-+		goto out;
-+
-+	if (likely(iph->protocol == IPPROTO_TCP)) {
-+		l4hlen = tcp_hdrlen(skb) >> 2;
-+		csum_enable = 1;
-+		proto = TSO_IPPROTO_TCP;
-+	} else if (iph->protocol == IPPROTO_UDP) {
-+		l4hlen = UDP_HDR_SIZE;
-+		csum_enable = 1;
-+	}
-+out:
-+	l3hlen = ip_hdrlen(skb) >> 2;
-+	ethhdr = xgene_enet_hdr_len(skb->data);
-+	hopinfo = (l4hlen & TCPHDR_MASK) |
-+		  ((l3hlen << IPHDR_POS) & IPHDR_MASK) |
-+		  (ethhdr << ETHHDR_POS) |
-+		  (csum_enable << EC_POS) |
-+		  (proto << IS_POS) |
-+		  INSERT_CRC |
-+		  TYPE_ETH_WORK_MESSAGE;
-+
-+	return hopinfo;
-+}
-+
-+static int xgene_enet_setup_tx_desc(struct xgene_enet_desc_ring *tx_ring,
-+				    struct sk_buff *skb)
-+{
-+	struct device *dev = ndev_to_dev(tx_ring->ndev);
-+	struct xgene_enet_raw_desc *raw_desc;
-+	dma_addr_t dma_addr;
-+	u16 tail = tx_ring->tail;
-+	u64 hopinfo;
-+
-+	raw_desc = &tx_ring->raw_desc[tail];
-+	memset(raw_desc, 0, sizeof(struct xgene_enet_raw_desc));
-+
-+	dma_addr = dma_map_single(dev, skb->data, skb->len, DMA_TO_DEVICE);
-+	if (dma_mapping_error(dev, dma_addr)) {
-+		netdev_err(tx_ring->ndev, "DMA mapping error\n");
-+		return -EINVAL;
-+	}
-+
-+	/* Hardware expects descriptor in little endian format */
-+	raw_desc->m0 = cpu_to_le64(tail);
-+	raw_desc->m1 = cpu_to_le64((dma_addr & DATAADDR_MASK) |
-+		       (((u64)skb->len << BUFDATALEN_POS) & BUFDATALEN_MASK) |
-+		       COHERENT_MASK);
-+	hopinfo = xgene_enet_work_msg(skb);
-+	raw_desc->m3 = cpu_to_le64(
-+		       (((u64)tx_ring->dst_ring_num << HENQNUM_POS) &
-+		       HENQNUM_MASK) | hopinfo);
-+	tx_ring->cp_ring->cp_skb[tail] = skb;
-+
-+	return 0;
-+}
-+
-+static netdev_tx_t xgene_enet_start_xmit(struct sk_buff *skb,
-+					 struct net_device *ndev)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+	struct xgene_enet_desc_ring *tx_ring = pdata->tx_ring;
-+	struct xgene_enet_desc_ring *cp_ring = tx_ring->cp_ring;
-+	u32 tx_level, cq_level;
-+
-+	tx_level = xgene_enet_ring_len(tx_ring);
-+	cq_level = xgene_enet_ring_len(cp_ring);
-+	if (unlikely(tx_level > pdata->tx_qcnt_hi ||
-+		     cq_level > pdata->cp_qcnt_hi)) {
-+		netif_stop_queue(ndev);
-+		return NETDEV_TX_BUSY;
-+	}
-+
-+	if (xgene_enet_setup_tx_desc(tx_ring, skb)) {
-+		dev_kfree_skb_any(skb);
-+		return NETDEV_TX_OK;
-+	}
-+
-+	iowrite32(1, tx_ring->cmd);
-+	skb_tx_timestamp(skb);
-+	tx_ring->tail = (tx_ring->tail + 1) & (tx_ring->slots - 1);
-+
-+	pdata->stats.tx_packets++;
-+	pdata->stats.tx_bytes += skb->len;
-+
-+	return NETDEV_TX_OK;
-+}
-+
-+static void xgene_enet_skip_csum(struct sk_buff *skb)
-+{
-+	struct iphdr *iph = ip_hdr(skb);
-+
-+	if (!ip_is_fragment(iph) ||
-+	    (iph->protocol != IPPROTO_TCP && iph->protocol != IPPROTO_UDP)) {
-+		skb->ip_summed = CHECKSUM_UNNECESSARY;
-+	}
-+}
-+
-+static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring,
-+			       struct xgene_enet_raw_desc *raw_desc)
-+{
-+	struct net_device *ndev;
-+	struct xgene_enet_pdata *pdata;
-+	struct device *dev;
-+	struct xgene_enet_desc_ring *buf_pool;
-+	u32 datalen, skb_index;
-+	struct sk_buff *skb;
-+	u8 status;
-+	int ret = 0;
-+
-+	ndev = rx_ring->ndev;
-+	pdata = netdev_priv(ndev);
-+	dev = ndev_to_dev(rx_ring->ndev);
-+	buf_pool = rx_ring->buf_pool;
-+
-+	dma_unmap_single(dev, raw_desc->m1 & DATAADDR_MASK, XGENE_ENET_MAX_MTU,
-+			 DMA_FROM_DEVICE);
-+	skb_index = raw_desc->m0 & USERINFO_MASK;
-+	skb = buf_pool->rx_skb[skb_index];
-+
-+	/* checking for error */
-+	status = (raw_desc->m0 & LERR_MASK) >> LERR_POS;
-+	if (unlikely(status > 2)) {
-+		dev_kfree_skb_any(skb);
-+		xgene_enet_parse_error(rx_ring, netdev_priv(rx_ring->ndev),
-+				       status);
-+		pdata->stats.rx_dropped++;
-+		ret = -1;
-+		goto out;
-+	}
-+
-+	/* strip off CRC as HW isn't doing this */
-+	datalen = (raw_desc->m1 & BUFDATALEN_MASK) >> BUFDATALEN_POS;
-+	datalen -= 4;
-+	prefetch(skb->data - NET_IP_ALIGN);
-+	skb_put(skb, datalen);
-+
-+	skb_checksum_none_assert(skb);
-+	skb->protocol = eth_type_trans(skb, ndev);
-+	if (likely((ndev->features & NETIF_F_IP_CSUM) &&
-+		   skb->protocol == htons(ETH_P_IP))) {
-+		xgene_enet_skip_csum(skb);
-+	}
-+
-+	pdata->stats.rx_packets++;
-+	pdata->stats.rx_bytes += datalen;
-+	napi_gro_receive(&rx_ring->napi, skb);
-+out:
-+	if (--rx_ring->nbufpool == 0) {
-+		ret = xgene_enet_refill_bufpool(buf_pool, NUM_BUFPOOL);
-+		rx_ring->nbufpool = NUM_BUFPOOL;
-+	}
-+
-+	return ret;
-+}
-+
-+static bool is_rx_desc(struct xgene_enet_raw_desc *raw_desc)
-+{
-+	/* Hardware stores descriptor in little endian format */
-+	raw_desc->m0 = le64_to_cpu(raw_desc->m0);
-+	raw_desc->m1 = le64_to_cpu(raw_desc->m1);
-+	return ((raw_desc->m0 & FPQNUM_MASK) >> FPQNUM_POS) ? true : false;
-+}
-+
-+static int xgene_enet_process_ring(struct xgene_enet_desc_ring *ring,
-+				   int budget)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ring->ndev);
-+	struct xgene_enet_raw_desc *raw_desc;
-+	u16 head = ring->head;
-+	u16 slots = ring->slots - 1;
-+	int ret, count = 0;
-+
-+	do {
-+		raw_desc = &ring->raw_desc[head];
-+		if (unlikely(((u64 *)raw_desc)[EMPTY_SLOT_INDEX] == EMPTY_SLOT))
-+			break;
-+
-+		if (is_rx_desc(raw_desc))
-+			ret = xgene_enet_rx_frame(ring, raw_desc);
-+		else
-+			ret = xgene_enet_tx_completion(ring, raw_desc);
-+		((u64 *)raw_desc)[EMPTY_SLOT_INDEX] = EMPTY_SLOT;
-+
-+		head = (head + 1) & slots;
-+		count++;
-+
-+		if (ret)
-+			break;
-+	} while (--budget);
-+
-+	if (likely(count)) {
-+		iowrite32(-count, ring->cmd);
-+		ring->head = head;
-+
-+		if (netif_queue_stopped(ring->ndev)) {
-+			if (xgene_enet_ring_len(ring) < pdata->cp_qcnt_low)
-+				netif_wake_queue(ring->ndev);
-+		}
-+	}
-+
-+	return budget;
-+}
-+
-+static int xgene_enet_napi(struct napi_struct *napi, const int budget)
-+{
-+	struct xgene_enet_desc_ring *ring;
-+	int processed;
-+
-+	ring = container_of(napi, struct xgene_enet_desc_ring, napi);
-+	processed = xgene_enet_process_ring(ring, budget);
-+
-+	if (processed != budget) {
-+		napi_complete(napi);
-+		enable_irq(ring->irq);
-+	}
-+
-+	return processed;
-+}
-+
-+static void xgene_enet_timeout(struct net_device *ndev)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+
-+	xgene_gmac_reset(pdata);
-+}
-+
-+static int xgene_enet_register_irq(struct net_device *ndev)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+	struct device *dev = ndev_to_dev(ndev);
-+	int ret;
-+
-+	ret = devm_request_irq(dev, pdata->rx_ring->irq, xgene_enet_rx_irq,
-+			       IRQF_SHARED, ndev->name, pdata->rx_ring);
-+	if (ret) {
-+		netdev_err(ndev, "rx%d interrupt request failed\n",
-+			   pdata->rx_ring->irq);
-+	}
-+
-+	return ret;
-+}
-+
-+static void xgene_enet_free_irq(struct net_device *ndev)
-+{
-+	struct xgene_enet_pdata *pdata;
-+	struct device *dev;
-+
-+	pdata = netdev_priv(ndev);
-+	dev = ndev_to_dev(ndev);
-+	devm_free_irq(dev, pdata->rx_ring->irq, pdata->rx_ring);
-+}
-+
-+static int xgene_enet_open(struct net_device *ndev)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+	int ret;
-+
-+	xgene_gmac_tx_enable(pdata);
-+	xgene_gmac_rx_enable(pdata);
-+
-+	ret = xgene_enet_register_irq(ndev);
-+	if (ret)
-+		return ret;
-+	napi_enable(&pdata->rx_ring->napi);
-+
-+	if (pdata->phy_dev)
-+		phy_start(pdata->phy_dev);
-+
-+	netif_start_queue(ndev);
-+
-+	return ret;
-+}
-+
-+static int xgene_enet_close(struct net_device *ndev)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+
-+	netif_stop_queue(ndev);
-+
-+	if (pdata->phy_dev)
-+		phy_stop(pdata->phy_dev);
-+
-+	napi_disable(&pdata->rx_ring->napi);
-+	xgene_enet_free_irq(ndev);
-+	xgene_enet_process_ring(pdata->rx_ring, -1);
-+
-+	xgene_gmac_tx_disable(pdata);
-+	xgene_gmac_rx_disable(pdata);
-+
-+	return 0;
-+}
-+
-+static void xgene_enet_delete_ring(struct xgene_enet_desc_ring *ring)
-+{
-+	struct xgene_enet_pdata *pdata;
-+	struct device *dev;
-+
-+	pdata = netdev_priv(ring->ndev);
-+	dev = ndev_to_dev(ring->ndev);
-+
-+	xgene_enet_clear_ring(ring);
-+	dma_free_coherent(dev, ring->size, ring->desc_addr, ring->dma);
-+}
-+
-+static void xgene_enet_delete_desc_rings(struct xgene_enet_pdata *pdata)
-+{
-+	struct xgene_enet_desc_ring *buf_pool;
-+
-+	if (pdata->tx_ring) {
-+		xgene_enet_delete_ring(pdata->tx_ring);
-+		pdata->tx_ring = NULL;
-+	}
-+
-+	if (pdata->rx_ring) {
-+		buf_pool = pdata->rx_ring->buf_pool;
-+		xgene_enet_delete_bufpool(buf_pool);
-+		xgene_enet_delete_ring(buf_pool);
-+		xgene_enet_delete_ring(pdata->rx_ring);
-+		pdata->rx_ring = NULL;
-+	}
-+}
-+
-+static int xgene_enet_get_ring_size(struct device *dev,
-+				    enum xgene_enet_ring_cfgsize cfgsize)
-+{
-+	int size = -EINVAL;
-+
-+	switch (cfgsize) {
-+	case RING_CFGSIZE_512B:
-+		size = 0x200;
-+		break;
-+	case RING_CFGSIZE_2KB:
-+		size = 0x800;
-+		break;
-+	case RING_CFGSIZE_16KB:
-+		size = 0x4000;
-+		break;
-+	case RING_CFGSIZE_64KB:
-+		size = 0x10000;
-+		break;
-+	case RING_CFGSIZE_512KB:
-+		size = 0x80000;
-+		break;
-+	default:
-+		dev_err(dev, "Unsupported cfg ring size %d\n", cfgsize);
-+		break;
-+	}
-+
-+	return size;
-+}
-+
-+static void xgene_enet_free_desc_ring(struct xgene_enet_desc_ring *ring)
-+{
-+	struct device *dev;
-+
-+	if (!ring)
-+		return;
-+
-+	dev = ndev_to_dev(ring->ndev);
-+
-+	if (ring->desc_addr) {
-+		xgene_enet_clear_ring(ring);
-+		dma_free_coherent(dev, ring->size, ring->desc_addr, ring->dma);
-+	}
-+	devm_kfree(dev, ring);
-+}
-+
-+static void xgene_enet_free_desc_rings(struct xgene_enet_pdata *pdata)
-+{
-+	struct device *dev = &pdata->pdev->dev;
-+	struct xgene_enet_desc_ring *ring;
-+
-+	ring = pdata->tx_ring;
-+	if (ring && ring->cp_ring && ring->cp_ring->cp_skb)
-+		devm_kfree(dev, ring->cp_ring->cp_skb);
-+	xgene_enet_free_desc_ring(ring);
-+
-+	ring = pdata->rx_ring;
-+	if (ring && ring->buf_pool && ring->buf_pool->rx_skb)
-+		devm_kfree(dev, ring->buf_pool->rx_skb);
-+	xgene_enet_free_desc_ring(ring->buf_pool);
-+	xgene_enet_free_desc_ring(ring);
-+}
-+
-+static struct xgene_enet_desc_ring *xgene_enet_create_desc_ring(
-+			struct net_device *ndev, u32 ring_num,
-+			enum xgene_enet_ring_cfgsize cfgsize, u32 ring_id)
-+{
-+	struct xgene_enet_desc_ring *ring;
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+	struct device *dev = ndev_to_dev(ndev);
-+	u32 size;
-+
-+	ring = devm_kzalloc(dev, sizeof(struct xgene_enet_desc_ring),
-+			    GFP_KERNEL);
-+	if (!ring)
-+		return NULL;
-+
-+	ring->ndev = ndev;
-+	ring->num = ring_num;
-+	ring->cfgsize = cfgsize;
-+	ring->id = ring_id;
-+
-+	size = xgene_enet_get_ring_size(dev, cfgsize);
-+	ring->desc_addr = dma_zalloc_coherent(dev, size, &ring->dma,
-+					      GFP_KERNEL);
-+	if (!ring->desc_addr) {
-+		devm_kfree(dev, ring);
-+		return NULL;
-+	}
-+	ring->size = size;
-+
-+	ring->cmd_base = pdata->ring_cmd_addr + (ring->num << 6);
-+	ring->cmd = ring->cmd_base + INC_DEC_CMD_ADDR;
-+	pdata->rm = RM3;
-+	ring = xgene_enet_setup_ring(ring);
-+	netdev_dbg(ndev, "ring info: num=%d  size=%d  id=%d  slots=%d\n",
-+		   ring->num, ring->size, ring->id, ring->slots);
-+
-+	return ring;
-+}
-+
-+static u16 xgene_enet_get_ring_id(enum xgene_ring_owner owner, u8 bufnum)
-+{
-+	return (owner << 6) | (bufnum & GENMASK(5, 0));
-+}
-+
-+static int xgene_enet_create_desc_rings(struct net_device *ndev)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+	struct device *dev = ndev_to_dev(ndev);
-+	struct xgene_enet_desc_ring *rx_ring, *tx_ring, *cp_ring;
-+	struct xgene_enet_desc_ring *buf_pool = NULL;
-+	u8 cpu_bufnum = 0, eth_bufnum = 0;
-+	u8 bp_bufnum = 0x20;
-+	u16 ring_id, ring_num = 0;
-+	int ret;
-+
-+	/* allocate rx descriptor ring */
-+	ring_id = xgene_enet_get_ring_id(RING_OWNER_CPU, cpu_bufnum++);
-+	rx_ring = xgene_enet_create_desc_ring(ndev, ring_num++,
-+					      RING_CFGSIZE_16KB, ring_id);
-+	if (!rx_ring) {
-+		ret = -ENOMEM;
-+		goto err;
-+	}
-+
-+	/* allocate buffer pool for receiving packets */
-+	ring_id = xgene_enet_get_ring_id(RING_OWNER_ETH0, bp_bufnum++);
-+	buf_pool = xgene_enet_create_desc_ring(ndev, ring_num++,
-+					       RING_CFGSIZE_2KB, ring_id);
-+	if (!buf_pool) {
-+		ret = -ENOMEM;
-+		goto err;
-+	}
-+
-+	rx_ring->nbufpool = NUM_BUFPOOL;
-+	rx_ring->buf_pool = buf_pool;
-+	rx_ring->irq = pdata->rx_irq;
-+	buf_pool->rx_skb = devm_kcalloc(dev, buf_pool->slots,
-+				     sizeof(struct sk_buff *), GFP_KERNEL);
-+	if (!buf_pool->rx_skb) {
-+		ret = -ENOMEM;
-+		goto err;
-+	}
-+
-+	buf_pool->dst_ring_num = xgene_enet_dst_ring_num(buf_pool);
-+	rx_ring->buf_pool = buf_pool;
-+	pdata->rx_ring = rx_ring;
-+
-+	/* allocate tx descriptor ring */
-+	ring_id = xgene_enet_get_ring_id(RING_OWNER_ETH0, eth_bufnum++);
-+	tx_ring = xgene_enet_create_desc_ring(ndev, ring_num++,
-+					      RING_CFGSIZE_16KB, ring_id);
-+	if (!tx_ring) {
-+		ret = -ENOMEM;
-+		goto err;
-+	}
-+	pdata->tx_ring = tx_ring;
-+
-+	cp_ring = pdata->rx_ring;
-+	cp_ring->cp_skb = devm_kcalloc(dev, tx_ring->slots,
-+				     sizeof(struct sk_buff *), GFP_KERNEL);
-+	if (!cp_ring->cp_skb) {
-+		ret = -ENOMEM;
-+		goto err;
-+	}
-+	pdata->tx_ring->cp_ring = cp_ring;
-+	pdata->tx_ring->dst_ring_num = xgene_enet_dst_ring_num(cp_ring);
-+
-+	pdata->tx_qcnt_hi = pdata->tx_ring->slots / 2;
-+	pdata->cp_qcnt_hi = pdata->rx_ring->slots / 2;
-+	pdata->cp_qcnt_low = pdata->cp_qcnt_hi / 2;
-+
-+	return 0;
-+
-+err:
-+	xgene_enet_free_desc_rings(pdata);
-+	return ret;
-+}
-+
-+static struct rtnl_link_stats64 *xgene_enet_get_stats64(
-+			struct net_device *ndev,
-+			struct rtnl_link_stats64 *storage)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+	struct rtnl_link_stats64 *stats = &pdata->stats;
-+
-+	spin_lock(&pdata->stats_lock);
-+	stats->rx_errors += stats->rx_length_errors +
-+			    stats->rx_crc_errors +
-+			    stats->rx_frame_errors +
-+			    stats->rx_fifo_errors;
-+	memcpy(storage, &pdata->stats, sizeof(struct rtnl_link_stats64));
-+	spin_unlock(&pdata->stats_lock);
-+
-+	return storage;
-+}
-+
-+static int xgene_enet_set_mac_address(struct net_device *ndev, void *addr)
-+{
-+	struct xgene_enet_pdata *pdata = netdev_priv(ndev);
-+	int ret;
-+
-+	ret = eth_mac_addr(ndev, addr);
-+	if (ret)
-+		return ret;
-+	xgene_gmac_set_mac_addr(pdata);
-+
-+	return ret;
-+}
-+
-+static const struct net_device_ops xgene_ndev_ops = {
-+	.ndo_open = xgene_enet_open,
-+	.ndo_stop = xgene_enet_close,
-+	.ndo_start_xmit = xgene_enet_start_xmit,
-+	.ndo_tx_timeout = xgene_enet_timeout,
-+	.ndo_get_stats64 = xgene_enet_get_stats64,
-+	.ndo_change_mtu = eth_change_mtu,
-+	.ndo_set_mac_address = xgene_enet_set_mac_address,
-+};
-+
-+static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
-+{
-+	struct platform_device *pdev;
-+	struct net_device *ndev;
-+	struct device *dev;
-+	struct resource *res;
-+	void *base_addr;
-+	const char *mac;
-+	int ret;
-+
-+	pdev = pdata->pdev;
-+	dev = &pdev->dev;
-+	ndev = pdata->ndev;
-+
-+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "enet_csr");
-+	if (!res) {
-+		dev_err(dev, "Resource enet_csr not defined\n");
-+		return -ENODEV;
-+	}
-+	pdata->base_addr = devm_ioremap_resource(dev, res);
-+	if (IS_ERR(pdata->base_addr)) {
-+		dev_err(dev, "Unable to retrieve ENET Port CSR region\n");
-+		return PTR_ERR(pdata->base_addr);
-+	}
-+
-+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_csr");
-+	if (!res) {
-+		dev_err(dev, "Resource ring_csr not defined\n");
-+		return -ENODEV;
-+	}
-+	pdata->ring_csr_addr = devm_ioremap_resource(dev, res);
-+	if (IS_ERR(pdata->ring_csr_addr)) {
-+		dev_err(dev, "Unable to retrieve ENET Ring CSR region\n");
-+		return PTR_ERR(pdata->ring_csr_addr);
-+	}
-+
-+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_cmd");
-+	if (!res) {
-+		dev_err(dev, "Resource ring_cmd not defined\n");
-+		return -ENODEV;
-+	}
-+	pdata->ring_cmd_addr = devm_ioremap_resource(dev, res);
-+	if (IS_ERR(pdata->ring_cmd_addr)) {
-+		dev_err(dev, "Unable to retrieve ENET Ring command region\n");
-+		return PTR_ERR(pdata->ring_cmd_addr);
-+	}
-+
-+	ret = platform_get_irq(pdev, 0);
-+	if (ret <= 0) {
-+		dev_err(dev, "Unable to get ENET Rx IRQ\n");
-+		ret = ret ? : -ENXIO;
-+		return ret;
-+	}
-+	pdata->rx_irq = ret;
-+
-+	mac = of_get_mac_address(dev->of_node);
-+	if (mac)
-+		memcpy(ndev->dev_addr, mac, ndev->addr_len);
-+	else
-+		eth_hw_addr_random(ndev);
-+	memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len);
-+
-+	pdata->phy_mode = of_get_phy_mode(pdev->dev.of_node);
-+	if (pdata->phy_mode < 0) {
-+		dev_err(dev, "Incorrect phy-connection-type in DTS\n");
-+		return -EINVAL;
-+	}
-+
-+	pdata->clk = devm_clk_get(&pdev->dev, NULL);
-+	ret = IS_ERR(pdata->clk);
-+	if (IS_ERR(pdata->clk)) {
-+		dev_err(&pdev->dev, "can't get clock\n");
-+		ret = PTR_ERR(pdata->clk);
-+		return ret;
-+	}
-+
-+	base_addr = pdata->base_addr;
-+	pdata->eth_csr_addr = base_addr + BLOCK_ETH_CSR_OFFSET;
-+	pdata->eth_ring_if_addr = base_addr + BLOCK_ETH_RING_IF_OFFSET;
-+	pdata->eth_diag_csr_addr = base_addr + BLOCK_ETH_DIAG_CSR_OFFSET;
-+	pdata->mcx_mac_addr = base_addr + BLOCK_ETH_MAC_OFFSET;
-+	pdata->mcx_stats_addr = base_addr + BLOCK_ETH_STATS_OFFSET;
-+	pdata->mcx_mac_csr_addr = base_addr + BLOCK_ETH_MAC_CSR_OFFSET;
-+	pdata->rx_buff_cnt = NUM_PKT_BUF;
-+
-+	return ret;
-+}
-+
-+static int xgene_enet_init_hw(struct xgene_enet_pdata *pdata)
-+{
-+	struct net_device *ndev = pdata->ndev;
-+	struct xgene_enet_desc_ring *buf_pool;
-+	u16 dst_ring_num;
-+	int ret;
-+
-+	xgene_gmac_tx_disable(pdata);
-+	xgene_gmac_rx_disable(pdata);
-+
-+	ret = xgene_enet_create_desc_rings(ndev);
-+	if (ret) {
-+		netdev_err(ndev, "Error in ring configuration\n");
-+		return ret;
-+	}
-+
-+	/* setup buffer pool */
-+	buf_pool = pdata->rx_ring->buf_pool;
-+	xgene_enet_init_bufpool(buf_pool);
-+	ret = xgene_enet_refill_bufpool(buf_pool, pdata->rx_buff_cnt);
-+	if (ret)
-+		return ret;
-+
-+	dst_ring_num = xgene_enet_dst_ring_num(pdata->rx_ring);
-+	xgene_enet_cle_bypass(pdata, dst_ring_num, buf_pool->id);
-+
-+	return ret;
-+}
-+
-+static int xgene_enet_probe(struct platform_device *pdev)
-+{
-+	struct net_device *ndev;
-+	struct xgene_enet_pdata *pdata;
-+	struct device *dev = &pdev->dev;
-+	struct napi_struct *napi;
-+	int ret;
-+
-+	ndev = alloc_etherdev(sizeof(struct xgene_enet_pdata));
-+	if (!ndev)
-+		return -ENOMEM;
-+
-+	pdata = netdev_priv(ndev);
-+
-+	pdata->pdev = pdev;
-+	pdata->ndev = ndev;
-+	SET_NETDEV_DEV(ndev, dev);
-+	platform_set_drvdata(pdev, pdata);
-+	ndev->netdev_ops = &xgene_ndev_ops;
-+	xgene_enet_set_ethtool_ops(ndev);
-+	ndev->features |= NETIF_F_IP_CSUM |
-+			  NETIF_F_GSO |
-+			  NETIF_F_GRO;
-+
-+	ret = xgene_enet_get_resources(pdata);
-+	if (ret)
-+		goto err;
-+
-+	xgene_enet_reset(pdata);
-+	xgene_gmac_init(pdata, SPEED_1000);
-+
-+	spin_lock_init(&pdata->stats_lock);
-+	ret = register_netdev(ndev);
-+	if (ret) {
-+		netdev_err(ndev, "Failed to register netdev\n");
-+		goto err;
-+	}
-+
-+	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
-+	if (ret) {
-+		netdev_err(ndev, "No usable DMA configuration\n");
-+		goto err;
-+	}
-+
-+	ret = xgene_enet_init_hw(pdata);
-+	if (ret)
-+		goto err;
-+
-+	napi = &pdata->rx_ring->napi;
-+	netif_napi_add(ndev, napi, xgene_enet_napi, NAPI_POLL_WEIGHT);
-+	ret = xgene_enet_mdio_config(pdata);
-+
-+	return ret;
-+err:
-+	free_netdev(ndev);
-+	return ret;
-+}
-+
-+static int xgene_enet_remove(struct platform_device *pdev)
-+{
-+	struct xgene_enet_pdata *pdata;
-+	struct net_device *ndev;
-+
-+	pdata = platform_get_drvdata(pdev);
-+	ndev = pdata->ndev;
-+
-+	xgene_gmac_rx_disable(pdata);
-+	xgene_gmac_tx_disable(pdata);
-+
-+	netif_napi_del(&pdata->rx_ring->napi);
-+	xgene_enet_mdio_remove(pdata);
-+	xgene_enet_delete_desc_rings(pdata);
-+	unregister_netdev(ndev);
-+	xgene_gport_shutdown(pdata);
-+	free_netdev(ndev);
-+
-+	return 0;
-+}
-+
-+static struct of_device_id xgene_enet_match[] = {
-+	{.compatible = "apm,xgene-enet",},
-+	{},
-+};
-+
-+MODULE_DEVICE_TABLE(of, xgene_enet_match);
-+
-+static struct platform_driver xgene_enet_driver = {
-+	.driver = {
-+		   .name = "xgene-enet",
-+		   .owner = THIS_MODULE,
-+		   .of_match_table = xgene_enet_match,
-+		   },
-+	.probe = xgene_enet_probe,
-+	.remove = xgene_enet_remove,
-+};
-+
-+module_platform_driver(xgene_enet_driver);
-+
-+MODULE_DESCRIPTION("APM X-Gene SoC Ethernet driver");
-+MODULE_VERSION(XGENE_DRV_VERSION);
-+MODULE_AUTHOR("Keyur Chudgar <kchudgar@apm.com>");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
-new file mode 100644
-index 0000000..f4f7e4a
---- /dev/null
-+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
-@@ -0,0 +1,107 @@
-+/* Applied Micro X-Gene SoC Ethernet Driver
-+ *
-+ * Copyright (c) 2014, Applied Micro Circuits Corporation
-+ * Authors: Iyappan Subramanian <isubramanian@apm.com>
-+ *	    Ravi Patel <rapatel@apm.com>
-+ *	    Keyur Chudgar <kchudgar@apm.com>
-+ *
-+ * This program is free software; you can redistribute  it and/or modify it
-+ * under  the terms of  the GNU General  Public License as published by the
-+ * Free Software Foundation;  either version 2 of the  License, or (at your
-+ * option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef __XGENE_ENET_MAIN_H__
-+#define __XGENE_ENET_MAIN_H__
-+
-+#include <linux/clk.h>
-+#include <linux/of_platform.h>
-+#include <linux/of_net.h>
-+#include <linux/of_mdio.h>
-+#include <linux/module.h>
-+#include <net/ip.h>
-+#include <linux/prefetch.h>
-+#include <linux/if_vlan.h>
-+#include <linux/phy.h>
-+#include "xgene_enet_hw.h"
-+
-+#define XGENE_DRV_VERSION	"v1.0"
-+#define XGENE_ENET_MAX_MTU	1536
-+#define SKB_BUFFER_SIZE		(XGENE_ENET_MAX_MTU - NET_IP_ALIGN)
-+#define NUM_PKT_BUF	64
-+#define NUM_BUFPOOL	32
-+
-+/* software context of a descriptor ring */
-+struct xgene_enet_desc_ring {
-+	struct net_device *ndev;
-+	u16 id;
-+	u16 num;
-+	u16 head;
-+	u16 tail;
-+	u16 slots;
-+	u16 irq;
-+	u32 size;
-+	u32 state[NUM_RING_CONFIG];
-+	void __iomem *cmd_base;
-+	void __iomem *cmd;
-+	dma_addr_t dma;
-+	u16 dst_ring_num;
-+	u8 nbufpool;
-+	struct sk_buff *(*rx_skb);
-+	struct sk_buff *(*cp_skb);
-+	enum xgene_enet_ring_cfgsize cfgsize;
-+	struct xgene_enet_desc_ring *cp_ring;
-+	struct xgene_enet_desc_ring *buf_pool;
-+	struct napi_struct napi;
-+	union {
-+		void *desc_addr;
-+		struct xgene_enet_raw_desc *raw_desc;
-+		struct xgene_enet_raw_desc16 *raw_desc16;
-+	};
-+};
-+
-+/* ethernet private data */
-+struct xgene_enet_pdata {
-+	struct net_device *ndev;
-+	struct mii_bus *mdio_bus;
-+	struct phy_device *phy_dev;
-+	int phy_speed;
-+	struct clk *clk;
-+	struct platform_device *pdev;
-+	struct xgene_enet_desc_ring *tx_ring;
-+	struct xgene_enet_desc_ring *rx_ring;
-+	char *dev_name;
-+	u32 rx_buff_cnt;
-+	u32 tx_qcnt_hi;
-+	u32 cp_qcnt_hi;
-+	u32 cp_qcnt_low;
-+	u32 rx_irq;
-+	void __iomem *eth_csr_addr;
-+	void __iomem *eth_ring_if_addr;
-+	void __iomem *eth_diag_csr_addr;
-+	void __iomem *mcx_mac_addr;
-+	void __iomem *mcx_stats_addr;
-+	void __iomem *mcx_mac_csr_addr;
-+	void __iomem *base_addr;
-+	void __iomem *ring_csr_addr;
-+	void __iomem *ring_cmd_addr;
-+	u32 phy_addr;
-+	int phy_mode;
-+	u32 speed;
-+	u16 rm;
-+	struct rtnl_link_stats64 stats;
-+	/* statistics lock */
-+	spinlock_t stats_lock;
-+};
-+
-+void xgene_enet_set_ethtool_ops(struct net_device *netdev);
-+
-+#endif /* __XGENE_ENET_MAIN_H__ */
 diff --git a/drivers/of/address.c b/drivers/of/address.c
-index 5edfcb0..cbbaed2 100644
+index e371825..5eaadae 100644
 --- a/drivers/of/address.c
 +++ b/drivers/of/address.c
 @@ -5,6 +5,7 @@
@@ -7253,7 +901,7 @@ index 5edfcb0..cbbaed2 100644
  }
  
  static int __of_address_to_resource(struct device_node *dev,
-@@ -811,3 +872,50 @@ bool of_dma_is_coherent(struct device_node *np)
+@@ -847,3 +908,50 @@ bool of_dma_is_coherent(struct device_node *np)
  	return false;
  }
  EXPORT_SYMBOL_GPL(of_dma_is_coherent);
@@ -7497,12 +1145,12 @@ index 0e5f3c9..54ceafd 100644
 +	return 0;
 +}
 diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
-index 21df477..3b988a2 100644
+index 2d8a4d0..e17a28e 100644
 --- a/drivers/pci/host/Kconfig
 +++ b/drivers/pci/host/Kconfig
-@@ -46,4 +46,14 @@ config PCI_HOST_GENERIC
- 	  Say Y here if you want to support a simple generic PCI host
- 	  controller, such as the one emulated by kvmtool.
+@@ -54,4 +54,14 @@ config PCIE_SPEAR13XX
+ 	help
+ 	  Say Y here if you want PCIe support on SPEAr13XX SoCs.
  
 +config PCI_XGENE
 +	bool "X-Gene PCIe controller"
@@ -7516,13 +1164,13 @@ index 21df477..3b988a2 100644
 +
  endmenu
 diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile
-index 611ba4b..0801606 100644
+index 0daec79..7600482 100644
 --- a/drivers/pci/host/Makefile
 +++ b/drivers/pci/host/Makefile
-@@ -6,3 +6,4 @@ obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o
- obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o
+@@ -7,3 +7,4 @@ obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o
  obj-$(CONFIG_PCI_RCAR_GEN2_PCIE) += pcie-rcar.o
  obj-$(CONFIG_PCI_HOST_GENERIC) += pci-host-generic.o
+ obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o
 +obj-$(CONFIG_PCI_XGENE) += pci-xgene.o
 diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
 new file mode 100644
@@ -8256,7 +1904,7 @@ index 0000000..7bf4ac7
 +MODULE_DESCRIPTION("APM X-Gene PCIe driver");
 +MODULE_LICENSE("GPL v2");
 diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
-index 1c8592b..b81dc68 100644
+index 2c9ac70..7bae0f9 100644
 --- a/drivers/pci/pci.c
 +++ b/drivers/pci/pci.c
 @@ -17,6 +17,7 @@
@@ -8449,71 +2097,6 @@ index e3cf8a2..abf5e82 100644
  }
  
  int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max)
-diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
-index 0754f5c..4478a59 100644
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -789,7 +789,7 @@ config RTC_DRV_DA9063
- 
- config RTC_DRV_EFI
- 	tristate "EFI RTC"
--	depends on IA64
-+	depends on EFI
- 	help
- 	  If you say yes here you will get support for the EFI
- 	  Real Time Clock.
-diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
-index 70347d0..f1dfc36 100644
---- a/drivers/rtc/Makefile
-+++ b/drivers/rtc/Makefile
-@@ -10,6 +10,10 @@ obj-$(CONFIG_RTC_SYSTOHC)	+= systohc.o
- obj-$(CONFIG_RTC_CLASS)		+= rtc-core.o
- rtc-core-y			:= class.o interface.o
- 
-+ifdef CONFIG_RTC_DRV_EFI
-+rtc-core-y			+= rtc-efi-platform.o
-+endif
-+
- rtc-core-$(CONFIG_RTC_INTF_DEV)	+= rtc-dev.o
- rtc-core-$(CONFIG_RTC_INTF_PROC) += rtc-proc.o
- rtc-core-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o
-diff --git a/drivers/rtc/rtc-efi-platform.c b/drivers/rtc/rtc-efi-platform.c
-new file mode 100644
-index 0000000..b40fbe3
---- /dev/null
-+++ b/drivers/rtc/rtc-efi-platform.c
-@@ -0,0 +1,31 @@
-+/*
-+ * Moved from arch/ia64/kernel/time.c
-+ *
-+ * Copyright (C) 1998-2003 Hewlett-Packard Co
-+ *	Stephane Eranian <eranian@hpl.hp.com>
-+ *	David Mosberger <davidm@hpl.hp.com>
-+ * Copyright (C) 1999 Don Dugger <don.dugger@intel.com>
-+ * Copyright (C) 1999-2000 VA Linux Systems
-+ * Copyright (C) 1999-2000 Walt Drummond <drummond@valinux.com>
-+ */
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/efi.h>
-+#include <linux/platform_device.h>
-+
-+static struct platform_device rtc_efi_dev = {
-+	.name = "rtc-efi",
-+	.id = -1,
-+};
-+
-+static int __init rtc_init(void)
-+{
-+	if (efi_enabled(EFI_RUNTIME_SERVICES))
-+		if (platform_device_register(&rtc_efi_dev) < 0)
-+			pr_err("unable to register rtc device...\n");
-+
-+	/* not necessarily an error */
-+	return 0;
-+}
-+module_init(rtc_init);
 diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
 index 975e1cc..2e2161b 100644
 --- a/include/asm-generic/io.h
@@ -8527,425 +2110,8 @@ index 975e1cc..2e2161b 100644
  }
  
  static inline void ioport_unmap(void __iomem *p)
-diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
-index f27000f..35b0c12 100644
---- a/include/kvm/arm_vgic.h
-+++ b/include/kvm/arm_vgic.h
-@@ -24,7 +24,6 @@
- #include <linux/irqreturn.h>
- #include <linux/spinlock.h>
- #include <linux/types.h>
--#include <linux/irqchip/arm-gic.h>
- 
- #define VGIC_NR_IRQS		256
- #define VGIC_NR_SGIS		16
-@@ -32,7 +31,9 @@
- #define VGIC_NR_PRIVATE_IRQS	(VGIC_NR_SGIS + VGIC_NR_PPIS)
- #define VGIC_NR_SHARED_IRQS	(VGIC_NR_IRQS - VGIC_NR_PRIVATE_IRQS)
- #define VGIC_MAX_CPUS		KVM_MAX_VCPUS
--#define VGIC_MAX_LRS		(1 << 6)
-+
-+#define VGIC_V2_MAX_LRS		(1 << 6)
-+#define VGIC_V3_MAX_LRS		16
- 
- /* Sanity checks... */
- #if (VGIC_MAX_CPUS > 8)
-@@ -68,9 +69,62 @@ struct vgic_bytemap {
- 	u32 shared[VGIC_NR_SHARED_IRQS  / 4];
- };
- 
-+struct kvm_vcpu;
-+
-+enum vgic_type {
-+	VGIC_V2,		/* Good ol' GICv2 */
-+	VGIC_V3,		/* New fancy GICv3 */
-+};
-+
-+#define LR_STATE_PENDING	(1 << 0)
-+#define LR_STATE_ACTIVE		(1 << 1)
-+#define LR_STATE_MASK		(3 << 0)
-+#define LR_EOI_INT		(1 << 2)
-+
-+struct vgic_lr {
-+	u16	irq;
-+	u8	source;
-+	u8	state;
-+};
-+
-+struct vgic_vmcr {
-+	u32	ctlr;
-+	u32	abpr;
-+	u32	bpr;
-+	u32	pmr;
-+};
-+
-+struct vgic_ops {
-+	struct vgic_lr	(*get_lr)(const struct kvm_vcpu *, int);
-+	void	(*set_lr)(struct kvm_vcpu *, int, struct vgic_lr);
-+	void	(*sync_lr_elrsr)(struct kvm_vcpu *, int, struct vgic_lr);
-+	u64	(*get_elrsr)(const struct kvm_vcpu *vcpu);
-+	u64	(*get_eisr)(const struct kvm_vcpu *vcpu);
-+	u32	(*get_interrupt_status)(const struct kvm_vcpu *vcpu);
-+	void	(*enable_underflow)(struct kvm_vcpu *vcpu);
-+	void	(*disable_underflow)(struct kvm_vcpu *vcpu);
-+	void	(*get_vmcr)(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
-+	void	(*set_vmcr)(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
-+	void	(*enable)(struct kvm_vcpu *vcpu);
-+};
-+
-+struct vgic_params {
-+	/* vgic type */
-+	enum vgic_type	type;
-+	/* Physical address of vgic virtual cpu interface */
-+	phys_addr_t	vcpu_base;
-+	/* Number of list registers */
-+	u32		nr_lr;
-+	/* Interrupt number */
-+	unsigned int	maint_irq;
-+	/* Virtual control interface base address */
-+	void __iomem	*vctrl_base;
-+};
-+
- struct vgic_dist {
- #ifdef CONFIG_KVM_ARM_VGIC
- 	spinlock_t		lock;
-+	bool			in_kernel;
- 	bool			ready;
- 
- 	/* Virtual control interface mapping */
-@@ -110,6 +164,29 @@ struct vgic_dist {
- #endif
- };
- 
-+struct vgic_v2_cpu_if {
-+	u32		vgic_hcr;
-+	u32		vgic_vmcr;
-+	u32		vgic_misr;	/* Saved only */
-+	u32		vgic_eisr[2];	/* Saved only */
-+	u32		vgic_elrsr[2];	/* Saved only */
-+	u32		vgic_apr;
-+	u32		vgic_lr[VGIC_V2_MAX_LRS];
-+};
-+
-+struct vgic_v3_cpu_if {
-+#ifdef CONFIG_ARM_GIC_V3
-+	u32		vgic_hcr;
-+	u32		vgic_vmcr;
-+	u32		vgic_misr;	/* Saved only */
-+	u32		vgic_eisr;	/* Saved only */
-+	u32		vgic_elrsr;	/* Saved only */
-+	u32		vgic_ap0r[4];
-+	u32		vgic_ap1r[4];
-+	u64		vgic_lr[VGIC_V3_MAX_LRS];
-+#endif
-+};
-+
- struct vgic_cpu {
- #ifdef CONFIG_KVM_ARM_VGIC
- 	/* per IRQ to LR mapping */
-@@ -120,24 +197,24 @@ struct vgic_cpu {
- 	DECLARE_BITMAP(	pending_shared, VGIC_NR_SHARED_IRQS);
- 
- 	/* Bitmap of used/free list registers */
--	DECLARE_BITMAP(	lr_used, VGIC_MAX_LRS);
-+	DECLARE_BITMAP(	lr_used, VGIC_V2_MAX_LRS);
- 
- 	/* Number of list registers on this CPU */
- 	int		nr_lr;
- 
- 	/* CPU vif control registers for world switch */
--	u32		vgic_hcr;
--	u32		vgic_vmcr;
--	u32		vgic_misr;	/* Saved only */
--	u32		vgic_eisr[2];	/* Saved only */
--	u32		vgic_elrsr[2];	/* Saved only */
--	u32		vgic_apr;
--	u32		vgic_lr[VGIC_MAX_LRS];
-+	union {
-+		struct vgic_v2_cpu_if	vgic_v2;
-+		struct vgic_v3_cpu_if	vgic_v3;
-+	};
- #endif
- };
- 
- #define LR_EMPTY	0xff
- 
-+#define INT_STATUS_EOI		(1 << 0)
-+#define INT_STATUS_UNDERFLOW	(1 << 1)
-+
- struct kvm;
- struct kvm_vcpu;
- struct kvm_run;
-@@ -157,9 +234,25 @@ int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu);
- bool vgic_handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *run,
- 		      struct kvm_exit_mmio *mmio);
- 
--#define irqchip_in_kernel(k)	(!!((k)->arch.vgic.vctrl_base))
-+#define irqchip_in_kernel(k)	(!!((k)->arch.vgic.in_kernel))
- #define vgic_initialized(k)	((k)->arch.vgic.ready)
- 
-+int vgic_v2_probe(struct device_node *vgic_node,
-+		  const struct vgic_ops **ops,
-+		  const struct vgic_params **params);
-+#ifdef CONFIG_ARM_GIC_V3
-+int vgic_v3_probe(struct device_node *vgic_node,
-+		  const struct vgic_ops **ops,
-+		  const struct vgic_params **params);
-+#else
-+static inline int vgic_v3_probe(struct device_node *vgic_node,
-+				const struct vgic_ops **ops,
-+				const struct vgic_params **params)
-+{
-+	return -ENODEV;
-+}
-+#endif
-+
- #else
- static inline int kvm_vgic_hyp_init(void)
- {
-diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 41bbf8b..b3fac7c 100644
---- a/include/linux/efi.h
-+++ b/include/linux/efi.h
-@@ -20,6 +20,7 @@
- #include <linux/ioport.h>
- #include <linux/pfn.h>
- #include <linux/pstore.h>
-+#include <linux/reboot.h>
- 
- #include <asm/page.h>
- 
-@@ -875,6 +876,9 @@ extern void efi_reserve_boot_services(void);
- extern int efi_get_fdt_params(struct efi_fdt_params *params, int verbose);
- extern struct efi_memory_map memmap;
- 
-+extern int efi_reboot_quirk_mode;
-+extern bool efi_poweroff_required(void);
-+
- /* Iterate through an efi_memory_map */
- #define for_each_efi_memory_desc(m, md)					   \
- 	for ((md) = (m)->map;						   \
-@@ -926,11 +930,14 @@ static inline bool efi_enabled(int feature)
- {
- 	return test_bit(feature, &efi.flags) != 0;
- }
-+extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
- #else
- static inline bool efi_enabled(int feature)
- {
- 	return false;
- }
-+static inline void
-+efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {}
- #endif
- 
- /*
-diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h
-new file mode 100644
-index 0000000..30cb755
---- /dev/null
-+++ b/include/linux/irqchip/arm-gic-v3.h
-@@ -0,0 +1,198 @@
-+/*
-+ * Copyright (C) 2013, 2014 ARM Limited, All Rights Reserved.
-+ * Author: Marc Zyngier <marc.zyngier@arm.com>
-+ *
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+#ifndef __LINUX_IRQCHIP_ARM_GIC_V3_H
-+#define __LINUX_IRQCHIP_ARM_GIC_V3_H
-+
-+/*
-+ * Distributor registers. We assume we're running non-secure, with ARE
-+ * being set. Secure-only and non-ARE registers are not described.
-+ */
-+#define GICD_CTLR			0x0000
-+#define GICD_TYPER			0x0004
-+#define GICD_IIDR			0x0008
-+#define GICD_STATUSR			0x0010
-+#define GICD_SETSPI_NSR			0x0040
-+#define GICD_CLRSPI_NSR			0x0048
-+#define GICD_SETSPI_SR			0x0050
-+#define GICD_CLRSPI_SR			0x0058
-+#define GICD_SEIR			0x0068
-+#define GICD_ISENABLER			0x0100
-+#define GICD_ICENABLER			0x0180
-+#define GICD_ISPENDR			0x0200
-+#define GICD_ICPENDR			0x0280
-+#define GICD_ISACTIVER			0x0300
-+#define GICD_ICACTIVER			0x0380
-+#define GICD_IPRIORITYR			0x0400
-+#define GICD_ICFGR			0x0C00
-+#define GICD_IROUTER			0x6000
-+#define GICD_PIDR2			0xFFE8
-+
-+#define GICD_CTLR_RWP			(1U << 31)
-+#define GICD_CTLR_ARE_NS		(1U << 4)
-+#define GICD_CTLR_ENABLE_G1A		(1U << 1)
-+#define GICD_CTLR_ENABLE_G1		(1U << 0)
-+
-+#define GICD_IROUTER_SPI_MODE_ONE	(0U << 31)
-+#define GICD_IROUTER_SPI_MODE_ANY	(1U << 31)
-+
-+#define GIC_PIDR2_ARCH_MASK		0xf0
-+#define GIC_PIDR2_ARCH_GICv3		0x30
-+#define GIC_PIDR2_ARCH_GICv4		0x40
-+
-+/*
-+ * Re-Distributor registers, offsets from RD_base
-+ */
-+#define GICR_CTLR			GICD_CTLR
-+#define GICR_IIDR			0x0004
-+#define GICR_TYPER			0x0008
-+#define GICR_STATUSR			GICD_STATUSR
-+#define GICR_WAKER			0x0014
-+#define GICR_SETLPIR			0x0040
-+#define GICR_CLRLPIR			0x0048
-+#define GICR_SEIR			GICD_SEIR
-+#define GICR_PROPBASER			0x0070
-+#define GICR_PENDBASER			0x0078
-+#define GICR_INVLPIR			0x00A0
-+#define GICR_INVALLR			0x00B0
-+#define GICR_SYNCR			0x00C0
-+#define GICR_MOVLPIR			0x0100
-+#define GICR_MOVALLR			0x0110
-+#define GICR_PIDR2			GICD_PIDR2
-+
-+#define GICR_WAKER_ProcessorSleep	(1U << 1)
-+#define GICR_WAKER_ChildrenAsleep	(1U << 2)
-+
-+/*
-+ * Re-Distributor registers, offsets from SGI_base
-+ */
-+#define GICR_ISENABLER0			GICD_ISENABLER
-+#define GICR_ICENABLER0			GICD_ICENABLER
-+#define GICR_ISPENDR0			GICD_ISPENDR
-+#define GICR_ICPENDR0			GICD_ICPENDR
-+#define GICR_ISACTIVER0			GICD_ISACTIVER
-+#define GICR_ICACTIVER0			GICD_ICACTIVER
-+#define GICR_IPRIORITYR0		GICD_IPRIORITYR
-+#define GICR_ICFGR0			GICD_ICFGR
-+
-+#define GICR_TYPER_VLPIS		(1U << 1)
-+#define GICR_TYPER_LAST			(1U << 4)
-+
-+/*
-+ * CPU interface registers
-+ */
-+#define ICC_CTLR_EL1_EOImode_drop_dir	(0U << 1)
-+#define ICC_CTLR_EL1_EOImode_drop	(1U << 1)
-+#define ICC_SRE_EL1_SRE			(1U << 0)
-+
-+/*
-+ * Hypervisor interface registers (SRE only)
-+ */
-+#define ICH_LR_VIRTUAL_ID_MASK		((1UL << 32) - 1)
-+
-+#define ICH_LR_EOI			(1UL << 41)
-+#define ICH_LR_GROUP			(1UL << 60)
-+#define ICH_LR_STATE			(3UL << 62)
-+#define ICH_LR_PENDING_BIT		(1UL << 62)
-+#define ICH_LR_ACTIVE_BIT		(1UL << 63)
-+
-+#define ICH_MISR_EOI			(1 << 0)
-+#define ICH_MISR_U			(1 << 1)
-+
-+#define ICH_HCR_EN			(1 << 0)
-+#define ICH_HCR_UIE			(1 << 1)
-+
-+#define ICH_VMCR_CTLR_SHIFT		0
-+#define ICH_VMCR_CTLR_MASK		(0x21f << ICH_VMCR_CTLR_SHIFT)
-+#define ICH_VMCR_BPR1_SHIFT		18
-+#define ICH_VMCR_BPR1_MASK		(7 << ICH_VMCR_BPR1_SHIFT)
-+#define ICH_VMCR_BPR0_SHIFT		21
-+#define ICH_VMCR_BPR0_MASK		(7 << ICH_VMCR_BPR0_SHIFT)
-+#define ICH_VMCR_PMR_SHIFT		24
-+#define ICH_VMCR_PMR_MASK		(0xffUL << ICH_VMCR_PMR_SHIFT)
-+
-+#define ICC_EOIR1_EL1			S3_0_C12_C12_1
-+#define ICC_IAR1_EL1			S3_0_C12_C12_0
-+#define ICC_SGI1R_EL1			S3_0_C12_C11_5
-+#define ICC_PMR_EL1			S3_0_C4_C6_0
-+#define ICC_CTLR_EL1			S3_0_C12_C12_4
-+#define ICC_SRE_EL1			S3_0_C12_C12_5
-+#define ICC_GRPEN1_EL1			S3_0_C12_C12_7
-+
-+#define ICC_IAR1_EL1_SPURIOUS		0x3ff
-+
-+#define ICC_SRE_EL2			S3_4_C12_C9_5
-+
-+#define ICC_SRE_EL2_SRE			(1 << 0)
-+#define ICC_SRE_EL2_ENABLE		(1 << 3)
-+
-+/*
-+ * System register definitions
-+ */
-+#define ICH_VSEIR_EL2			S3_4_C12_C9_4
-+#define ICH_HCR_EL2			S3_4_C12_C11_0
-+#define ICH_VTR_EL2			S3_4_C12_C11_1
-+#define ICH_MISR_EL2			S3_4_C12_C11_2
-+#define ICH_EISR_EL2			S3_4_C12_C11_3
-+#define ICH_ELSR_EL2			S3_4_C12_C11_5
-+#define ICH_VMCR_EL2			S3_4_C12_C11_7
-+
-+#define __LR0_EL2(x)			S3_4_C12_C12_ ## x
-+#define __LR8_EL2(x)			S3_4_C12_C13_ ## x
-+
-+#define ICH_LR0_EL2			__LR0_EL2(0)
-+#define ICH_LR1_EL2			__LR0_EL2(1)
-+#define ICH_LR2_EL2			__LR0_EL2(2)
-+#define ICH_LR3_EL2			__LR0_EL2(3)
-+#define ICH_LR4_EL2			__LR0_EL2(4)
-+#define ICH_LR5_EL2			__LR0_EL2(5)
-+#define ICH_LR6_EL2			__LR0_EL2(6)
-+#define ICH_LR7_EL2			__LR0_EL2(7)
-+#define ICH_LR8_EL2			__LR8_EL2(0)
-+#define ICH_LR9_EL2			__LR8_EL2(1)
-+#define ICH_LR10_EL2			__LR8_EL2(2)
-+#define ICH_LR11_EL2			__LR8_EL2(3)
-+#define ICH_LR12_EL2			__LR8_EL2(4)
-+#define ICH_LR13_EL2			__LR8_EL2(5)
-+#define ICH_LR14_EL2			__LR8_EL2(6)
-+#define ICH_LR15_EL2			__LR8_EL2(7)
-+
-+#define __AP0Rx_EL2(x)			S3_4_C12_C8_ ## x
-+#define ICH_AP0R0_EL2			__AP0Rx_EL2(0)
-+#define ICH_AP0R1_EL2			__AP0Rx_EL2(1)
-+#define ICH_AP0R2_EL2			__AP0Rx_EL2(2)
-+#define ICH_AP0R3_EL2			__AP0Rx_EL2(3)
-+
-+#define __AP1Rx_EL2(x)			S3_4_C12_C9_ ## x
-+#define ICH_AP1R0_EL2			__AP1Rx_EL2(0)
-+#define ICH_AP1R1_EL2			__AP1Rx_EL2(1)
-+#define ICH_AP1R2_EL2			__AP1Rx_EL2(2)
-+#define ICH_AP1R3_EL2			__AP1Rx_EL2(3)
-+
-+#ifndef __ASSEMBLY__
-+
-+#include <linux/stringify.h>
-+
-+static inline void gic_write_eoir(u64 irq)
-+{
-+	asm volatile("msr " __stringify(ICC_EOIR1_EL1) ", %0" : : "r" (irq));
-+	isb();
-+}
-+
-+#endif
-+
-+#endif
 diff --git a/include/linux/of_address.h b/include/linux/of_address.h
-index c13b878..33c0420 100644
+index fb7b722..cb9479e4 100644
 --- a/include/linux/of_address.h
 +++ b/include/linux/of_address.h
 @@ -23,17 +23,8 @@ struct of_pci_range {
@@ -9005,7 +2171,7 @@ index dde3a4a..71e36d0 100644
  
  #if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI)
 diff --git a/include/linux/pci.h b/include/linux/pci.h
-index 466bcd1..65fb1fc 100644
+index 61978a4..f582746 100644
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
 @@ -401,6 +401,8 @@ struct pci_host_bridge_window {
@@ -9027,7 +2193,7 @@ index 466bcd1..65fb1fc 100644
  int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int busmax);
  int pci_bus_update_busn_res_end(struct pci_bus *b, int busmax);
  void pci_bus_release_busn_res(struct pci_bus *b);
-@@ -1095,6 +1100,9 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus,
+@@ -1097,6 +1102,9 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus,
  						  resource_size_t),
  			void *alignf_data);
  
@@ -9037,7 +2203,7 @@ index 466bcd1..65fb1fc 100644
  static inline dma_addr_t pci_bus_address(struct pci_dev *pdev, int bar)
  {
  	struct pci_bus_region region;
-@@ -1805,8 +1813,15 @@ static inline void pci_set_of_node(struct pci_dev *dev) { }
+@@ -1815,8 +1823,15 @@ static inline void pci_set_of_node(struct pci_dev *dev) { }
  static inline void pci_release_of_node(struct pci_dev *dev) { }
  static inline void pci_set_bus_of_node(struct pci_bus *bus) { }
  static inline void pci_release_bus_of_node(struct pci_bus *bus) { }
@@ -9066,1114 +2232,3 @@ index e9441b9..1d3f39c 100644
  #define PERF_REG_IP	PERF_REG_ARM64_PC
  #define PERF_REG_SP	PERF_REG_ARM64_SP
  
-diff --git a/virt/kvm/arm/vgic-v2.c b/virt/kvm/arm/vgic-v2.c
-new file mode 100644
-index 0000000..ff597d8
---- /dev/null
-+++ b/virt/kvm/arm/vgic-v2.c
-@@ -0,0 +1,259 @@
-+/*
-+ * Copyright (C) 2012,2013 ARM Limited, All Rights Reserved.
-+ * Author: Marc Zyngier <marc.zyngier@arm.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/cpu.h>
-+#include <linux/kvm.h>
-+#include <linux/kvm_host.h>
-+#include <linux/interrupt.h>
-+#include <linux/io.h>
-+#include <linux/of.h>
-+#include <linux/of_address.h>
-+#include <linux/of_irq.h>
-+
-+#include <linux/irqchip/arm-gic.h>
-+
-+#include <asm/kvm_emulate.h>
-+#include <asm/kvm_arm.h>
-+#include <asm/kvm_mmu.h>
-+
-+static struct vgic_lr vgic_v2_get_lr(const struct kvm_vcpu *vcpu, int lr)
-+{
-+	struct vgic_lr lr_desc;
-+	u32 val = vcpu->arch.vgic_cpu.vgic_v2.vgic_lr[lr];
-+
-+	lr_desc.irq	= val & GICH_LR_VIRTUALID;
-+	if (lr_desc.irq <= 15)
-+		lr_desc.source	= (val >> GICH_LR_PHYSID_CPUID_SHIFT) & 0x7;
-+	else
-+		lr_desc.source = 0;
-+	lr_desc.state	= 0;
-+
-+	if (val & GICH_LR_PENDING_BIT)
-+		lr_desc.state |= LR_STATE_PENDING;
-+	if (val & GICH_LR_ACTIVE_BIT)
-+		lr_desc.state |= LR_STATE_ACTIVE;
-+	if (val & GICH_LR_EOI)
-+		lr_desc.state |= LR_EOI_INT;
-+
-+	return lr_desc;
-+}
-+
-+static void vgic_v2_set_lr(struct kvm_vcpu *vcpu, int lr,
-+			   struct vgic_lr lr_desc)
-+{
-+	u32 lr_val = (lr_desc.source << GICH_LR_PHYSID_CPUID_SHIFT) | lr_desc.irq;
-+
-+	if (lr_desc.state & LR_STATE_PENDING)
-+		lr_val |= GICH_LR_PENDING_BIT;
-+	if (lr_desc.state & LR_STATE_ACTIVE)
-+		lr_val |= GICH_LR_ACTIVE_BIT;
-+	if (lr_desc.state & LR_EOI_INT)
-+		lr_val |= GICH_LR_EOI;
-+
-+	vcpu->arch.vgic_cpu.vgic_v2.vgic_lr[lr] = lr_val;
-+}
-+
-+static void vgic_v2_sync_lr_elrsr(struct kvm_vcpu *vcpu, int lr,
-+				  struct vgic_lr lr_desc)
-+{
-+	if (!(lr_desc.state & LR_STATE_MASK))
-+		set_bit(lr, (unsigned long *)vcpu->arch.vgic_cpu.vgic_v2.vgic_elrsr);
-+}
-+
-+static u64 vgic_v2_get_elrsr(const struct kvm_vcpu *vcpu)
-+{
-+	u64 val;
-+
-+	val  = vcpu->arch.vgic_cpu.vgic_v2.vgic_elrsr[1];
-+	val <<= 32;
-+	val |= vcpu->arch.vgic_cpu.vgic_v2.vgic_elrsr[0];
-+
-+	return val;
-+}
-+
-+static u64 vgic_v2_get_eisr(const struct kvm_vcpu *vcpu)
-+{
-+	u64 val;
-+
-+	val  = vcpu->arch.vgic_cpu.vgic_v2.vgic_eisr[1];
-+	val <<= 32;
-+	val |= vcpu->arch.vgic_cpu.vgic_v2.vgic_eisr[0];
-+
-+	return val;
-+}
-+
-+static u32 vgic_v2_get_interrupt_status(const struct kvm_vcpu *vcpu)
-+{
-+	u32 misr = vcpu->arch.vgic_cpu.vgic_v2.vgic_misr;
-+	u32 ret = 0;
-+
-+	if (misr & GICH_MISR_EOI)
-+		ret |= INT_STATUS_EOI;
-+	if (misr & GICH_MISR_U)
-+		ret |= INT_STATUS_UNDERFLOW;
-+
-+	return ret;
-+}
-+
-+static void vgic_v2_enable_underflow(struct kvm_vcpu *vcpu)
-+{
-+	vcpu->arch.vgic_cpu.vgic_v2.vgic_hcr |= GICH_HCR_UIE;
-+}
-+
-+static void vgic_v2_disable_underflow(struct kvm_vcpu *vcpu)
-+{
-+	vcpu->arch.vgic_cpu.vgic_v2.vgic_hcr &= ~GICH_HCR_UIE;
-+}
-+
-+static void vgic_v2_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcrp)
-+{
-+	u32 vmcr = vcpu->arch.vgic_cpu.vgic_v2.vgic_vmcr;
-+
-+	vmcrp->ctlr = (vmcr & GICH_VMCR_CTRL_MASK) >> GICH_VMCR_CTRL_SHIFT;
-+	vmcrp->abpr = (vmcr & GICH_VMCR_ALIAS_BINPOINT_MASK) >> GICH_VMCR_ALIAS_BINPOINT_SHIFT;
-+	vmcrp->bpr  = (vmcr & GICH_VMCR_BINPOINT_MASK) >> GICH_VMCR_BINPOINT_SHIFT;
-+	vmcrp->pmr  = (vmcr & GICH_VMCR_PRIMASK_MASK) >> GICH_VMCR_PRIMASK_SHIFT;
-+}
-+
-+static void vgic_v2_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcrp)
-+{
-+	u32 vmcr;
-+
-+	vmcr  = (vmcrp->ctlr << GICH_VMCR_CTRL_SHIFT) & GICH_VMCR_CTRL_MASK;
-+	vmcr |= (vmcrp->abpr << GICH_VMCR_ALIAS_BINPOINT_SHIFT) & GICH_VMCR_ALIAS_BINPOINT_MASK;
-+	vmcr |= (vmcrp->bpr << GICH_VMCR_BINPOINT_SHIFT) & GICH_VMCR_BINPOINT_MASK;
-+	vmcr |= (vmcrp->pmr << GICH_VMCR_PRIMASK_SHIFT) & GICH_VMCR_PRIMASK_MASK;
-+
-+	vcpu->arch.vgic_cpu.vgic_v2.vgic_vmcr = vmcr;
-+}
-+
-+static void vgic_v2_enable(struct kvm_vcpu *vcpu)
-+{
-+	/*
-+	 * By forcing VMCR to zero, the GIC will restore the binary
-+	 * points to their reset values. Anything else resets to zero
-+	 * anyway.
-+	 */
-+	vcpu->arch.vgic_cpu.vgic_v2.vgic_vmcr = 0;
-+
-+	/* Get the show on the road... */
-+	vcpu->arch.vgic_cpu.vgic_v2.vgic_hcr = GICH_HCR_EN;
-+}
-+
-+static const struct vgic_ops vgic_v2_ops = {
-+	.get_lr			= vgic_v2_get_lr,
-+	.set_lr			= vgic_v2_set_lr,
-+	.sync_lr_elrsr		= vgic_v2_sync_lr_elrsr,
-+	.get_elrsr		= vgic_v2_get_elrsr,
-+	.get_eisr		= vgic_v2_get_eisr,
-+	.get_interrupt_status	= vgic_v2_get_interrupt_status,
-+	.enable_underflow	= vgic_v2_enable_underflow,
-+	.disable_underflow	= vgic_v2_disable_underflow,
-+	.get_vmcr		= vgic_v2_get_vmcr,
-+	.set_vmcr		= vgic_v2_set_vmcr,
-+	.enable			= vgic_v2_enable,
-+};
-+
-+static struct vgic_params vgic_v2_params;
-+
-+/**
-+ * vgic_v2_probe - probe for a GICv2 compatible interrupt controller in DT
-+ * @node:	pointer to the DT node
-+ * @ops: 	address of a pointer to the GICv2 operations
-+ * @params:	address of a pointer to HW-specific parameters
-+ *
-+ * Returns 0 if a GICv2 has been found, with the low level operations
-+ * in *ops and the HW parameters in *params. Returns an error code
-+ * otherwise.
-+ */
-+int vgic_v2_probe(struct device_node *vgic_node,
-+		  const struct vgic_ops **ops,
-+		  const struct vgic_params **params)
-+{
-+	int ret;
-+	struct resource vctrl_res;
-+	struct resource vcpu_res;
-+	struct vgic_params *vgic = &vgic_v2_params;
-+
-+	vgic->maint_irq = irq_of_parse_and_map(vgic_node, 0);
-+	if (!vgic->maint_irq) {
-+		kvm_err("error getting vgic maintenance irq from DT\n");
-+		ret = -ENXIO;
-+		goto out;
-+	}
-+
-+	ret = of_address_to_resource(vgic_node, 2, &vctrl_res);
-+	if (ret) {
-+		kvm_err("Cannot obtain GICH resource\n");
-+		goto out;
-+	}
-+
-+	vgic->vctrl_base = of_iomap(vgic_node, 2);
-+	if (!vgic->vctrl_base) {
-+		kvm_err("Cannot ioremap GICH\n");
-+		ret = -ENOMEM;
-+		goto out;
-+	}
-+
-+	vgic->nr_lr = readl_relaxed(vgic->vctrl_base + GICH_VTR);
-+	vgic->nr_lr = (vgic->nr_lr & 0x3f) + 1;
-+
-+	ret = create_hyp_io_mappings(vgic->vctrl_base,
-+				     vgic->vctrl_base + resource_size(&vctrl_res),
-+				     vctrl_res.start);
-+	if (ret) {
-+		kvm_err("Cannot map VCTRL into hyp\n");
-+		goto out_unmap;
-+	}
-+
-+	if (of_address_to_resource(vgic_node, 3, &vcpu_res)) {
-+		kvm_err("Cannot obtain GICV resource\n");
-+		ret = -ENXIO;
-+		goto out_unmap;
-+	}
-+
-+	if (!PAGE_ALIGNED(vcpu_res.start)) {
-+		kvm_err("GICV physical address 0x%llx not page aligned\n",
-+			(unsigned long long)vcpu_res.start);
-+		ret = -ENXIO;
-+		goto out_unmap;
-+	}
-+
-+	if (!PAGE_ALIGNED(resource_size(&vcpu_res))) {
-+		kvm_err("GICV size 0x%llx not a multiple of page size 0x%lx\n",
-+			(unsigned long long)resource_size(&vcpu_res),
-+			PAGE_SIZE);
-+		ret = -ENXIO;
-+		goto out_unmap;
-+	}
-+
-+	vgic->vcpu_base = vcpu_res.start;
-+
-+	kvm_info("%s@%llx IRQ%d\n", vgic_node->name,
-+		 vgic->vctrl_base, vgic->maint_irq);
-+
-+	vgic->type = VGIC_V2;
-+	*ops = &vgic_v2_ops;
-+	*params = vgic;
-+	goto out;
-+
-+out_unmap:
-+	iounmap(vgic->vctrl_base);
-+out:
-+	of_node_put(vgic_node);
-+	return ret;
-+}
-diff --git a/virt/kvm/arm/vgic-v3.c b/virt/kvm/arm/vgic-v3.c
-new file mode 100644
-index 0000000..f01d446
---- /dev/null
-+++ b/virt/kvm/arm/vgic-v3.c
-@@ -0,0 +1,231 @@
-+/*
-+ * Copyright (C) 2013 ARM Limited, All Rights Reserved.
-+ * Author: Marc Zyngier <marc.zyngier@arm.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/cpu.h>
-+#include <linux/kvm.h>
-+#include <linux/kvm_host.h>
-+#include <linux/interrupt.h>
-+#include <linux/io.h>
-+#include <linux/of.h>
-+#include <linux/of_address.h>
-+#include <linux/of_irq.h>
-+
-+#include <linux/irqchip/arm-gic-v3.h>
-+
-+#include <asm/kvm_emulate.h>
-+#include <asm/kvm_arm.h>
-+#include <asm/kvm_mmu.h>
-+
-+/* These are for GICv2 emulation only */
-+#define GICH_LR_VIRTUALID		(0x3ffUL << 0)
-+#define GICH_LR_PHYSID_CPUID_SHIFT	(10)
-+#define GICH_LR_PHYSID_CPUID		(7UL << GICH_LR_PHYSID_CPUID_SHIFT)
-+
-+/*
-+ * LRs are stored in reverse order in memory. make sure we index them
-+ * correctly.
-+ */
-+#define LR_INDEX(lr)			(VGIC_V3_MAX_LRS - 1 - lr)
-+
-+static u32 ich_vtr_el2;
-+
-+static struct vgic_lr vgic_v3_get_lr(const struct kvm_vcpu *vcpu, int lr)
-+{
-+	struct vgic_lr lr_desc;
-+	u64 val = vcpu->arch.vgic_cpu.vgic_v3.vgic_lr[LR_INDEX(lr)];
-+
-+	lr_desc.irq	= val & GICH_LR_VIRTUALID;
-+	if (lr_desc.irq <= 15)
-+		lr_desc.source	= (val >> GICH_LR_PHYSID_CPUID_SHIFT) & 0x7;
-+	else
-+		lr_desc.source = 0;
-+	lr_desc.state	= 0;
-+
-+	if (val & ICH_LR_PENDING_BIT)
-+		lr_desc.state |= LR_STATE_PENDING;
-+	if (val & ICH_LR_ACTIVE_BIT)
-+		lr_desc.state |= LR_STATE_ACTIVE;
-+	if (val & ICH_LR_EOI)
-+		lr_desc.state |= LR_EOI_INT;
-+
-+	return lr_desc;
-+}
-+
-+static void vgic_v3_set_lr(struct kvm_vcpu *vcpu, int lr,
-+			   struct vgic_lr lr_desc)
-+{
-+	u64 lr_val = (((u32)lr_desc.source << GICH_LR_PHYSID_CPUID_SHIFT) |
-+		      lr_desc.irq);
-+
-+	if (lr_desc.state & LR_STATE_PENDING)
-+		lr_val |= ICH_LR_PENDING_BIT;
-+	if (lr_desc.state & LR_STATE_ACTIVE)
-+		lr_val |= ICH_LR_ACTIVE_BIT;
-+	if (lr_desc.state & LR_EOI_INT)
-+		lr_val |= ICH_LR_EOI;
-+
-+	vcpu->arch.vgic_cpu.vgic_v3.vgic_lr[LR_INDEX(lr)] = lr_val;
-+}
-+
-+static void vgic_v3_sync_lr_elrsr(struct kvm_vcpu *vcpu, int lr,
-+				  struct vgic_lr lr_desc)
-+{
-+	if (!(lr_desc.state & LR_STATE_MASK))
-+		vcpu->arch.vgic_cpu.vgic_v3.vgic_elrsr |= (1U << lr);
-+}
-+
-+static u64 vgic_v3_get_elrsr(const struct kvm_vcpu *vcpu)
-+{
-+	return vcpu->arch.vgic_cpu.vgic_v3.vgic_elrsr;
-+}
-+
-+static u64 vgic_v3_get_eisr(const struct kvm_vcpu *vcpu)
-+{
-+	return vcpu->arch.vgic_cpu.vgic_v3.vgic_eisr;
-+}
-+
-+static u32 vgic_v3_get_interrupt_status(const struct kvm_vcpu *vcpu)
-+{
-+	u32 misr = vcpu->arch.vgic_cpu.vgic_v3.vgic_misr;
-+	u32 ret = 0;
-+
-+	if (misr & ICH_MISR_EOI)
-+		ret |= INT_STATUS_EOI;
-+	if (misr & ICH_MISR_U)
-+		ret |= INT_STATUS_UNDERFLOW;
-+
-+	return ret;
-+}
-+
-+static void vgic_v3_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcrp)
-+{
-+	u32 vmcr = vcpu->arch.vgic_cpu.vgic_v3.vgic_vmcr;
-+
-+	vmcrp->ctlr = (vmcr & ICH_VMCR_CTLR_MASK) >> ICH_VMCR_CTLR_SHIFT;
-+	vmcrp->abpr = (vmcr & ICH_VMCR_BPR1_MASK) >> ICH_VMCR_BPR1_SHIFT;
-+	vmcrp->bpr  = (vmcr & ICH_VMCR_BPR0_MASK) >> ICH_VMCR_BPR0_SHIFT;
-+	vmcrp->pmr  = (vmcr & ICH_VMCR_PMR_MASK) >> ICH_VMCR_PMR_SHIFT;
-+}
-+
-+static void vgic_v3_enable_underflow(struct kvm_vcpu *vcpu)
-+{
-+	vcpu->arch.vgic_cpu.vgic_v3.vgic_hcr |= ICH_HCR_UIE;
-+}
-+
-+static void vgic_v3_disable_underflow(struct kvm_vcpu *vcpu)
-+{
-+	vcpu->arch.vgic_cpu.vgic_v3.vgic_hcr &= ~ICH_HCR_UIE;
-+}
-+
-+static void vgic_v3_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcrp)
-+{
-+	u32 vmcr;
-+
-+	vmcr  = (vmcrp->ctlr << ICH_VMCR_CTLR_SHIFT) & ICH_VMCR_CTLR_MASK;
-+	vmcr |= (vmcrp->abpr << ICH_VMCR_BPR1_SHIFT) & ICH_VMCR_BPR1_MASK;
-+	vmcr |= (vmcrp->bpr << ICH_VMCR_BPR0_SHIFT) & ICH_VMCR_BPR0_MASK;
-+	vmcr |= (vmcrp->pmr << ICH_VMCR_PMR_SHIFT) & ICH_VMCR_PMR_MASK;
-+
-+	vcpu->arch.vgic_cpu.vgic_v3.vgic_vmcr = vmcr;
-+}
-+
-+static void vgic_v3_enable(struct kvm_vcpu *vcpu)
-+{
-+	/*
-+	 * By forcing VMCR to zero, the GIC will restore the binary
-+	 * points to their reset values. Anything else resets to zero
-+	 * anyway.
-+	 */
-+	vcpu->arch.vgic_cpu.vgic_v3.vgic_vmcr = 0;
-+
-+	/* Get the show on the road... */
-+	vcpu->arch.vgic_cpu.vgic_v3.vgic_hcr = ICH_HCR_EN;
-+}
-+
-+static const struct vgic_ops vgic_v3_ops = {
-+	.get_lr			= vgic_v3_get_lr,
-+	.set_lr			= vgic_v3_set_lr,
-+	.sync_lr_elrsr		= vgic_v3_sync_lr_elrsr,
-+	.get_elrsr		= vgic_v3_get_elrsr,
-+	.get_eisr		= vgic_v3_get_eisr,
-+	.get_interrupt_status	= vgic_v3_get_interrupt_status,
-+	.enable_underflow	= vgic_v3_enable_underflow,
-+	.disable_underflow	= vgic_v3_disable_underflow,
-+	.get_vmcr		= vgic_v3_get_vmcr,
-+	.set_vmcr		= vgic_v3_set_vmcr,
-+	.enable			= vgic_v3_enable,
-+};
-+
-+static struct vgic_params vgic_v3_params;
-+
-+/**
-+ * vgic_v3_probe - probe for a GICv3 compatible interrupt controller in DT
-+ * @node:	pointer to the DT node
-+ * @ops: 	address of a pointer to the GICv3 operations
-+ * @params:	address of a pointer to HW-specific parameters
-+ *
-+ * Returns 0 if a GICv3 has been found, with the low level operations
-+ * in *ops and the HW parameters in *params. Returns an error code
-+ * otherwise.
-+ */
-+int vgic_v3_probe(struct device_node *vgic_node,
-+		  const struct vgic_ops **ops,
-+		  const struct vgic_params **params)
-+{
-+	int ret = 0;
-+	u32 gicv_idx;
-+	struct resource vcpu_res;
-+	struct vgic_params *vgic = &vgic_v3_params;
-+
-+	vgic->maint_irq = irq_of_parse_and_map(vgic_node, 0);
-+	if (!vgic->maint_irq) {
-+		kvm_err("error getting vgic maintenance irq from DT\n");
-+		ret = -ENXIO;
-+		goto out;
-+	}
-+
-+	ich_vtr_el2 = kvm_call_hyp(__vgic_v3_get_ich_vtr_el2);
-+
-+	/*
-+	 * The ListRegs field is 5 bits, but there is a architectural
-+	 * maximum of 16 list registers. Just ignore bit 4...
-+	 */
-+	vgic->nr_lr = (ich_vtr_el2 & 0xf) + 1;
-+
-+	if (of_property_read_u32(vgic_node, "#redistributor-regions", &gicv_idx))
-+		gicv_idx = 1;
-+
-+	gicv_idx += 3; /* Also skip GICD, GICC, GICH */
-+	if (of_address_to_resource(vgic_node, gicv_idx, &vcpu_res)) {
-+		kvm_err("Cannot obtain GICV region\n");
-+		ret = -ENXIO;
-+		goto out;
-+	}
-+	vgic->vcpu_base = vcpu_res.start;
-+	vgic->vctrl_base = NULL;
-+	vgic->type = VGIC_V3;
-+
-+	kvm_info("%s@%llx IRQ%d\n", vgic_node->name,
-+		 vcpu_res.start, vgic->maint_irq);
-+
-+	*ops = &vgic_v3_ops;
-+	*params = vgic;
-+
-+out:
-+	of_node_put(vgic_node);
-+	return ret;
-+}
-diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
-index 476d3bf..795ab48 100644
---- a/virt/kvm/arm/vgic.c
-+++ b/virt/kvm/arm/vgic.c
-@@ -76,14 +76,6 @@
- #define IMPLEMENTER_ARM		0x43b
- #define GICC_ARCH_VERSION_V2	0x2
- 
--/* Physical address of vgic virtual cpu interface */
--static phys_addr_t vgic_vcpu_base;
--
--/* Virtual control interface base address */
--static void __iomem *vgic_vctrl_base;
--
--static struct device_node *vgic_node;
--
- #define ACCESS_READ_VALUE	(1 << 0)
- #define ACCESS_READ_RAZ		(0 << 0)
- #define ACCESS_READ_MASK(x)	((x) & (1 << 0))
-@@ -94,12 +86,17 @@ static struct device_node *vgic_node;
- #define ACCESS_WRITE_MASK(x)	((x) & (3 << 1))
- 
- static void vgic_retire_disabled_irqs(struct kvm_vcpu *vcpu);
-+static void vgic_retire_lr(int lr_nr, int irq, struct kvm_vcpu *vcpu);
- static void vgic_update_state(struct kvm *kvm);
- static void vgic_kick_vcpus(struct kvm *kvm);
- static void vgic_dispatch_sgi(struct kvm_vcpu *vcpu, u32 reg);
--static u32 vgic_nr_lr;
-+static struct vgic_lr vgic_get_lr(const struct kvm_vcpu *vcpu, int lr);
-+static void vgic_set_lr(struct kvm_vcpu *vcpu, int lr, struct vgic_lr lr_desc);
-+static void vgic_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
-+static void vgic_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
- 
--static unsigned int vgic_maint_irq;
-+static const struct vgic_ops *vgic_ops;
-+static const struct vgic_params *vgic;
- 
- static u32 *vgic_bitmap_get_reg(struct vgic_bitmap *x,
- 				int cpuid, u32 offset)
-@@ -593,18 +590,6 @@ static bool handle_mmio_sgi_reg(struct kvm_vcpu *vcpu,
- 	return false;
- }
- 
--#define LR_CPUID(lr)	\
--	(((lr) & GICH_LR_PHYSID_CPUID) >> GICH_LR_PHYSID_CPUID_SHIFT)
--#define LR_IRQID(lr)	\
--	((lr) & GICH_LR_VIRTUALID)
--
--static void vgic_retire_lr(int lr_nr, int irq, struct vgic_cpu *vgic_cpu)
--{
--	clear_bit(lr_nr, vgic_cpu->lr_used);
--	vgic_cpu->vgic_lr[lr_nr] &= ~GICH_LR_STATE;
--	vgic_cpu->vgic_irq_lr_map[irq] = LR_EMPTY;
--}
--
- /**
-  * vgic_unqueue_irqs - move pending IRQs from LRs to the distributor
-  * @vgic_cpu: Pointer to the vgic_cpu struct holding the LRs
-@@ -622,13 +607,10 @@ static void vgic_unqueue_irqs(struct kvm_vcpu *vcpu)
- 	struct vgic_dist *dist = &vcpu->kvm->arch.vgic;
- 	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
- 	int vcpu_id = vcpu->vcpu_id;
--	int i, irq, source_cpu;
--	u32 *lr;
-+	int i;
- 
- 	for_each_set_bit(i, vgic_cpu->lr_used, vgic_cpu->nr_lr) {
--		lr = &vgic_cpu->vgic_lr[i];
--		irq = LR_IRQID(*lr);
--		source_cpu = LR_CPUID(*lr);
-+		struct vgic_lr lr = vgic_get_lr(vcpu, i);
- 
- 		/*
- 		 * There are three options for the state bits:
-@@ -640,7 +622,7 @@ static void vgic_unqueue_irqs(struct kvm_vcpu *vcpu)
- 		 * If the LR holds only an active interrupt (not pending) then
- 		 * just leave it alone.
- 		 */
--		if ((*lr & GICH_LR_STATE) == GICH_LR_ACTIVE_BIT)
-+		if ((lr.state & LR_STATE_MASK) == LR_STATE_ACTIVE)
- 			continue;
- 
- 		/*
-@@ -649,18 +631,19 @@ static void vgic_unqueue_irqs(struct kvm_vcpu *vcpu)
- 		 * is fine, then we are only setting a few bits that were
- 		 * already set.
- 		 */
--		vgic_dist_irq_set(vcpu, irq);
--		if (irq < VGIC_NR_SGIS)
--			dist->irq_sgi_sources[vcpu_id][irq] |= 1 << source_cpu;
--		*lr &= ~GICH_LR_PENDING_BIT;
-+		vgic_dist_irq_set(vcpu, lr.irq);
-+		if (lr.irq < VGIC_NR_SGIS)
-+			dist->irq_sgi_sources[vcpu_id][lr.irq] |= 1 << lr.source;
-+		lr.state &= ~LR_STATE_PENDING;
-+		vgic_set_lr(vcpu, i, lr);
- 
- 		/*
- 		 * If there's no state left on the LR (it could still be
- 		 * active), then the LR does not hold any useful info and can
- 		 * be marked as free for other use.
- 		 */
--		if (!(*lr & GICH_LR_STATE))
--			vgic_retire_lr(i, irq, vgic_cpu);
-+		if (!(lr.state & LR_STATE_MASK))
-+			vgic_retire_lr(i, lr.irq, vcpu);
- 
- 		/* Finally update the VGIC state. */
- 		vgic_update_state(vcpu->kvm);
-@@ -989,8 +972,73 @@ static void vgic_update_state(struct kvm *kvm)
- 	}
- }
- 
--#define MK_LR_PEND(src, irq)	\
--	(GICH_LR_PENDING_BIT | ((src) << GICH_LR_PHYSID_CPUID_SHIFT) | (irq))
-+static struct vgic_lr vgic_get_lr(const struct kvm_vcpu *vcpu, int lr)
-+{
-+	return vgic_ops->get_lr(vcpu, lr);
-+}
-+
-+static void vgic_set_lr(struct kvm_vcpu *vcpu, int lr,
-+			       struct vgic_lr vlr)
-+{
-+	vgic_ops->set_lr(vcpu, lr, vlr);
-+}
-+
-+static void vgic_sync_lr_elrsr(struct kvm_vcpu *vcpu, int lr,
-+			       struct vgic_lr vlr)
-+{
-+	vgic_ops->sync_lr_elrsr(vcpu, lr, vlr);
-+}
-+
-+static inline u64 vgic_get_elrsr(struct kvm_vcpu *vcpu)
-+{
-+	return vgic_ops->get_elrsr(vcpu);
-+}
-+
-+static inline u64 vgic_get_eisr(struct kvm_vcpu *vcpu)
-+{
-+	return vgic_ops->get_eisr(vcpu);
-+}
-+
-+static inline u32 vgic_get_interrupt_status(struct kvm_vcpu *vcpu)
-+{
-+	return vgic_ops->get_interrupt_status(vcpu);
-+}
-+
-+static inline void vgic_enable_underflow(struct kvm_vcpu *vcpu)
-+{
-+	vgic_ops->enable_underflow(vcpu);
-+}
-+
-+static inline void vgic_disable_underflow(struct kvm_vcpu *vcpu)
-+{
-+	vgic_ops->disable_underflow(vcpu);
-+}
-+
-+static inline void vgic_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr)
-+{
-+	vgic_ops->get_vmcr(vcpu, vmcr);
-+}
-+
-+static void vgic_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr)
-+{
-+	vgic_ops->set_vmcr(vcpu, vmcr);
-+}
-+
-+static inline void vgic_enable(struct kvm_vcpu *vcpu)
-+{
-+	vgic_ops->enable(vcpu);
-+}
-+
-+static void vgic_retire_lr(int lr_nr, int irq, struct kvm_vcpu *vcpu)
-+{
-+	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
-+	struct vgic_lr vlr = vgic_get_lr(vcpu, lr_nr);
-+
-+	vlr.state = 0;
-+	vgic_set_lr(vcpu, lr_nr, vlr);
-+	clear_bit(lr_nr, vgic_cpu->lr_used);
-+	vgic_cpu->vgic_irq_lr_map[irq] = LR_EMPTY;
-+}
- 
- /*
-  * An interrupt may have been disabled after being made pending on the
-@@ -1006,13 +1054,13 @@ static void vgic_retire_disabled_irqs(struct kvm_vcpu *vcpu)
- 	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
- 	int lr;
- 
--	for_each_set_bit(lr, vgic_cpu->lr_used, vgic_cpu->nr_lr) {
--		int irq = vgic_cpu->vgic_lr[lr] & GICH_LR_VIRTUALID;
-+	for_each_set_bit(lr, vgic_cpu->lr_used, vgic->nr_lr) {
-+		struct vgic_lr vlr = vgic_get_lr(vcpu, lr);
- 
--		if (!vgic_irq_is_enabled(vcpu, irq)) {
--			vgic_retire_lr(lr, irq, vgic_cpu);
--			if (vgic_irq_is_active(vcpu, irq))
--				vgic_irq_clear_active(vcpu, irq);
-+		if (!vgic_irq_is_enabled(vcpu, vlr.irq)) {
-+			vgic_retire_lr(lr, vlr.irq, vcpu);
-+			if (vgic_irq_is_active(vcpu, vlr.irq))
-+				vgic_irq_clear_active(vcpu, vlr.irq);
- 		}
- 	}
- }
-@@ -1024,6 +1072,7 @@ static void vgic_retire_disabled_irqs(struct kvm_vcpu *vcpu)
- static bool vgic_queue_irq(struct kvm_vcpu *vcpu, u8 sgi_source_id, int irq)
- {
- 	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
-+	struct vgic_lr vlr;
- 	int lr;
- 
- 	/* Sanitize the input... */
-@@ -1036,28 +1085,34 @@ static bool vgic_queue_irq(struct kvm_vcpu *vcpu, u8 sgi_source_id, int irq)
- 	lr = vgic_cpu->vgic_irq_lr_map[irq];
- 
- 	/* Do we have an active interrupt for the same CPUID? */
--	if (lr != LR_EMPTY &&
--	    (LR_CPUID(vgic_cpu->vgic_lr[lr]) == sgi_source_id)) {
--		kvm_debug("LR%d piggyback for IRQ%d %x\n",
--			  lr, irq, vgic_cpu->vgic_lr[lr]);
--		BUG_ON(!test_bit(lr, vgic_cpu->lr_used));
--		vgic_cpu->vgic_lr[lr] |= GICH_LR_PENDING_BIT;
--		return true;
-+	if (lr != LR_EMPTY) {
-+		vlr = vgic_get_lr(vcpu, lr);
-+		if (vlr.source == sgi_source_id) {
-+			kvm_debug("LR%d piggyback for IRQ%d\n", lr, vlr.irq);
-+			BUG_ON(!test_bit(lr, vgic_cpu->lr_used));
-+			vlr.state |= LR_STATE_PENDING;
-+			vgic_set_lr(vcpu, lr, vlr);
-+			return true;
-+		}
- 	}
- 
- 	/* Try to use another LR for this interrupt */
- 	lr = find_first_zero_bit((unsigned long *)vgic_cpu->lr_used,
--			       vgic_cpu->nr_lr);
--	if (lr >= vgic_cpu->nr_lr)
-+			       vgic->nr_lr);
-+	if (lr >= vgic->nr_lr)
- 		return false;
- 
- 	kvm_debug("LR%d allocated for IRQ%d %x\n", lr, irq, sgi_source_id);
--	vgic_cpu->vgic_lr[lr] = MK_LR_PEND(sgi_source_id, irq);
- 	vgic_cpu->vgic_irq_lr_map[irq] = lr;
- 	set_bit(lr, vgic_cpu->lr_used);
- 
-+	vlr.irq = irq;
-+	vlr.source = sgi_source_id;
-+	vlr.state = LR_STATE_PENDING;
- 	if (!vgic_irq_is_edge(vcpu, irq))
--		vgic_cpu->vgic_lr[lr] |= GICH_LR_EOI;
-+		vlr.state |= LR_EOI_INT;
-+
-+	vgic_set_lr(vcpu, lr, vlr);
- 
- 	return true;
- }
-@@ -1155,9 +1210,9 @@ static void __kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu)
- 
- epilog:
- 	if (overflow) {
--		vgic_cpu->vgic_hcr |= GICH_HCR_UIE;
-+		vgic_enable_underflow(vcpu);
- 	} else {
--		vgic_cpu->vgic_hcr &= ~GICH_HCR_UIE;
-+		vgic_disable_underflow(vcpu);
- 		/*
- 		 * We're about to run this VCPU, and we've consumed
- 		 * everything the distributor had in store for
-@@ -1170,44 +1225,46 @@ epilog:
- 
- static bool vgic_process_maintenance(struct kvm_vcpu *vcpu)
- {
--	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
-+	u32 status = vgic_get_interrupt_status(vcpu);
- 	bool level_pending = false;
- 
--	kvm_debug("MISR = %08x\n", vgic_cpu->vgic_misr);
-+	kvm_debug("STATUS = %08x\n", status);
- 
--	if (vgic_cpu->vgic_misr & GICH_MISR_EOI) {
-+	if (status & INT_STATUS_EOI) {
- 		/*
- 		 * Some level interrupts have been EOIed. Clear their
- 		 * active bit.
- 		 */
--		int lr, irq;
-+		u64 eisr = vgic_get_eisr(vcpu);
-+		unsigned long *eisr_ptr = (unsigned long *)&eisr;
-+		int lr;
- 
--		for_each_set_bit(lr, (unsigned long *)vgic_cpu->vgic_eisr,
--				 vgic_cpu->nr_lr) {
--			irq = vgic_cpu->vgic_lr[lr] & GICH_LR_VIRTUALID;
-+		for_each_set_bit(lr, eisr_ptr, vgic->nr_lr) {
-+			struct vgic_lr vlr = vgic_get_lr(vcpu, lr);
- 
--			vgic_irq_clear_active(vcpu, irq);
--			vgic_cpu->vgic_lr[lr] &= ~GICH_LR_EOI;
-+			vgic_irq_clear_active(vcpu, vlr.irq);
-+			WARN_ON(vlr.state & LR_STATE_MASK);
-+			vlr.state = 0;
-+			vgic_set_lr(vcpu, lr, vlr);
- 
- 			/* Any additional pending interrupt? */
--			if (vgic_dist_irq_is_pending(vcpu, irq)) {
--				vgic_cpu_irq_set(vcpu, irq);
-+			if (vgic_dist_irq_is_pending(vcpu, vlr.irq)) {
-+				vgic_cpu_irq_set(vcpu, vlr.irq);
- 				level_pending = true;
- 			} else {
--				vgic_cpu_irq_clear(vcpu, irq);
-+				vgic_cpu_irq_clear(vcpu, vlr.irq);
- 			}
- 
- 			/*
- 			 * Despite being EOIed, the LR may not have
- 			 * been marked as empty.
- 			 */
--			set_bit(lr, (unsigned long *)vgic_cpu->vgic_elrsr);
--			vgic_cpu->vgic_lr[lr] &= ~GICH_LR_ACTIVE_BIT;
-+			vgic_sync_lr_elrsr(vcpu, lr, vlr);
- 		}
- 	}
- 
--	if (vgic_cpu->vgic_misr & GICH_MISR_U)
--		vgic_cpu->vgic_hcr &= ~GICH_HCR_UIE;
-+	if (status & INT_STATUS_UNDERFLOW)
-+		vgic_disable_underflow(vcpu);
- 
- 	return level_pending;
- }
-@@ -1220,29 +1277,31 @@ static void __kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu)
- {
- 	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
- 	struct vgic_dist *dist = &vcpu->kvm->arch.vgic;
-+	u64 elrsr;
-+	unsigned long *elrsr_ptr;
- 	int lr, pending;
- 	bool level_pending;
- 
- 	level_pending = vgic_process_maintenance(vcpu);
-+	elrsr = vgic_get_elrsr(vcpu);
-+	elrsr_ptr = (unsigned long *)&elrsr;
- 
- 	/* Clear mappings for empty LRs */
--	for_each_set_bit(lr, (unsigned long *)vgic_cpu->vgic_elrsr,
--			 vgic_cpu->nr_lr) {
--		int irq;
-+	for_each_set_bit(lr, elrsr_ptr, vgic->nr_lr) {
-+		struct vgic_lr vlr;
- 
- 		if (!test_and_clear_bit(lr, vgic_cpu->lr_used))
- 			continue;
- 
--		irq = vgic_cpu->vgic_lr[lr] & GICH_LR_VIRTUALID;
-+		vlr = vgic_get_lr(vcpu, lr);
- 
--		BUG_ON(irq >= VGIC_NR_IRQS);
--		vgic_cpu->vgic_irq_lr_map[irq] = LR_EMPTY;
-+		BUG_ON(vlr.irq >= VGIC_NR_IRQS);
-+		vgic_cpu->vgic_irq_lr_map[vlr.irq] = LR_EMPTY;
- 	}
- 
- 	/* Check if we still have something up our sleeve... */
--	pending = find_first_zero_bit((unsigned long *)vgic_cpu->vgic_elrsr,
--				      vgic_cpu->nr_lr);
--	if (level_pending || pending < vgic_cpu->nr_lr)
-+	pending = find_first_zero_bit(elrsr_ptr, vgic->nr_lr);
-+	if (level_pending || pending < vgic->nr_lr)
- 		set_bit(vcpu->vcpu_id, &dist->irq_pending_on_cpu);
- }
- 
-@@ -1432,21 +1491,20 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
- 	}
- 
- 	/*
--	 * By forcing VMCR to zero, the GIC will restore the binary
--	 * points to their reset values. Anything else resets to zero
--	 * anyway.
-+	 * Store the number of LRs per vcpu, so we don't have to go
-+	 * all the way to the distributor structure to find out. Only
-+	 * assembly code should use this one.
- 	 */
--	vgic_cpu->vgic_vmcr = 0;
-+	vgic_cpu->nr_lr = vgic->nr_lr;
- 
--	vgic_cpu->nr_lr = vgic_nr_lr;
--	vgic_cpu->vgic_hcr = GICH_HCR_EN; /* Get the show on the road... */
-+	vgic_enable(vcpu);
- 
- 	return 0;
- }
- 
- static void vgic_init_maintenance_interrupt(void *info)
- {
--	enable_percpu_irq(vgic_maint_irq, 0);
-+	enable_percpu_irq(vgic->maint_irq, 0);
- }
- 
- static int vgic_cpu_notify(struct notifier_block *self,
-@@ -1459,7 +1517,7 @@ static int vgic_cpu_notify(struct notifier_block *self,
- 		break;
- 	case CPU_DYING:
- 	case CPU_DYING_FROZEN:
--		disable_percpu_irq(vgic_maint_irq);
-+		disable_percpu_irq(vgic->maint_irq);
- 		break;
- 	}
- 
-@@ -1470,30 +1528,37 @@ static struct notifier_block vgic_cpu_nb = {
- 	.notifier_call = vgic_cpu_notify,
- };
- 
-+static const struct of_device_id vgic_ids[] = {
-+	{ .compatible = "arm,cortex-a15-gic", .data = vgic_v2_probe, },
-+	{ .compatible = "arm,gic-v3", .data = vgic_v3_probe, },
-+	{},
-+};
-+
- int kvm_vgic_hyp_init(void)
- {
-+	const struct of_device_id *matched_id;
-+	int (*vgic_probe)(struct device_node *,const struct vgic_ops **,
-+			  const struct vgic_params **);
-+	struct device_node *vgic_node;
- 	int ret;
--	struct resource vctrl_res;
--	struct resource vcpu_res;
- 
--	vgic_node = of_find_compatible_node(NULL, NULL, "arm,cortex-a15-gic");
-+	vgic_node = of_find_matching_node_and_match(NULL,
-+						    vgic_ids, &matched_id);
- 	if (!vgic_node) {
--		kvm_err("error: no compatible vgic node in DT\n");
-+		kvm_err("error: no compatible GIC node found\n");
- 		return -ENODEV;
- 	}
- 
--	vgic_maint_irq = irq_of_parse_and_map(vgic_node, 0);
--	if (!vgic_maint_irq) {
--		kvm_err("error getting vgic maintenance irq from DT\n");
--		ret = -ENXIO;
--		goto out;
--	}
-+	vgic_probe = matched_id->data;
-+	ret = vgic_probe(vgic_node, &vgic_ops, &vgic);
-+	if (ret)
-+		return ret;
- 
--	ret = request_percpu_irq(vgic_maint_irq, vgic_maintenance_handler,
-+	ret = request_percpu_irq(vgic->maint_irq, vgic_maintenance_handler,
- 				 "vgic", kvm_get_running_vcpus());
- 	if (ret) {
--		kvm_err("Cannot register interrupt %d\n", vgic_maint_irq);
--		goto out;
-+		kvm_err("Cannot register interrupt %d\n", vgic->maint_irq);
-+		return ret;
- 	}
- 
- 	ret = __register_cpu_notifier(&vgic_cpu_nb);
-@@ -1502,65 +1567,15 @@ int kvm_vgic_hyp_init(void)
- 		goto out_free_irq;
- 	}
- 
--	ret = of_address_to_resource(vgic_node, 2, &vctrl_res);
--	if (ret) {
--		kvm_err("Cannot obtain VCTRL resource\n");
--		goto out_free_irq;
--	}
--
--	vgic_vctrl_base = of_iomap(vgic_node, 2);
--	if (!vgic_vctrl_base) {
--		kvm_err("Cannot ioremap VCTRL\n");
--		ret = -ENOMEM;
--		goto out_free_irq;
--	}
--
--	vgic_nr_lr = readl_relaxed(vgic_vctrl_base + GICH_VTR);
--	vgic_nr_lr = (vgic_nr_lr & 0x3f) + 1;
--
--	ret = create_hyp_io_mappings(vgic_vctrl_base,
--				     vgic_vctrl_base + resource_size(&vctrl_res),
--				     vctrl_res.start);
--	if (ret) {
--		kvm_err("Cannot map VCTRL into hyp\n");
--		goto out_unmap;
--	}
--
--	if (of_address_to_resource(vgic_node, 3, &vcpu_res)) {
--		kvm_err("Cannot obtain VCPU resource\n");
--		ret = -ENXIO;
--		goto out_unmap;
--	}
--
--	if (!PAGE_ALIGNED(vcpu_res.start)) {
--		kvm_err("GICV physical address 0x%llx not page aligned\n",
--			(unsigned long long)vcpu_res.start);
--		ret = -ENXIO;
--		goto out_unmap;
--	}
--
--	if (!PAGE_ALIGNED(resource_size(&vcpu_res))) {
--		kvm_err("GICV size 0x%llx not a multiple of page size 0x%lx\n",
--			(unsigned long long)resource_size(&vcpu_res),
--			PAGE_SIZE);
--		ret = -ENXIO;
--		goto out_unmap;
--	}
--
--	vgic_vcpu_base = vcpu_res.start;
--
--	kvm_info("%s@%llx IRQ%d\n", vgic_node->name,
--		 vctrl_res.start, vgic_maint_irq);
- 	on_each_cpu(vgic_init_maintenance_interrupt, NULL, 1);
- 
--	goto out;
-+	/* Callback into for arch code for setup */
-+	vgic_arch_setup(vgic);
-+
-+	return 0;
- 
--out_unmap:
--	iounmap(vgic_vctrl_base);
- out_free_irq:
--	free_percpu_irq(vgic_maint_irq, kvm_get_running_vcpus());
--out:
--	of_node_put(vgic_node);
-+	free_percpu_irq(vgic->maint_irq, kvm_get_running_vcpus());
- 	return ret;
- }
- 
-@@ -1593,7 +1608,7 @@ int kvm_vgic_init(struct kvm *kvm)
- 	}
- 
- 	ret = kvm_phys_addr_ioremap(kvm, kvm->arch.vgic.vgic_cpu_base,
--				    vgic_vcpu_base, KVM_VGIC_V2_CPU_SIZE);
-+				    vgic->vcpu_base, KVM_VGIC_V2_CPU_SIZE);
- 	if (ret) {
- 		kvm_err("Unable to remap VGIC CPU to VCPU\n");
- 		goto out;
-@@ -1639,7 +1654,8 @@ int kvm_vgic_create(struct kvm *kvm)
- 	}
- 
- 	spin_lock_init(&kvm->arch.vgic.lock);
--	kvm->arch.vgic.vctrl_base = vgic_vctrl_base;
-+	kvm->arch.vgic.in_kernel = true;
-+	kvm->arch.vgic.vctrl_base = vgic->vctrl_base;
- 	kvm->arch.vgic.vgic_dist_base = VGIC_ADDR_UNDEF;
- 	kvm->arch.vgic.vgic_cpu_base = VGIC_ADDR_UNDEF;
- 
-@@ -1738,39 +1754,40 @@ int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write)
- static bool handle_cpu_mmio_misc(struct kvm_vcpu *vcpu,
- 				 struct kvm_exit_mmio *mmio, phys_addr_t offset)
- {
--	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
--	u32 reg, mask = 0, shift = 0;
- 	bool updated = false;
-+	struct vgic_vmcr vmcr;
-+	u32 *vmcr_field;
-+	u32 reg;
-+
-+	vgic_get_vmcr(vcpu, &vmcr);
- 
- 	switch (offset & ~0x3) {
- 	case GIC_CPU_CTRL:
--		mask = GICH_VMCR_CTRL_MASK;
--		shift = GICH_VMCR_CTRL_SHIFT;
-+		vmcr_field = &vmcr.ctlr;
- 		break;
- 	case GIC_CPU_PRIMASK:
--		mask = GICH_VMCR_PRIMASK_MASK;
--		shift = GICH_VMCR_PRIMASK_SHIFT;
-+		vmcr_field = &vmcr.pmr;
- 		break;
- 	case GIC_CPU_BINPOINT:
--		mask = GICH_VMCR_BINPOINT_MASK;
--		shift = GICH_VMCR_BINPOINT_SHIFT;
-+		vmcr_field = &vmcr.bpr;
- 		break;
- 	case GIC_CPU_ALIAS_BINPOINT:
--		mask = GICH_VMCR_ALIAS_BINPOINT_MASK;
--		shift = GICH_VMCR_ALIAS_BINPOINT_SHIFT;
-+		vmcr_field = &vmcr.abpr;
- 		break;
-+	default:
-+		BUG();
- 	}
- 
- 	if (!mmio->is_write) {
--		reg = (vgic_cpu->vgic_vmcr & mask) >> shift;
-+		reg = *vmcr_field;
- 		mmio_data_write(mmio, ~0, reg);
- 	} else {
- 		reg = mmio_data_read(mmio, ~0);
--		reg = (reg << shift) & mask;
--		if (reg != (vgic_cpu->vgic_vmcr & mask))
-+		if (reg != *vmcr_field) {
-+			*vmcr_field = reg;
-+			vgic_set_vmcr(vcpu, &vmcr);
- 			updated = true;
--		vgic_cpu->vgic_vmcr &= ~mask;
--		vgic_cpu->vgic_vmcr |= reg;
-+		}
- 	}
- 	return updated;
- }
diff --git a/freed-ora/current/master/kernel.spec b/freed-ora/current/master/kernel.spec
index 2e91872dc..caf6a142a 100644
--- a/freed-ora/current/master/kernel.spec
+++ b/freed-ora/current/master/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 1
+%global released_kernel 0
 
 %global aarch64patches 1
 
@@ -105,7 +105,7 @@ 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 0
+%define rcrev 6
 # The git snapshot level
 %define gitrev 0
 # Set rpm version accordingly
@@ -124,8 +124,6 @@ Summary: The Linux kernel
 #
 # standard kernel
 %define with_up        %{?_without_up:        0} %{?!_without_up:        1}
-# kernel-smp (only valid for ppc 32-bit)
-%define with_smp       %{?_without_smp:       0} %{?!_without_smp:       1}
 # kernel PAE (only valid for i686 (PAE) and ARM (lpae))
 %define with_pae       %{?_without_pae:       0} %{?!_without_pae:       1}
 # kernel-debug
@@ -134,8 +132,6 @@ Summary: The Linux kernel
 %define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
 # kernel-firmware
 %define with_firmware  %{?_with_firmware:     1} %{?!_with_firmware:     0}
-# kernel-modules-extra
-%define with_extra     %{?_without_extra:     0} %{?!_without_extra:     1}
 # perf
 %define with_perf      %{?_without_perf:      0} %{?!_without_perf:      1}
 # tools
@@ -151,8 +147,6 @@ Summary: The Linux kernel
 #
 # Only build the base kernel (--with baseonly):
 %define with_baseonly  %{?_with_baseonly:     1} %{?!_with_baseonly:     0}
-# Only build the smp kernel (--with smponly):
-%define with_smponly   %{?_with_smponly:      1} %{?!_with_smponly:      0}
 # Only build the pae kernel (--with paeonly):
 %define with_paeonly   %{?_with_paeonly:      1} %{?!_with_paeonly:      0}
 # Only build the debug kernel (--with dbgonly):
@@ -238,14 +232,6 @@ Summary: The Linux kernel
 
 # if requested, only build base kernel
 %if %{with_baseonly}
-%define with_smp 0
-%define with_pae 0
-%define with_debug 0
-%endif
-
-# if requested, only build smp kernel
-%if %{with_smponly}
-%define with_up 0
 %define with_pae 0
 %define with_debug 0
 %endif
@@ -253,7 +239,6 @@ Summary: The Linux kernel
 # if requested, only build pae kernel
 %if %{with_paeonly}
 %define with_up 0
-%define with_smp 0
 %define with_debug 0
 %endif
 
@@ -263,7 +248,6 @@ Summary: The Linux kernel
 %define with_up 0
 %define with_pae 0
 %endif
-%define with_smp 0
 %define with_pae 0
 %define with_tools 0
 %define with_perf 0
@@ -273,16 +257,11 @@ Summary: The Linux kernel
 
 %if %{with_vdso_install}
 # These arches install vdso/ directories.
-%define vdso_arches %{all_x86} x86_64 ppc ppc64 ppc64p7 s390 s390x aarch64 ppc64le
+%define vdso_arches %{all_x86} x86_64 %{power64} s390 s390x aarch64
 %endif
 
 # Overrides for generic default options
 
-# only ppc needs a separate smp kernel
-%ifnarch ppc 
-%define with_smp 0
-%endif
-
 # don't do debug builds on anything but i686 and x86_64
 %ifnarch i686 x86_64
 %define with_debug 0
@@ -299,12 +278,9 @@ Summary: The Linux kernel
 %endif
 
 # bootwrapper is only on ppc
-%ifnarch ppc ppc64 ppc64p7 ppc64le
+# sparse blows up on ppc
+%ifnarch %{power64}
 %define with_bootwrapper 0
-%endif
-
-# sparse blows up on ppc64 and sparc64
-%ifarch ppc64 ppc ppc64p7 ppc64le
 %define with_sparse 0
 %endif
 
@@ -326,25 +302,19 @@ Summary: The Linux kernel
 %define kernel_image arch/x86/boot/bzImage
 %endif
 
-%ifarch ppc64 ppc64p7
+%ifarch %{power64}
 %define asmarch powerpc
 %define hdrarch powerpc
-%define all_arch_configs kernel-%{version}-ppc64*.config
 %define image_install_path boot
 %define make_target vmlinux
 %define kernel_image vmlinux
 %define kernel_image_elf 1
+%ifarch ppc64 ppc64p7
+%define all_arch_configs kernel-%{version}-ppc64*.config
 %endif
-
 %ifarch ppc64le
-%define asmarch powerpc
-%define hdrarch powerpc
 %define all_arch_configs kernel-%{version}-ppc64le.config
-%define image_install_path boot
-%define make_target vmlinux
-%define kernel_image vmlinux
-%define kernel_image_elf 1
-%define with_tools 0
+%endif
 %endif
 
 %ifarch s390x
@@ -357,16 +327,6 @@ Summary: The Linux kernel
 %define with_tools 0
 %endif
 
-%ifarch ppc
-%define asmarch powerpc
-%define hdrarch powerpc
-%define all_arch_configs kernel-%{version}-ppc{-,.}*config
-%define image_install_path boot
-%define make_target vmlinux
-%define kernel_image vmlinux
-%define kernel_image_elf 1
-%endif
-
 %ifarch %{arm}
 %define all_arch_configs kernel-%{version}-arm*.config
 %define image_install_path boot
@@ -418,7 +378,6 @@ Summary: The Linux kernel
 
 %ifarch %nobuildarches
 %define with_up 0
-%define with_smp 0
 %define with_pae 0
 %define with_debuginfo 0
 %define with_perf 0
@@ -432,7 +391,7 @@ Summary: The Linux kernel
 %endif
 
 # Architectures we build tools/cpupower on
-%define cpupowerarchs %{ix86} x86_64 ppc ppc64 ppc64p7 %{arm} aarch64 ppc64le
+%define cpupowerarchs %{ix86} x86_64 %{power64} %{arm} aarch64 
 
 #
 # Packages that need to be installed before the kernel is, because the %%post
@@ -449,7 +408,7 @@ Version: %{rpmversion}
 Release: %{pkg_release}
 # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
 # SET %%nobuildarches (ABOVE) INSTEAD
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64p7 s390 s390x %{arm} aarch64 ppc64le
+ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ppc64p7 s390 s390x %{arm} aarch64 ppc64le
 ExclusiveOS: Linux
 %ifnarch %{nobuildarches}
 Requires: kernel%{?variant}-core-uname-r = %{KVERREL}
@@ -496,7 +455,7 @@ Source0: http://linux-libre.fsfla.org/pub/linux-libre/freed-ora/src/linux%{?base
 Source3: deblob-main
 Source4: deblob-check
 Source5: deblob-%{kversion}
-#Source6: deblob-3.%{upstream_sublevel}
+Source6: deblob-3.%{upstream_sublevel}
 
 Source10: perf-man-%{kversion}.tar.gz
 Source11: x509.genkey
@@ -509,7 +468,6 @@ Source90: filter-x86_64.sh
 Source91: filter-armv7hl.sh
 Source92: filter-i686.sh
 Source93: filter-aarch64.sh
-Source94: filter-ppc.sh
 Source95: filter-ppc64.sh
 Source96: filter-ppc64le.sh
 Source97: filter-s390x.sh
@@ -531,8 +489,6 @@ Source32: config-x86-32-generic
 Source40: config-x86_64-generic
 
 Source50: config-powerpc-generic
-Source51: config-powerpc32-generic
-Source52: config-powerpc32-smp
 Source53: config-powerpc64
 Source54: config-powerpc64p7
 Source55: config-powerpc64le
@@ -586,7 +542,7 @@ Patch00: patch%{?gitrevlibre}-3.%{base_sublevel}-git%{gitrev}%{?gitrevgnu}.xz
 Patch04: compile-fixes.patch
 
 # build tweak for build ID magic, even for -vanilla
-Patch05: makefile-after_link.patch
+Patch05: kbuild-AFTER_LINK.patch
 
 Patch07: freedo.patch
 
@@ -602,29 +558,42 @@ Patch09: upstream-reverts.patch
 Patch450: input-kill-stupid-messages.patch
 Patch452: no-pcspkr-modalias.patch
 
-Patch460: serial-460800.patch
-
 Patch470: die-floppy-die.patch
 
 Patch500: Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
 
-Patch510: silence-noise.patch
+Patch510: input-silence-i8042-noise.patch
 Patch530: silence-fbcon-logo.patch
 
-Patch600: 0001-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
-
-#rhbz 917708
-Patch700: Revert-userns-Allow-unprivileged-users-to-create-use.patch
+Patch600: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
 
 Patch800: crash-driver.patch
 
 # crypto/
 
 # secure boot
-Patch1000: secure-modules.patch
-Patch1001: modsign-uefi.patch
-# atch1002: sb-hibernate.patch
-Patch1003: sysrq-secure-boot.patch
+Patch1000: Add-secure_modules-call.patch
+Patch1001: PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
+Patch1002: x86-Lock-down-IO-port-access-when-module-security-is.patch
+Patch1003: ACPI-Limit-access-to-custom_method.patch
+Patch1004: asus-wmi-Restrict-debugfs-interface-when-module-load.patch
+Patch1005: Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
+Patch1006: acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
+Patch1007: kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
+Patch1008: x86-Restrict-MSR-access-when-module-loading-is-restr.patch
+Patch1009: Add-option-to-automatically-enforce-module-signature.patch
+Patch1010: efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
+Patch1011: efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
+Patch1012: efi-Add-EFI_SECURE_BOOT-bit.patch
+Patch1013: hibernate-Disable-in-a-signed-modules-environment.patch
+
+Patch1014: Add-EFI-signature-data-types.patch
+Patch1015: Add-an-EFI-signature-blob-parser-and-key-loader.patch
+Patch1016: KEYS-Add-a-system-blacklist-keyring.patch
+Patch1017: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+Patch1018: MODSIGN-Support-not-importing-certs-from-db.patch
+
+Patch1019: Add-sysrq-option-to-disable-secure-boot-mode.patch
 
 # virt + ksm patches
 
@@ -647,16 +616,22 @@ Patch14000: hibernate-freeze-filesystems.patch
 
 Patch14010: lis3-improve-handling-of-null-rate.patch
 
-Patch15000: nowatchdog-on-virt.patch
+Patch15000: watchdog-Disable-watchdog-on-virtual-machines.patch
 
+# PPC
+Patch18000: ppc64-fixtools.patch
 # ARM64
 
 # ARMv7
-Patch21020: arm-tegra-usb-no-reset-linux33.patch
-Patch21021: arm-beagle.patch
-Patch21022: arm-imx6-utilite.patch
-# http://www.spinics.net/lists/linux-tegra/msg17948.html
-Patch21023: arm-tegra-drmdetection.patch
+Patch21020: ARM-tegra-usb-no-reset.patch
+Patch21021: arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
+Patch21022: arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
+Patch21023: arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
+Patch21024: arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
+Patch21025: arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
+Patch21026: pinctrl-pinctrl-single-must-be-initialized-early.patch
+
+Patch21028: arm-i.MX6-Utilite-device-dtb.patch
 
 #rhbz 754518
 Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -665,34 +640,36 @@ Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 Patch21242: criu-no-expert.patch
 
 #rhbz 892811
-Patch21247: ath9k_rx_dma_stop_check.patch
+Patch21247: ath9k-rx-dma-stop-check.patch
 
 Patch22000: weird-root-dentry-name-debug.patch
 
-Patch25047: drm-radeon-Disable-writeback-by-default-on-ppc.patch
-
 #rhbz 1025603
 Patch25063: disable-libdw-unwind-on-non-x86.patch
 
 #rhbz 983342 1093120
-Patch25069: 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch
+Patch25069: acpi-video-Add-4-new-models-to-the-use_native_backli.patch
 
-Patch26000: perf-lib64.patch
+Patch26000: perf-install-trace-event-plugins.patch
 
 # Patch series from Hans for various backlight and platform driver fixes
 Patch26002: samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
-Patch26004: asus-wmi-Add-a-no-backlight-quirk.patch
-Patch26005: eeepc-wmi-Add-no-backlight-quirk-for-Asus-H87I-PLUS-.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
 
-Patch25109: revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch
+#rhbz 1134969
+Patch26016: HID-wacom-Add-support-for-the-Cintiq-Companion.patch
+
+#rhbz 1110011
+Patch26019: psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
+Patch26020: psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
 
-#rhbz 1021036, submitted upstream
-Patch25110: 0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
+#rhbz 1138759
+Patch26021: drm-vmwgfx-Fix-drm.h-include.patch
 
-#rhbz 1117942
-Patch25118: sched-fix-sched_setparam-policy-1-logic.patch
+Patch26022: x86-efi-Delete-misleading-efi_printk-error-message.patch
+
+Patch26023: Revert-x86-efi-Fixup-GOT-in-all-boot-code-paths.patch
 
 # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
 Patch30000: kernel-arm64.patch
@@ -1018,27 +995,12 @@ Provides: kernel-libre-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\
 %endif\
 %{expand:%%kernel_devel_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
 %{expand:%%kernel_modules_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
-%if %{with_extra}\
 %{expand:%%kernel_modules_extra_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
-%endif\
 %{expand:%%kernel_debuginfo_package %{?1:%{1}}}\
 %{nil}
 
 # Now, each variant package.
 
-%define variant_summary The Linux kernel compiled for SMP machines
-%kernel_variant_package -n SMP smp
-%description smp-core
-This package includes a SMP version of the Linux kernel. It is
-required only on machines with two or more CPUs as well as machines with
-hyperthreading technology.
-
-The kernel-libre-smp package is the upstream kernel without the
-non-Free blobs it includes by default.
-
-Install the kernel-libre-smp package if your machine uses two or more
-CPUs.
-
 %ifnarch armv7hl
 %define variant_summary The Linux kernel compiled for PAE capable machines
 %kernel_variant_package %{pae}
@@ -1115,13 +1077,6 @@ exit 1
 %endif
 %endif
 
-%if %{with_smponly}
-%if !%{with_smp}
-echo "Cannot build --with smponly, smp build is disabled"
-exit 1
-%endif
-%endif
-
 %if "%{baserelease}" == "0"
 echo "baserelease must be greater than zero"
 exit 1
@@ -1353,7 +1308,7 @@ do
 done
 %endif
 
-ApplyPatch makefile-after_link.patch
+ApplyPatch kbuild-AFTER_LINK.patch
 
 #
 # misc small stuff to make things compile
@@ -1370,17 +1325,24 @@ ApplyOptionalPatch upstream-reverts.patch -R
 
 # Architecture patches
 # x86(-64)
-ApplyPatch 0001-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
+ApplyPatch lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
 
+# PPC
+ApplyPatch ppc64-fixtools.patch
 # ARM64
 
 #
 # ARM
 #
-ApplyPatch arm-tegra-usb-no-reset-linux33.patch
-ApplyPatch arm-beagle.patch
-ApplyPatch arm-imx6-utilite.patch
-ApplyPatch arm-tegra-drmdetection.patch
+ApplyPatch ARM-tegra-usb-no-reset.patch
+ApplyPatch arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
+ApplyPatch arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
+ApplyPatch arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
+ApplyPatch arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
+ApplyPatch arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
+ApplyPatch pinctrl-pinctrl-single-must-be-initialized-early.patch
+
+ApplyPatch arm-i.MX6-Utilite-device-dtb.patch
 
 #
 # bugfixes to drivers and filesystems
@@ -1427,30 +1389,42 @@ ApplyPatch die-floppy-die.patch
 
 ApplyPatch no-pcspkr-modalias.patch
 
-# Allow to use 480600 baud on 16C950 UARTs
-ApplyPatch serial-460800.patch
-
 # Silence some useless messages that still get printed with 'quiet'
-ApplyPatch silence-noise.patch
+ApplyPatch input-silence-i8042-noise.patch
 
 # Make fbcon not show the penguins with 'quiet'
 ApplyPatch silence-fbcon-logo.patch
 
 # Changes to upstream defaults.
 
-#rhbz 917708
-ApplyPatch Revert-userns-Allow-unprivileged-users-to-create-use.patch
-
 # /dev/crash driver.
 ApplyPatch crash-driver.patch
 
 # crypto/
 
 # secure boot
-ApplyPatch secure-modules.patch
-ApplyPatch modsign-uefi.patch
-# pplyPatch sb-hibernate.patch
-ApplyPatch sysrq-secure-boot.patch
+ApplyPatch Add-secure_modules-call.patch
+ApplyPatch PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
+ApplyPatch x86-Lock-down-IO-port-access-when-module-security-is.patch
+ApplyPatch ACPI-Limit-access-to-custom_method.patch
+ApplyPatch asus-wmi-Restrict-debugfs-interface-when-module-load.patch
+ApplyPatch Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
+ApplyPatch acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
+ApplyPatch kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
+ApplyPatch x86-Restrict-MSR-access-when-module-loading-is-restr.patch
+ApplyPatch Add-option-to-automatically-enforce-module-signature.patch
+ApplyPatch efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
+ApplyPatch efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
+ApplyPatch efi-Add-EFI_SECURE_BOOT-bit.patch
+ApplyPatch hibernate-Disable-in-a-signed-modules-environment.patch
+
+ApplyPatch Add-EFI-signature-data-types.patch
+ApplyPatch Add-an-EFI-signature-blob-parser-and-key-loader.patch
+ApplyPatch KEYS-Add-a-system-blacklist-keyring.patch
+ApplyPatch MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+ApplyPatch MODSIGN-Support-not-importing-certs-from-db.patch
+
+ApplyPatch Add-sysrq-option-to-disable-secure-boot-mode.patch
 
 # Assorted Virt Fixes
 
@@ -1472,7 +1446,7 @@ ApplyPatch disable-i8042-check-on-apple-mac.patch
 ApplyPatch lis3-improve-handling-of-null-rate.patch
 
 # Disable watchdog on virtual machines.
-ApplyPatch nowatchdog-on-virt.patch
+ApplyPatch watchdog-Disable-watchdog-on-virtual-machines.patch
 
 #rhbz 754518
 ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -1483,32 +1457,34 @@ ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 ApplyPatch criu-no-expert.patch
 
 #rhbz 892811
-ApplyPatch ath9k_rx_dma_stop_check.patch
-
-ApplyPatch drm-radeon-Disable-writeback-by-default-on-ppc.patch
+ApplyPatch ath9k-rx-dma-stop-check.patch
 
 #rhbz 1025603
 ApplyPatch disable-libdw-unwind-on-non-x86.patch
 
 #rhbz 983342 1093120
-ApplyPatch 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch
+ApplyPatch acpi-video-Add-4-new-models-to-the-use_native_backli.patch
 
-ApplyPatch perf-lib64.patch
+ApplyPatch perf-install-trace-event-plugins.patch
 
 # Patch series from Hans for various backlight and platform driver fixes
 ApplyPatch samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
-ApplyPatch asus-wmi-Add-a-no-backlight-quirk.patch
-ApplyPatch eeepc-wmi-Add-no-backlight-quirk-for-Asus-H87I-PLUS-.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
 
-ApplyPatch revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch
+#rhbz 1134969
+ApplyPatch HID-wacom-Add-support-for-the-Cintiq-Companion.patch
 
-#rhbz 1021036, submitted upstream
-ApplyPatch 0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
+#rhbz 1110011
+ApplyPatch psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
+ApplyPatch psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
 
-#rhbz 1117942
-ApplyPatch sched-fix-sched_setparam-policy-1-logic.patch
+#rhbz 1138759
+ApplyPatch drm-vmwgfx-Fix-drm.h-include.patch
+
+ApplyPatch x86-efi-Delete-misleading-efi_printk-error-message.patch
+
+ApplyPatch Revert-x86-efi-Fixup-GOT-in-all-boot-code-paths.patch
 
 %if 0%{?aarch64patches}
 ApplyPatch kernel-arm64.patch
@@ -1740,7 +1716,7 @@ BuildKernel() {
     fi
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
-%ifarch ppc ppc64 ppc64p7
+%ifarch %{power64}
     cp -a --parents arch/powerpc/lib/crtsavres.[So] $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
 %endif
     if [ -d arch/%{asmarch}/include ]; then
@@ -1817,10 +1793,8 @@ BuildKernel() {
         rm -f modules.{alias*,builtin.bin,dep*,*map,symbols*,devname,softdep}
     popd
 
-%if %{with_extra}
     # Call the modules-extra script to move things around
     %{SOURCE17} $RPM_BUILD_ROOT/lib/modules/$KernelVer %{SOURCE16}
-%endif
 
     #
     # Generate the kernel-core and kernel-modules files lists
@@ -1925,10 +1899,6 @@ BuildKernel %make_target %kernel_image %{pae}
 BuildKernel %make_target %kernel_image
 %endif
 
-%if %{with_smp}
-BuildKernel %make_target %kernel_image smp
-%endif
-
 %global perf_make \
   make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix}
 %if %{with_perf}
@@ -2194,9 +2164,7 @@ fi\
 %define kernel_variant_post(v:r:) \
 %{expand:%%kernel_devel_post %{?-v*}}\
 %{expand:%%kernel_modules_post %{?-v*}}\
-%if %{with_extra}\
 %{expand:%%kernel_modules_extra_post %{?-v*}}\
-%endif\
 %{expand:%%kernel_variant_posttrans %{?-v*}}\
 %{expand:%%post %{?-v*:%{-v*}-}core}\
 %{-r:\
@@ -2218,9 +2186,6 @@ fi}\
 %kernel_variant_preun
 %kernel_variant_post -r kernel-smp
 
-%kernel_variant_preun smp
-%kernel_variant_post -v smp
-
 %kernel_variant_preun %{pae}
 %kernel_variant_post -v %{pae} -r (kernel|kernel-smp)
 
@@ -2366,9 +2331,7 @@ fi
 %{expand:%%files %{?2:%{2}-}devel}\
 %defattr(-,root,root)\
 /usr/src/kernels/%{KVERREL}%{?2:+%{2}}\
-%if %{with_extra}\
 %{expand:%%files %{?2:%{2}-}modules-extra}\
-%endif\
 %defattr(-,root,root)\
 /lib/modules/%{KVERREL}%{?2:+%{2}}/extra\
 %if %{with_debuginfo}\
@@ -2386,7 +2349,6 @@ fi
 
 
 %kernel_variant_files %{with_up}
-%kernel_variant_files %{with_smp} smp
 %kernel_variant_files %{with_debug} debug
 %kernel_variant_files %{with_pae} %{pae}
 %kernel_variant_files %{with_pae_debug} %{pae}debug
@@ -2405,10 +2367,190 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
-* Thu Aug  7 2014 Alexandre Oliva <lxoliva@fsfla.org> -libre
+* Sun Sep 28 2014 Alexandre Oliva <lxoliva@fsfla.org> -libre
+- GNU Linux-libre 3.17-rc6-gnu.
+
+* Mon Sep 22 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc6.git0.1
+- Linux v3.17-rc6
+- Revert EFI GOT fixes as it causes boot failures
+- Disable debugging options.
+
+* 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.
+
+* 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
+
+* Thu Sep 11 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable ACPI_I2C_OPREGION
+
+* Thu Sep 11 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git3.1
+- Linux v3.17-rc4-168-g7ec62d421bdf
+- Add support for touchpad in Asus X450 and X550 (rhbz 1110011)
+
+* Wed Sep 10 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git2.1
+- Linux v3.17-rc4-158-ge874a5fe3efa
+- Add patch to fix oops on keyring gc (rhbz 1116347)
+
+* 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.
+
+* Mon Sep 08 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Remove ppc32 support
+
+* Mon Sep  8 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Build tools on ppc64le (rhbz 1138884)
+- Some minor ppc64 cleanups
+
+* Mon Sep 08 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git0.1
+- Linux v3.17-rc4
+- Disable debugging options.
+
+* Fri Sep 05 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc3.git3.1
+- Linux v3.17-rc3-94-gb7fece1be8b1
+
+* Thu Sep 04 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc3.git2.1
+- Linux v3.17-rc3-63-g44bf091f5089
+- Enable kexec bzImage signature verification (from Vivek Goyal)
+- Add support for Wacom Cintiq Companion from Benjamin Tissoires (rhbz 1134969)
+
+* Wed Sep 03 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc3.git1.1
+- Linux v3.17-rc3-16-g955837d8f50e
+- Reenable debugging options.
+
+* Tue Sep 02 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Remove with_extra switch
+
+* Mon Sep 01 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc3.git0.1
+- Linux v3.17-rc3
+- Disable debugging options.
+
+* Fri Aug 29 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc2.git3.1
+- Linux v3.17-rc2-89-g59753a805499
+
+* Thu Aug 28 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix NFSv3 ACL regression (rhbz 1132786)
+
+* Thu Aug 28 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc2.git2.1
+- Linux v3.17-rc2-42-gf1bd473f95e0
+- Don't enable CONFIG_DEBUG_WW_MUTEX_SLOWPATH (rhbz 1114160)
+
+* Wed Aug 27 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc2.git1.1
+- Disable streams on via XHCI (rhbz 1132666)
+- Linux v3.17-rc2-9-g68e370289c29
+- Reenable debugging options.
+
+* Tue Aug 26 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor tegra updates due to incorrect nvidia kernel config options
+
+* Tue Aug 26 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc2.git0.1
+- Linux v3.17-rc2
+- Fixup ARM MFD options after I2C=y change
+- Disable debugging options.
+
+* Tue Aug 26 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor generic ARMv7 updates
+- Build tegra on both LPAE and general ARMv7 kernels (thank srwarren RHBZ 1110963)
+- Set CMA to 64mb on LPAE kernel (RHBZ 1127000)
+
+* Mon Aug 25 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc1.git4.1
+- Linux v3.17-rc1-231-g7be141d05549
+- Add patch to fix NFS oops on /proc removal (rhbz 1132368)
+
+* Fri Aug 22 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Drop userns revert patch (rhbz 917708)
+
+* Fri Aug 22 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc1.git3.1
+- Linux v3.17-rc1-99-g5317821c0853
+
+* Thu Aug 21 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc1.git2.1
+- Linux v3.17-rc1-51-g372b1dbdd1fb
+
+* Wed Aug 20 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc1.git1.1
+- Linux v3.17-rc1-22-g480cadc2b7e0
+- Reenable debugging options.
+
+* Mon Aug 18 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc1.git0.1
+- Linux v3.17-rc1
+- Disable debugging options.
+
+* Sat Aug 16 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git7.1
+- Linux v3.16-11452-g88ec63d6f85c
+
+* Fri Aug 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git6.1
+- Linux v3.16-11383-gc9d26423e56c
+
+* Thu Aug 14 2014 Kyle McMartin <kyle@fedoraproject.org>
+- kernel-arm64: resynch with git head (no functional change)
+
+* Thu Aug 14 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git5.1
+- Linux v3.16-10959-gf0094b28f303
+
+* Wed Aug 13 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- 3.17 ARMv7 updates
+- Cleanup some old removed options
+- Disable legacy USB OTG (using new configfs equivilents)
+
+* Tue Aug 12 2014 Kyle McMartin <kyle@fedoraproject.org> 3.17.0-0.rc0.git4.2
+- tegra-powergate-header-move.patch: deal with armv7hl breakage
+- nouveau_platform-fix.patch: handle nouveau_dev() removal
+
+* Tue Aug 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git4.1
+- Add updated crash driver from Dave Anderson and re-enable
+
+* Tue Aug 12 2014 Kyle McMartin <kyle@fedoraproject.org>
+- kernel-arm64.patch: fix up merge conflict and re-enable
+
+* Tue Aug 12 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Linux v3.16-10473-gc8d6637d0497
+
+* Sat Aug 09 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git3.1
+- Linux v3.16-10013-gc309bfa9b481
+- Temporarily don't apply crash driver patch
+
+* Thu Aug 07 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git2.1
+- Linux v3.16-7503-g33caee39925b
+
+* Tue Aug 05 2014 Kyle McMartin <kyle@fedoraproject.org>
+- kernel-arm64.patch: fix up merge conflict and re-enable
+
+* Tue Aug 05 2014 Josh Boyer <jwboyer@gmail.com> - 3.17.0-0.rc0.git1.1
+- Linux v3.16-3652-gf19107379dbc
+- Reenable debugging options.
+
+* Tue Aug  5 2014 Alexandre Oliva <lxoliva@fsfla.org> -libre Thu Aug  7
 - GNU Linux-libre 3.16-gnu.
 
-* Mon Aug 04 2014 Josh Boyer <jwboyer@gmail.com> - 3.16.0-1
+* Mon Aug 04 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.0-1
 - Linux v3.16
 - Disable debugging options.
 
@@ -3268,1932 +3410,6 @@ fi
 - Linux v3.13
 - Disable debugging options.
 - Use versioned perf man pages tarball
-<<<<<<< HEAD
-
-* Sat Jan 18 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc8.git4.1
-- Linux v3.13-rc8-76-g7d0d46d
-
-* Sat Jan 18 2014 Peter Robinson <pbrobinson@fedoraproject.org>
-- Enable ARM_GLOBAL_TIMER on ARM used by a number of Cortex-A9 and later platforms
-
-* Thu Jan 16 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc8.git3.1
-- Linux v3.13-rc8-46-g85ce70f
-
-* Wed Jan 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc8.git2.1.1
-- Linux v3.13-rc8-27-g2e67c56
-
-* Tue Jan 14 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix k-m-e Provides to be explicit to only the package flavor (rhbz 1046246)
-
-* Tue Jan 14 2014 Kyle McMartin <kyle@fedoraproject.org>
-- aarch64: enable 4K pages and CONFIG_COMPAT.
-
-* Mon Jan 13 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc8.git1.1
-- Linux v3.13-rc8-5-ga6da83f
-- Reenable debugging options.
-
-* Sun Jan 12 2014 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM config updates and cleanups
-- Enable generic cpufreq-cpu0 driver on ARM
-- Enable thermal userspace support for ARM
-
-* Sun Jan 12 2014 Alexandre Oliva <lxoliva@fsfla.org> -libre Mon Jan 13
-- GNU Linux-libre 3.13-rc8-gnu.
-
-* Sun Jan 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc8.git0.1
-- Linux v3.13-rc8
-- Disable debugging options.
-
-* Sat Jan 11 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc7.git5.1
-- Linux v3.13-rc7-126-g228fdc0
-
-* Fri Jan 10 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc7.git4.1
-- Linux v3.13-rc7-87-g21e20e2
-
-* Thu Jan 09 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc7.git3.1
-- Linux v3.13-rc7-72-g7d1c153
-
-* Wed Jan 08 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Disable aic94xx driver (from Paul Bolle)
-- Backport support for ALPS Dolphin devices (rhbz 953211)
-
-* Wed Jan 08 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc7.git2.1
-- Linux v3.13-rc7-67-gceb3b02
-- Enable BCMA_DRIVER_GPIO by turning on GPIOLIB everywhere (rhbz 1021098)
-
-* Tue Jan 07 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Drop -doc subpackage
-
-* Tue Jan 07 2014 Josh Boyer <jwboyer@fedoraproject.com> - 3.13.0-0.rc7.git1.1
-- Linux v3.13-rc7-55-gef350bb
-- Reenable debugging options.
-
-* Tue Jan 07 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Change DEFAULT_MMAP_MIN_ADDR to 64k on x86_64
-
-* Mon Jan 06 2014 Josh Boyer <jwboyer@fedoraproject.org>
-- Add support for Wacom Intuos 5 S devices (rhbz 1046238)
-- Fix use after free crash in KVM (rhbz 1047892)
-- Fix oops in KVM with invalid root_hpa (rhbz 924916)
-
-* Mon Jan  6 2014 Alexandre Oliva <lxoliva@fsfla.org> -libre Thu Jan  9
-- GNU Linux-libre 3.13-rc7-gnu.
-
-* Sun Jan 05 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13-0.0.rc7.git0.1
-- Linux v3.13-rc7
-- Fix xen-netback build failure on ARM
-
-* Mon Dec 30 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc6.git0.1
-- Linux v3.13-rc6
-
-* Mon Dec 23 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc5.git0.1
-- Linux v3.13-rc5
-- Disable debugging options.
-
-* Sat Dec 21 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc4.git5.1
-- Linux v3.13-rc4-256-gb7000ad
-
-* Fri Dec 20 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patches to fix dummy gssd entry (rhbz 1037793)
-
-* Thu Dec 19 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc4.git4.1
-- Linux v3.13-rc4-144-ga36c160
-
-* Thu Dec 19 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- copy kernel trees around with 'cp -al' so symlinks are preserved.  Fixes
-  weird build failures with coreutils 8.22 (rhbz 1044801)
-
-* Wed Dec 18 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc4.git3.1
-- Linux v3.13-rc4-99-g35eecf0
-
-* Wed Dec 18 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc4.git2.1
-- Linux v3.13-rc4-38-gb0031f2
-
-* Wed Dec 18 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Reenable MEMORY_HOTPLUG on x86_64
-- Fix nowatchdog-on-virt.patch to actually work in KVM guests
-
-* Tue Dec 17 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc4.git1.1
-- Linux v3.13-rc4-21-g0eda402
-- Reenable debugging options.
-
-* Mon Dec 16 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc4.git0.1
-- Linux v3.13-rc4
-- Disable debugging options.
-
-* Sat Dec 14 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc3.git5.1
-- Linux v3.13-rc3-362-gb2077eb
-
-* Sat Dec 14 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Wrap doc BR in with_doc
-- Stop building perf in build AND install because that's stupid
-- Use prebuilt perf man pages
-
-* Fri Dec 13 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- More keys fixes from upstream to fix keyctl_get_persisent crash (rhbz 1043033)
-
-* Fri Dec 13 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc3.git4.1
-- Linux v3.13-rc3-302-g8d27637
-
-* Thu Dec 12 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc3.git3.1
-- Linux v3.13-rc3-249-g2208f65
-
-* Thu Dec 12 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- CVE-2013-4587 kvm: out-of-bounds access (rhbz 1030986 1042071)
-- CVE-2013-6376 kvm: BUG_ON in apic_cluster_id (rhbz 1033106 1042099)
-- CVE-2013-6368 kvm: cross page vapic_addr access (rhbz 1032210 1042090)
-- CVE-2013-6367 kvm: division by 0 in apic_get_tmcct (rhbz 1032207 1042081)
-
-* Wed Dec 11 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc3.git2.1
-- Linux v3.13-rc3-174-g9538e10
-
-* Wed Dec 11 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patches to support ETPS/2 Elantech touchpads (rhbz 1030802)
-
-* Tue Dec 10 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc3.git1.2
-- Revert upstream selinux change causing sync hang (rhbz 1033965)
-- Add patch to fix radeon from crashing
-
-* Tue Dec 10 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc3.git1.1
-- Linux v3.13-rc3-157-g17b2112
-- Reenable debugging options.
-
-* Mon Dec 09 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc3.git0.1
-- Linux v3.13-rc3
-- Disable debugging options.
-
-* Fri Dec 06 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc2.git7.1
-- Linux v3.13-rc2-326-g843f4f4
-
-* Fri Dec 06 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc2.git6.1
-- Linux v3.13-rc2-295-g002acf1
-- Add test fix patch for crypto backtrace (rhbz 1038472)
-
-* Thu Dec 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc2.git5.1
-- Linux v3.13-rc2-265-gef1e4e3
-
-* Thu Dec 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc2.git4.1
-- Linux v3.13-rc2-215-g53c6de5
-- Enable PR kvm module on ppc64 (rhbz 1038541)
-
-* Wed Dec 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc2.git3.1
-- Linux v3.13-rc2-208-g8ecffd7
-
-* Tue Dec  3 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM cleanups and remove obsolete options
-
-* Mon Dec 02 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc2.git2.1
-- Linux v3.13-rc2-119-ga45299e
-
-* Mon Dec 02 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc2.git1.1
-- Linux v3.13-rc2-1-gaf91706
-- Reenable debugging options.
-
-* Sat Nov 30 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM config updates
-- Enable sound compressed offload on ARM
-
-* Fri Nov 29 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc3.git0.1
-- Linux v3.13-rc2
-- Disable debugging options.
-
-* Fri Nov 29 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc1.git4.1
-- Linux v3.13-rc1-252-gdda9cc3
-
-* Tue Nov 26 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc1.git3.1
-- Linux v3.13-rc1-128-g0e4b074
-
-* Tue Nov 26 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix crash driver build and re-enable on s390x (from Dan Horák)
-- CVE-2013-6382 xfs: missing check for ZERO_SIZE_PTR (rhbz 1033603 1034670)
-
-* Mon Nov 25 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc1.git2.1
-- Linux v3.13-rc1-85-g7e3528c
-
-* Sun Nov 24 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc1.git1.1
-- Linux v3.13-rc1-77-g4c1cc40
-- Reenable debugging options.
-
-* Sat Nov 23 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc1.git0.1
-- Linux v3.13-rc1
-- Disable debugging options.
-
-* Fri Nov 22 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Fix ARM Utilite DTB
-
-* Fri Nov 22 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git11.1
-- Linux v3.12-11097-ga5d6e63
-- Drop all the keys-* patches because they were merged upstream.  Yay!
-
-* Thu Nov 21 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Some minor ARM config updates
-
-* Thu Nov 21 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git10.1
-- Linux v3.12-10928-g527d151
-- Drop ACPI blacklist year options and patch (removed with upstream commit 4c47cb197e13 )
-
-* Wed Nov 20 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git9.1
-- Linux v3.12-10710-gb4789b8
-
-* Tue Nov 19 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Enable CGROUP_HUGETLB on ppc64/ppc64p7 and x86_64 (rhbz 1031984)
-
-* Tue Nov 19 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git8.1
-- Linux v3.12-10554-g801a760
-
-* Tue Nov 19 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git7.1
-- Linux v3.12-10553-g27b5c3f
-
-* Sun Nov 17 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Fix up ARM usb gadget config to make it useful
-
-* Sun Nov 17 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git6.1
-- Linux v3.12-10087-g1213959
-- Update s390x config from Dan Horák
-
-* Sat Nov 16 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git5.1
-- Linux v3.12-9888-gf63c482
-
-* Thu Nov 14 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git4.1
-- Linux v3.12-8333-g4fbf888
-- Build tmon in kernel-tools
-- Disable ARM NEON optimised AES and OMAP2PLUS cpufreq because they don't build
-
-* Thu Nov 14 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Update ARM configs
-- Enable ARM NEON optimised AES
-
-* Wed Nov 13 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git3.2
-- Enable USER_NS for root-only processes (rhbz 917708)
-
-* Wed Nov 13 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git3.1
-- Linux v3.12-7033-g42a2d92
-
-* Wed Nov 13 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patch to fix imx-drm build issues
-
-* Wed Nov 13 2013 Adam Jackson <ajax@redhat.com>
-- Hush i915's check_crtc_state()
-
-* Tue Nov 12 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git2.1
-- Linux v3.12-4849-g10d0c97
-
-* Mon Nov 11 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git1.3
-- Linux v3.12-2839-gedae583
-- Reenable debugging options.
-
-* Sat Nov 09 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-2
-- Add patch from Daniel Stone to avoid high order allocations in evdev
-- Add qxl backport fixes from Dave Airlie
-
-* Tue Nov 05 2013 Kyle McMartin <kyle@fedoraproject.org>
-- Enable crash on {arm,aarch64,ppc64,s390x}
-
-* Mon Nov  4 2013 Alexandre Oliva <lxoliva@fsfla.org> -libre
-- GNU Linux-libre 3.12-gnu.
-
-* Mon Nov 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-1
-- Linux v3.12
-- Disable debugging options.
-
-* Fri Nov 01 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc7.git4.1
-- Linux v3.12-rc7-111-g9581b7d
-
-* Fri Nov 01 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc7.git3.1
-- Linux v3.12-rc7-79-g4f794ee
-- Set NR_CPUS=1024 on non-debug x86_64 builds (MAXSMP is set on debug)
-
-* Fri Nov 01 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- CVE-2013-4348 net: deadloop path in skb_flow_dissect (rhbz 1007939 1025647)
-
-* Thu Oct 31 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc7.git2.1
-- Linux v3.12-rc7-48-g12aee27
-
-* Tue Oct 29 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc7.git1.1
-- Linux v3.12-rc7-9-gc9ca72f
-- Fixes sg_open lock held when returning to userspace (rhbz 1018620)
-- Reenable debugging options.
-
-* Tue Oct 29 2013 Alexandre Oliva <lxoliva@fsfla.org> -libre Wed Oct 30
-- GNU Linux-libre 3.12-rc7-gnu.
-
-* Mon Oct 28 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc7.git0.1
-- Linux v3.12-rc7
-- Disable debugging options.
-
-* Fri Oct 25 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add touchpad support for Dell XT2 (rhbz 1023413)
-
-* Fri Oct 25 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc6.git4.1
-- Linux v3.12-rc6-292-g4208c47
-
-* Thu Oct 24 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Add patch for i.MX6 Utilite device dtb
-
-* Thu Oct 24 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc6.git3.1
-- Linux v3.12-rc6-284-ge6036c0
-
-* Wed Oct 23 2013 Kyle McMartin <kyle@fedoraproject.org>
-- Clean up some BuildRequires that reference hilariously old packages.
-  Replace module-init-tools BR with kmod.
-
-* Wed Oct 23 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc6.git2.1
-- Linux v3.12-rc6-275-g320437af
-
-* Tue Oct 22 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Build virtio drivers as modules (rhbz 1019569)
-
-* Tue Oct 22 2013 Adam Jackson <ajax@redhat.com>
-- Drop voodoo1 fbdev driver
-
-* Tue Oct 22 2013 Kyle McMartin <kyle@fedoraproject.org>
-- Clean up kernel Provides, nobody references kernel-drm, or kernel-modeset...
-  drop pre-F20 ARM flavor names. Turn off AutoProv on the main kernel package.
-
-* Tue Oct 22 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patch to fix warning in tcp_fastretrans_alert (rhbz 989251)
-
-* Tue Oct 22 2013 Kyle McMartin <kyle@fedoraproject.org>
-- armv7hl,aarch64: re-enable kernel-modules-extra temporarily
-
-* Tue Oct 22 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc6.git1.1
-- Linux v3.12-rc6-57-g69c88dc
-- Reenable debugging options.
-
-* Tue Oct 22 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM config update
-
-* Mon Oct 21 2013 Kyle McMartin <kyle@fedoraproject.org>
-- aarch64: add AFTER_LINK to $vdsold for debuginfo generation of the vdso.
-
-* Sun Oct 20 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Build BIG_KEYS into the kernel (rhbz 1017683)
-
-* Sun Oct 20 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Enable U8500 SoC (Snowball) on ARM
-
-* Sun Oct 20 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc6.git0.1
-- Linux v3.12-rc6
-- Disable debugging options.
-
-* Fri Oct 18 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc5.git4.1
-- Linux v3.12-rc5-123-g04919af
-
-* Fri Oct 18 2013 Josh Boyer <jwboyer@fedoraproject.org> 
-- Fix keyring quota misaccounting (rhbz 1017683)
-
-* Thu Oct 17 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc5.git3.1
-- Linux v3.12-rc5-78-g056cdce
-
-* Thu Oct 17 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patch to fix BusLogic error (rhbz 1015558)
-- Fix rt2800usb polling timeouts and throughput issues (rhbz 984696)
-
-* Wed Oct 16 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix btrfs balance/scrub issue (rhbz 1011714)
-- Clean up a bunch of stale patches
-
-* Wed Oct 16 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc5.git2.1
-- Linux v3.12-rc5-48-g34ec4de
-
-* Wed Oct 16 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- ARM config updates for IIO and enable sensors for ARM platforms
-
-* Wed Oct 16 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Enable VIRTIO_CONSOLE as a module on all ARM (rhbz 1005551)
-
-* Tue Oct 15 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Enable IIO and various sensor options for Win8 laptops (rhbz 995510)
-
-* Tue Oct 15 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc5.git1.1
-- Linux v3.12-rc5-36-g1e52db6
-- Reenable debugging options.
-
-* Mon Oct 14 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc5.git0.1
-- Linux v3.12-rc5
-- Disable debugging options.
-
-* Sun Oct 13 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM config updates/cleanups
-- ARM GPIO/I2C updates
-- ARM usb gadget updates
-
-* Sat Oct 12 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc4.git4.1
-- Linux v3.12-rc4-91-g46f3751
-
-* Fri Oct 11 2013 Kyle McMartin <kyle@fedoraproject.org>
-- Turn off some drivers on aarch64 and armv7hl that are unlikely to ever be
-  seen there.
-
-* Fri Oct 11 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc4.git3.1
-- Fix segfault in cpupower set (rhbz 1000439)
-- Linux v3.12-rc4-62-g2fe80d3
-
-* Thu Oct 10 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix large order allocation in dm mq policy (rhbz 993744)
-
-* Wed Oct 09 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc4.git2.1
-- Don't trigger a stack trace on crashing iwlwifi firmware (rhbz 896695)
-- Linux v3.12-rc4-29-g0e7a3ed
-
-* Wed Oct 09 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patch to fix VFIO IOMMU crash (rhbz 998732)
-
-* Tue Oct 8  2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Tiny ARM config update
-
-* Tue Oct 08 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc4.git1.1
-- Linux v3.12-rc4-19-g8b5ede6
-- Reenable debugging options.
-- Quiet irq remapping stack trace (rhbz 982153)
-
-* Mon Oct 7  2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- General ARM config cleanups
-- Remove old/dupe ARM config options
-- Enable external connectors on ARM
-- Enable i.MX and TI thermal controllers
-- Enable i.MX RNG driver
-- ARM MFD and REGULATOR changes and cleanups
-- AM33xx (BeagleBone) config improvements
-- Rebase OMAP DVI patch
-- Enable console for Zynq-7xxx SoCs
-
-* Sun Oct 06 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc4.git0.1
-- Linux v3.12-rc4
-- Disable debugging options.
-
-* Fri Oct 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc3.git5.1
-- Linux v3.12-rc3-296-g15c83d2
-
-* Thu Oct 03 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc3.git4.1
-- Linux v3.12-rc3-267-g6d15ee4
-
-* Thu Oct 03 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patch to support not importing certs from db
-
-* Thu Oct 03 2013 Kyle McMartin <kyle@fedoraproject.org>
-- Add config-no-extra and disable with_extra on ARM and AArch64 to reduce
-  time building untestable code (because the hardware doesn't exist, or it
-  would be futile.)
-
-* Thu Oct 03 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc3.git3.1
-- Linux v3.12-rc3-253-ge6e7fb1
-
-* Wed Oct 02 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc3.git2.1
-- Linux v3.12-rc3-186-gc31eeac
-- Enable options for Intel Low Power Subsystem Support
-
-* Tue Oct 01 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc3.git1.1
-- Linux v3.12-rc3-65-gf927318
-- Reenable debugging options.
-
-* Mon Sep 30 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add support for rf3070 devices from Stanislaw Gruszka (rhbz 974072)
-- Drop VC_MUTE patch (rhbz 859485)
-
-* Mon Sep 30 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc3.git0.1
-- Linux v3.12-rc3
-- Disable debugging options.
-
-* Sun Sep 29 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc2.git4.1
-- Linux v3.12-rc2-160-g669fc2f
-
-* Fri Sep 27 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc2.git3.1
-- Linux v3.12-rc2-108-g6cac446
-
-* Fri Sep 27 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patch to fix oops from applesmc (rhbz 1011719)
-- Add patches to fix soft lockup from elevator changes (rhbz 902012)
-
-* Thu Sep 26 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc2.git2.1
-- Linux v3.12-rc2-83-g4b97280
-
-* Wed Sep 25 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc2.git1.1
-- Linux v3.12-rc2-33-g22356f4
-- Reenable debugging options.
-
-* Wed Sep 25 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix debuginfo_args regex for + separator (rhbz 1009751)
-- Fix invalid value passed to pci_unmap_single in skge (rhbz 1008323)
-
-* Tue Sep 24 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc2.git0.1
-- Linux v3.12-rc2
-- Disable debugging options.
-
-* Mon Sep 23 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Revert rt2x00 commit that breaks connectivity (rhbz 1010431)
-
-* Mon Sep 23 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc1.git6.1
-- Linux v3.12-rc1-336-gd8524ae
-
-* Fri Sep 20 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc1.git5.1
-- Linux v3.12-rc1-250-g7b9e3a6
-
-* Fri Sep 20 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix RTC updates from ntp (rhbz 985522)
-
-* Fri Sep 20 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc1.git4.1
-- Linux v3.12-rc1-250-g7b9e3a6
-
-* Thu Sep 19 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc1.git3.1
-- Linux v3.12-rc1-101-ged24fee
-
-* Wed Sep 18 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc1.git2.1
-- Linux v3.12-rc1-46-g9baa505
-
-* Wed Sep 18 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc1.git1.1
-- Linux v3.12-rc1-27-g62d228b
-- Reenable debugging options.
-
-* Tue Sep 17 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- CVE-2013-4345 ansi_cprng: off by one error in non-block size request (rhbz 1007690 1009136)
-
-* Tue Sep 17 2013 Kyle McMartin <kyle@redhat.com>
-- Add nvme.ko to modules.block for anaconda.
-
-* Tue Sep 17 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc1.git0.1
-- Linux v3.12-rc1
-- Disable debugging options.
-
-* Sun Sep 15 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git26.1
-- Linux v3.11-10064-gbff157b
-
-* Sat Sep 14 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Update keys-x509-improv.patch to latest back from upstream git
-
-* Sat Sep 14 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git25.1
-- Linux v3.11-10050-g3711d86
-
-* Fri Sep 13 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git24.1
-- Linux v3.11-10007-g399a946
-
-* Fri Sep 13 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patch to fix btrfs build on ARM
-- CVE-2013-4350 net: sctp: ipv6 ipsec encryption bug in sctp_v6_xmit (rhbz 1007872 1007903)
-- CVE-2013-4343 net: use-after-free TUNSETIFF (rhbz 1007733 1007741)
-
-* Thu Sep 12 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git23.1
-- Linux v3.11-9747-gff812d7
-
-* Thu Sep 12 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git22.1
-- Linux v3.11-9420-gd5d04bb
-
-* Thu Sep 12 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git21.1
-- Linux v3.11-9411-gc2d9572
-
-* Wed Sep 11 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git20.1
-- Linux v3.11-9031-ga22a0fd
-
-* Tue Sep 10 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git19.1
-- Linux v3.11-8935-g31f7c3a
-
-* Tue Sep 10 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git18.1
-- Linux v3.11-8716-g26b0332
-
-* Mon Sep  9 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Enable OF option to allocate CMA memory using device tree on ARM
-
-* Mon Sep 09 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git17.1
-- Linux fscache-fixes-for-ceph-8429-g300893b
-
-* Mon Sep 09 2013 Kyle McMartin <kyle@redhat.com>
-- [arm] re-enable CONFIG_PCIEPORTBUS, now that tegra is fixed upstream.
-
-* Mon Sep 09 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git16.1
-- Linux v3.11-7890-ge5c832d
-
-* Mon Sep 09 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git15.1
-- Linux v3.11-7547-g44598f9
-
-* Sun Sep  8 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor updates to OMAP and AM33xx
-
-* Sat Sep 07 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patch to fix ARM kernel neon build
-
-* Fri Sep 06 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git14.1
-- Linux v3.11-6855-g4de9ad9
-
-* Fri Sep 06 2013 Kyle McMartin <kyle@redhat.com>
-- [arm] enable KERNEL_MODE_NEON, safe to do, as the raid6 code tests hwcaps
-  so it won't impact tegra.
-
-* Fri Sep 06 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git13.1
-- Linux v3.11-6422-g2e03285
-
-* Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git12.1
-- Linux v3.11-4809-ga09e9a7
-
-* Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git11.1
-- Fix perf build on ARM (from Kyle McMartin)
-
-* Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Linux v3.11-3891-gae7a835
-
-* Thu Sep 05 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git10.1
-- Linux v3.11-3120-g816434e
-
-* Thu Sep 5 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Fixup perf build
-
-* Wed Sep 4 2013 Kyle McMartin <kyle@redhat.com>
-- [arm] Disable CONFIG_PCIEPORTBUS in arm-generic, causes untold problems
-  with registering bus windows on tegra.
-
-* Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git9.1
-- Linux v3.11-3070-gcb3e433
-
-* Wed Sep 4 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Update linux-firmware requirements for newer radeon firmware (rhbz 988268 972518)
-
-* Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git8.1
-- Linux v3.11-2654-g458c3f6
-
-* Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git7.1
-- Linux v3.11-2529-ga923874
-
-* Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git6.1
-- Linux v3.11-2455-g40031da
-
-* Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git5.1
-- Linux v3.11-2200-gf66c83d
-
-* Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git4.1
-- Linux v3.11-1851-g7511442
-
-* Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git3.1
-- Linux v3.11-782-g1d1fdd9
-
-* Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git2.1
-- Linux v3.11-716-gb3b4911
-
-* Wed Sep  4 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Add patch set to fix MMC on AM33xx
-- Add support for BeagleBone Black (very basic!)
-- Renable cpuidle on ARM, was disabled sometime back due to instability
-
-* Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git1.1
-- Linux v3.11-351-g1ccfd5e
-- Reenable debugging options.
-
-* Tue Sep 03 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-3
-- Add system_keyring patches back in
-
-* Tue Sep 03 2013 Kyle McMartin <kyle@redhat.com>
-- Pull in some Calxeda highbank fixes that are destined for 3.12
-- Add a %with_extra twiddle to disable building kernel-modules-extra
-  subpackages.
-- Fix dtbs install path to use %install_image_path (not that it's different
-  at the moment.)
-
-* Tue Sep 03 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add keyring patches to support krb5 (rhbz 1003043)
-
-* Tue Sep 03 2013 Kyle McMartin <kyle@redhat.com>
-- [arm64] disable VGA_CONSOLE and PARPORT_PC
-- [arm64] install dtb as on %{arm}
-
-* Tue Sep  3 2013 Alexandre Oliva <lxoliva@fsfla.org> -libre
-- GNU Linux-libre 3.11-gnu.
-
-* Tue Sep 03 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-1
-- Linux v3.11
-- Disable debugging options.
-
-* Mon Sep 02 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc7.git5.1
-- Linux v3.11-rc7-96-ga878764
-
-* Sun Sep  1 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Build in OMAP MMC again (fix at least omap3)
-
-* Sat Aug 31 2013 Alexandre Oliva <lxoliva@fsfla.org> -libre
-- GNU Linux-libre 3.11-rc7-gnu 42-gd9eda0f.
-
-* Sat Aug 31 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc7.git4.1
-- Linux v3.11-rc7-42-gd9eda0f
-
-* Fri Aug 30 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Fix HID CVEs.  Absurd.
-- CVE-2013-2888 rhbz 1000451 1002543 CVE-2013-2889 rhbz 999890 1002548
-- CVE-2013-2891 rhbz 999960 1002555  CVE-2013-2892 rhbz 1000429 1002570
-- CVE-2013-2893 rhbz 1000414 1002575 CVE-2013-2894 rhbz 1000137 1002579
-- CVE-2013-2895 rhbz 1000360 1002581 CVE-2013-2896 rhbz 1000494 1002594
-- CVE-2013-2897 rhbz 1000536 1002600 CVE-2013-2899 rhbz 1000373 1002604
-
-* Fri Aug 30 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc7.git3.1
-- Linux v3.11-rc7-30-g41615e8
-
-* Fri Aug 30 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Rework Secure Boot support to use the secure_modules approach
-- Drop pekey
-
-* Thu Aug 29 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc7.git2.1
-- Linux v3.11-rc7-24-gc95389b
-- Add mei patches that fix various s/r issues (rhbz 994824 989373)
-
-* Wed Aug 28 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc7.git1.1
-- Linux v3.11-rc7-14-gfa8218d
-- Reenable debugging options.
-
-* Tue Aug 27 2013 Kyle McMartin <kyle@redhat.com>
-- [arm] build pinctrl-single in, needed to prevent deferral of
-  omap_serial registration.
-
-* Mon Aug 26 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc7.git0.1
-- Linux v3.11-rc7
-- Disable debugging options.
-
-* Fri Aug 23 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc6.git4.1
-- Linux v3.11-rc6-139-g89b53e5
-
-* Fri Aug 23 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc6.git3.1
-- Linux v3.11-rc6-76-g6a7492a
-
-* Fri Aug 23 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM config cleanups
-- Enable some IOMMU drivers on ARM
-- Enable some i.MX sound drivers
-
-* Thu Aug 22 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc6.git2.1
-- Linux v3.11-rc6-72-g1f8b766
-
-* Thu Aug 22 2013 Kyle McMartin <kyle@redhat.com>
-- Drop arm-tegra-remove-direct-vbus-regulator-control.patch, proper fix
-  will be in the next rebase.
-
-* Wed Aug 21 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc6.git1.2
-- Add patch to fix brcmsmac oops (rhbz 989269)
-- CVE-2013-0343 handling of IPv6 temporary addresses (rhbz 914664 999380)
-
-* Tue Aug 20 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc6.git1.1
-- Linux v3.11-rc6-28-gfd3930f
-- Reenable debugging options.
-
-* Tue Aug 20 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Disable Dell RBU so userspace firmware path isn't selected (rhbz 997149)
-
-* Mon Aug 19 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc6.git0.1
-- Linux v3.11-rc6
-- Disable debugging options.
-
-* Mon Aug 19 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor kernel configs cleanup merging duplicated config opts into generic
-
-* Sun Aug 18 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc5.git6.1
-- Linux v3.11-rc5-168-ga08797e
-
-* Sat Aug 17 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc5.git5.1
-- Linux v3.11-rc5-165-g215b28a
-
-* Fri Aug 16 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Update ARM drivers config for Zynq 7000 devices
-
-* Fri Aug 16 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc5.git4.1
-- Linux v3.11-rc5-150-g0f7dd1a
-
-* Fri Aug 16 2013 Josh Boyer <jwboyer@fedoraproject.org>
-- Add patch from Nathanael Noblet to fix mic on Gateway LT27 (rhbz 845699)
-
-* Thu Aug 15 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Major cleanup of arm64 config
-- Add patch to enable build exynos5 as multi platform for lpae
-- Minor cleanup of ARMv7 configs
-
-* Thu Aug 15 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc5.git3.1
-- Enable CONFIG_HID_SENSOR_HUB (rhbz 995510)
-- Add patch to fix regression on TeVII S471 devices (rhbz 963715)
-- Linux v3.11-rc5-35-gf1d6e17
-
-* Wed Aug 14 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc5.git2.1
-- Linux v3.11-rc5-21-g28fbc8b
-- Disable WIMAX.  It's fairly broken and abandoned upstream.
-
-* Tue Aug 13 2013 Josh Boyer <jwboyer@gmail.com> - 3.11.0-0.rc5.git1.1
-- Linux v3.11-rc5-13-g584d88b
-- Reenable debugging options.
-
-* Mon Aug 12 2013 Josh Boyer <jwboyer@gmail.com> - 3.11.0-0.rc5.git0.1
-- Linux v3.11-rc5
-- Disable debugging options.
-
-* Sun Aug 11 2013 Josh Boyer <jwboyer@gmail.com> - 3.11.0-0.rc4.git5.1
-- Linux v3.11-rc4-216-g77f63b4
-
-* Sun Aug 11 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Drop a bunch of generic dupe config from aarch64
-
-* Sat Aug 10 2013 Josh Boyer <jwboyer@gmail.com> - 3.11.0-0.rc4.git4.1
-- Linux v3.11-rc4-162-g14e9419
-
-* Fri Aug 09 2013 Josh Boyer <jwboyer@gmail.com> - 3.11.0-0.rc4.git3.1
-- Linux v3.11-rc4-103-g6c2580c
-
-* Wed Aug 07 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc4.git2.1
-- Linux v3.11-rc4-27-ge4ef108
-- Add zero file length check to make sure pesign didn't fail (rhbz 991808)
-
-* Tue Aug 06 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc4.git1.1
-- Linux v3.11-rc4-20-g0fff106
-- Reenable debugging options.
-- Don't package API man pages in -doc (rhbz 993905)
-
-* Mon Aug 05 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc4.git0.1
-- Linux v3.11-rc4
-- Disable debugging options.
-
-* Sun Aug 04 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc3.git4.1
-- Linux v3.11-rc3-376-g72a67a9
-
-* Sat Aug 03 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc3.git3.1
-- Linux v3.11-rc3-288-gabe0308
-
-* Fri Aug 02 2013 Kyle McMartin <kyle@redhat.com> - 3.11.0-0.rc3.git2.1
-- radeon-si_calculate_leakage-use-div64.patch: fix a compile error on i686.
-- arm: disable CONFIG_LOCK_STAT, bloats .data massively, revisit shortly.
-- arm: build-in more rtc drivers.
-
-* Fri Aug 02 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc3.git2.1
-- Linux v3.11-rc3-207-g64ccccf
-
-* Thu Aug  1 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM config update
-
-* Thu Aug 01 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix mac80211 connection issues (rhbz 981445)
-- Fix firmware issues with iwl4965 and rfkill (rhbz 977053)
-- Drop hid-logitech-dj patch that was breaking enumeration (rhbz 989138)
-
-* Tue Jul 30 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc3.git1.1
-- Linux v3.11-rc3-4-g36f571e
-- Reenable debugging options.
-
-* Tue Jul 30 2013 Josh Boyer <jwboyer@redhat.com>
-- Revert some changes to make Logitech devices function properly (rhbz 989138)
-
-* Mon Jul 29 2013 Kyle McMartin <kyle@redhat.com> - 3.11.0-0.rc3.git0.1
-- arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch: ditto
-
-* Mon Jul 29 2013 Kyle McMartin <kyle@redhat.com>
-- arm-dma-amba_pl08x-avoid-64bit-division.patch: STAHP libgcc callouts
-
-* Mon Jul 29 2013 Josh Boyer <jwboyer@redhat.com>
-- Linux v3.11-rc3
-- Disable debugging options.
-- Always include x509.genkey in Sources list
-
-* Fri Jul 26 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc2.git4.1
-- Linux v3.11-rc2-333-ga9b5f02
-
-* Fri Jul 26 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patch to fix NULL deref in iwlwifi (rhbz 979581)
-
-* Thu Jul 25 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc2.git3.1
-- Linux v3.11-rc2-185-g07bc9dc
-
-* Wed Jul 24 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc2.git2.1
-- Linux v3.11-rc2-158-g04012e3
-
-* Tue Jul 23 2013 Kyle McMartin <kyle@redhat.com>
-- arm-tegra-remove-direct-vbus-regulator-control.patch: backport patches
-  to fix ehci-tegra.
-
-* Tue Jul 23 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc2.git1.1
-- Linux v3.11-rc2-93-gb3a3a9c
-
-* Mon Jul 22 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc2.git0.2
-- let flavors/variants end with "+$flavor" in the uname patch from harald@redhat.com
-- Reenable debugging options.
-
-* Mon Jul 22 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix timer issue in bridge code (rhbz 980254)
-
-* Mon Jul 22 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc2.git0.1
-- Linux v3.11-rc2
-- Disable debugging options.
-
-* Sun Jul 21 2013 Kyle McMartin <kmcmartin@redhat.com> - 3.11.0-0.rc1.git4.1
-- Linux v3.11-rc1-247-g90db76e
-
-* Sun Jul 21 2013 Kyle McMartin <kyle@redhat.com>
-- arm-omap-bbb-dts.patch: disable for now, it needs too much work for
-  a sunday morning.
-
-* Fri Jul 19 2013 Kyle McMartin <kyle@redhat.com>
-- arm-omap-bbb-dts.patch: fix arch/arm/boot/dtb/Makefile rule
-
-* Fri Jul 19 2013 Kyle McMartin <kmcmartin@redhat.com> - 3.11.0-0.rc1.git3.1
-- Linux v3.11-rc1-181-gb8a33fc
-
-* Fri Jul 19 2013 Kyle McMartin <kmcmartin@redhat.com> - 3.11.0-0.rc1.git2.1
-- Linux v3.11-rc1-135-g0a693ab
-
-* Thu Jul 18 2013 Kyle McMartin <kyle@redhat.com>
-- Applied patch from Kay Sievers to kill initscripts Conflicts & Requires and
-  udev Conflicts...
-- And then clean up some of the ancient crap from our Conflicts and Requires
-  which reference versions not shipped since 2006.
-
-* Thu Jul 18 2013 Kyle McMartin <kyle@redhat.com>
-- devel-sysrq-secure-boot-20130717.patch: add a patch that allows the user to
-  disable secure boot restrictions from the local console or local serial
-  (but not /proc/sysrq-trigger or via uinput) by using SysRQ-x.
-
-* Wed Jul 17 2013 Kyle McMartin <kyle@redhat.com> - 3.11.0-0.rc1.git1.1
-- Linux v3.11-rc1-19-gc0d15cc
-- Reenable debugging options.
-
-* Wed Jul 17 2013 Kyle McMartin <kyle@redhat.com>
-- update s390x config [Dan Horák]
-
-* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 3.11.0-0.rc1.git0.2
-- Perl 5.18 rebuild
-
-* Wed Jul 17 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Add patch for BeagleBone Black DTB
-
-* Tue Jul 16 2013 Kyle McMartin <kyle@redhat.com> - 3.11.0-0.rc1.git0.1
-- Linux v3.11-rc1
-- Disable debugging options.
-- Fix %kernel_modules warning.
-
-* Sun Jul 14 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Update ARM config
-- Enable USB gadget module on ARM to fix build i.MX usb modules
-
-* Sun Jul 14 2013 Dennis Gilmore <dennis@ausil.us>
-- update and reenable wandboard quad dtb patch
-
-* Fri Jul 12 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc0.git7.1
-- Linux v3.10-9289-g9903883
-
-* Fri Jul 12 2013 Dave Jones <davej@redhat.com> - 3.11.0-0.rc0.git6.4
-- Disable LATENCYTOP/SCHEDSTATS in non-debug builds.
-
-* Fri Jul 12 2013 Josh Boyer <jwboyer@redhat.com>
-- Add iwlwifi fix for connection issue (rhbz 885407)
-
-* Thu Jul 11 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc0.git6.1
-- Linux v3.10-9080-g19d2f8e
-
-* Thu Jul 11 2013 Kyle McMartin <kyle@redhat.com>
-- Enable USB on Wandboard Duallite and other i.MX based boards, patch
-  from Niels de Vos.
-
-* Thu Jul 11 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- ARM config cleanups and changes for 3.11
-
-* Wed Jul 10 2013 Kyle McMartin <kyle@redhat.com>
-- Fix crash-driver.patch to properly use page_is_ram. 
-
-* Tue Jul 09 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc0.git3.1
-- Linux v3.10-6378-ga82a729
-
-* Mon Jul  8 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Initial ARM config for 3.11
-
-* Mon Jul 08 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc0.git2.1
-- Linux v3.10-6005-gd2b4a64
-- Reenable debugging options.
-
-* Fri Jul 05 2013 Josh Boyer <jwboyer@redhat.com>
-- Add vhost-net use-after-free fix (rhbz 976789 980643)
-- Add fix for timer issue in bridge code (rhbz 980254)
-
-* Wed Jul 03 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patches to fix iwl skb managment (rhbz 977040)
-
-* Tue Jul 02 2013 Dennis Gilmore <dennis@ausil.us> - 3.10-2
-- create a dtb for wandboard quad
-
-* Mon Jul  1 2013 Alexandre Oliva <lxoliva@fsfla.org> -libre
-- GNU Linux-libre 3.10-gnu.
-
-* Mon Jul 01 2013 Justin M. Forbes <jforbes@redhat.com> - 3.10-1
-- Linux v3.10
-
-* Fri Jun 28 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Only enable ARM A15 errata on the LPAE kernel as it breaks A8
-
-* Thu Jun 27 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix stack memory usage for DMA in ath3k (rhbz 977558)
-
-* Wed Jun 26 2013 Josh Boyer <jwboyer@redhat.com>
-- Add two patches to fix bridge networking issues (rhbz 880035)
-
-* Mon Jun 24 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix battery issue with bluetooth keyboards (rhbz 903741)
-
-* Mon Jun 24 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc7.git0.1
-- Linux v3.10-rc7
-- Disable debugging options.
-
-* Tue Jun 18 2013 Dave Jones <davej@redhat.com>
-- Disable MTRR sanitizer by default.
-
-* Tue Jun 18 2013 Justin M. Forbes <jforbes@redhat.com> - 3.10.0-0.rc6.git0.4
-- Testing the test harness
-
-* Tue Jun 18 2013 Justin M. Forbes <jforbes@redhat.com> - 3.10.0-0.rc6.git0.3
-- Reenable debugging options.
-
-* Mon Jun 17 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patch to fix radeon issues on powerpc
-
-* Mon Jun 17 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc6.git0.1
-- Linux v3.10-rc6
-
-* Fri Jun 14 2013 Kyle McMartin <kyle@redhat.com>
-- ARM64 support (config-arm64)
-  Split out some config-armv7-generic options common between 32-bit and 64-bit
-  ARM into a new config-arm-generic, and use that as a base for
-  both.
-  Buildable in rawhide, and F-19 by installing {gcc,binutils}-aarch64-linux-gnu
-  and running:
-  rpmbuild --rebuild --target $ARCH --with cross --without perf \
-    --without tools --without debuginfo --define "_arch aarch64" \
-    --define "_build_arch aarch64" \
-    --define "__strip /usr/bin/aarch64-linux-gnu-strip" kernel*.src.rpm
-  As rpm in F-19 doesn't have aarch64-linux macros yet.
-
-* Thu Jun 13 2013 Kyle McMartin <kyle@redhat.com>
-- Introduce infrastructure for cross-compiling Fedora kernels. Intended to
-  assist building for secondary architectures like ppc64, s390x, and arm.
-  To use, create an .src.rpm using "fedpkg srpm" and then run
-  "rpmbuild --rebuild --target t --with cross --without perf --without tools \
-    kernel*.src.rpm" to cross compile. This requires binutils and gcc
-  packages named like %_target_cpu, which all but powerpc64 currently provides
-  in rawhide/F-19. Can't (currently) cross compile perf or kernel-tools, since
-  libc is missing from the cross environment.
-
-* Thu Jun 13 2013 Kyle McMartin <kyle@redhat.com>
-- arm-export-read_current_timer.patch: drop upstream patch
-  (results in duplicate exports)
-
-* Wed Jun 12 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM config updates
-
-* Wed Jun 12 2013 Kyle McMartin <kmcmarti@redhat.com>
-- Merge %{with_pae} and %{with_lpae} so both ARM and i686 use the same
-  flavours. Set %{pae} to the flavour name {lpae, PAE}. Merging
-  the descriptions would be nice, but is somewhat irrelevant...
-
-* Wed Jun 12 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix KVM divide by zero error (rhbz 969644)
-- Add fix for rt5390/rt3290 regression (rhbz 950735)
-
-* Tue Jun 11 2013 Dave Jones <davej@redhat.com>
-- Disable soft lockup detector on virtual machines. (rhbz 971139)
-
-* Tue Jun 11 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patches to fix MTRR issues in 3.9.5 (rhbz 973185)
-- Add two patches to fix issues with vhost_net and macvlan (rhbz 954181)
-
-* Tue Jun 11 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc5.git0.1
-- Linux v3.10-rc5
-- CVE-2013-2164 information leak in cdrom driver (rhbz 973100 973109)
-
-* Mon Jun 10 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Enable Freescale i.MX platforms and initial config
-
-* Fri Jun 07 2013 Josh Boyer <jwboyer@redhat.com>
-- CVE-2013-2851 block: passing disk names as format strings (rhbz 969515 971662)
-- CVE-2013-2852 b43: format string leaking into error msgs (rhbz 969518 971665)
-
-* Thu Jun 06 2013 Josh Boyer <jwboyer@redhat.com>
-- CVE-2013-2148 fanotify: info leak in copy_event_to_user (rhbz 971258 971261)
-- CVE-2013-2147 cpqarray/cciss: information leak via ioctl (rhbz 971242 971249)
-
-* Wed Jun 05 2013 Josh Boyer <jwboyer@redhat.com>
-- CVE-2013-2140 xen: blkback: insufficient permission checks for BLKIF_OP_DISCARD (rhbz 971146 971148)
-
-* Tue Jun 04 2013 Dave Jones <davej@redhat.com> - 3.10.0-0.rc4.git0.1
-- 3.10-rc4
-  merged: radeon-use-max_bus-speed-to-activate-gen2-speeds.patch
-  merged: iscsi-target-fix-heap-buffer-overflow-on-error.patch
-
-* Mon Jun 03 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix UEFI anti-bricking code (rhbz 964335)
-
-* Mon Jun  3 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM config changes
-
-* Sun Jun  2 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Add patch to fix DRM/X on omap (panda)
-- Enable Cortex-A8 errata on multiplatform kernels (omap3)
-- Minor ARM config updates
-
-* Fri May 31 2013 Josh Boyer <jwboyer@redhat.com>
-- CVE-2013-2850 iscsi-target: heap buffer overflow on large key error (rhbz 968036 969272)
-
-* Thu May 30 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM config update for tegra (AC100)
-
-* Mon May 27 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc3.git0.1
-- Linux v3.10-rc3
-- Disable debugging options.
-
-* Mon May 27 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM updates
-
-* Fri May 24 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patch to quiet irq remapping failures (rhbz 948262)
-
-* Fri May 24 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc2.git3.1
-- Linux v3.10-rc2-328-g0e255f1
-
-* Fri May 24 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc2.git2.1
-- Linux v3.10-rc2-221-g514e250
-
-* Thu May 23 2013 Kyle McMartin <kyle@redhat.com>
-- Fix modules.* removal from /lib/modules/$KernelVer
-
-* Thu May 23 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix oops from incorrect rfkill set in hp-wmi (rhbz 964367)
-
-* Wed May 22 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc2.git1.1
-- Linux v3.10-rc2-68-gbb3ec6b
-- Reenable debugging options.
-
-* Tue May 21 2013 Kyle McMartin <kyle@redhat.com>
-- Rewrite the modinfo license check to generate significantly less noise in
-  build logs.
-- Ditto for the modules.* removal (and move it earlier, as pointed out by jwb)
-
-* Tue May 21 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Enable OMAP5 on ARM multiplatform
-
-* Tue May 21 2013 Kyle McMartin <kyle@redhat.com> - 3.10.0-0.rc2.git0.2
-- Disable debugging options.
-
-* Mon May 20 2013 Kyle McMartin <kyle@redhat.com> - 3.10.0-0.rc2.git0.1
-- Linux v3.10-rc2
-- Disable debugging options
-
-* Mon May 20 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM update
-
-* Mon May 20 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc1.git7.1
-- Linux v3.10-rc1-369-g343cd4f
-
-* Fri May 17 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc1.git6.1
-- Linux v3.10-rc1-266-gec50f2a
-
-* Thu May 16 2013 Josh Boyer <jwboyer@redhat.com>
-- Enable memory cgroup swap accounting (rhbz 918951)
-- Fix config-local usage (rhbz 950841)
-
-* Wed May 15 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc1.git5.1
-- Linux v3.10-rc1-185-gc240a53
-
-* Wed May 15 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patch from Harald Hoyer to migrate to using kernel-install
-
-* Wed May 15 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc1.git4.1
-- Linux v3.10-rc1-120-gb973425
-
-* Tue May 14 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc1.git3.1
-- Linux v3.10-rc1-113-ga2c7a54
-
-* Tue May 14 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc1.git2.1
-- Linux v3.10-rc1-79-gdbbffe6
-
-* Mon May 13 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc1.git1.1
-- Linux v3.10-rc1-34-g1f63876
-
-* Mon May 13 2013 Josh Boyer <jwboyer@redhat.com>
-- Add radeon fixes for PCI-e gen2 speed issues (rhbz 961527)
-
-* Mon May 13 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc1.git0.2
-- Reenable debugging options.
-
-* Mon May 13 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc1.git0.1
-- Linux v3.10-rc1
-- Disable debugging options.
-
-* Sat May 11 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Another patch to fix ARM kernel build
-
-* Fri May 10 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Add patch to fix exynosdrm build, drop old tegra patches, minor config updates
-
-* Fri May 10 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git26.1
-- Linux v3.9-12555-g2dbd3ca
-
-* Fri May 10 2013 Josh Boyer <jwboyer@redhat.com>
-- Enable RTLWIFI_DEBUG in debug kernels (rhbz 889425)
-- Switch the loop driver to a module and change to doing on-demand creation
-  (rhbz 896160)
-- Disable CRYPTOLOOP as F18 util-linux is the last to support it (rhbz 896160)
-
-* Fri May 10 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git25.1
-- Linux v3.9-12316-g70eba42
-
-* Thu May 09 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git24.1
-- Linux v3.9-12070-g8cbc95e
-
-* Thu May  9 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Enable DMA for ARM sound drivers
-
-* Thu May 09 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git23.1
-- Linux v3.9-11789-ge0fd9af
-
-* Wed May  8 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Enable RemoteProc drivers on ARM
-
-* Wed May 08 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git22.1
-- Linux v3.9-11572-g5af43c2
-
-* Tue May 07 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git21.1
-- Linux v3.9-11485-gbb9055b
-
-* Tue May 07 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git20.1
-- Linux v3.9-10996-g0f47c94
-
-* Tue May 07 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix dmesg_restrict patch to avoid regression (rhbz 952655)
-
-* Mon May 06 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git19.1
-- Linux v3.9-10936-g51a26ae
-
-* Mon May  6 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Enable TPS65217 (am33xx) and EC on ChromeOS devices
-
-* Mon May 06 2013 Josh Boyer <jwboyer@redhat.com>
-- Don't remove headers explicitly exported via UAPI (rhbz 959467)
-
-* Mon May 06 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git18.1
-- Linux v3.9-10518-gd7ab730
-
-* Mon May 06 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git17.1
-- Linux v3.9-10104-g1aaf6d3
-
-* Sun May  5 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Update ARM config
-
-* Sat May 04 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git16.1
-- Linux v3.9-9472-g1db7722
-
-* Fri May 03 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git15.1
-- Linux v3.9-9409-g8665218
-
-* Fri May 03 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git14.1
-- Linux v3.9-8933-gce85722
-
-* Fri May  3 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- ARM 3.10 merge and general cleanup
-- Drop dedicated tegra kernel as now Multiplatform enabled
-- Enable Tegra and UX500 (Snowball) in Multiplatform
-
-* Thu May 02 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git13.1
-- Linux v3.9-8153-g5a148af
-
-* Thu May 02 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git12.1
-- Linux v3.9-7992-g99c6bcf
-
-* Thu May 02 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git11.1
-- Linux v3.9-7391-g20b4fb4
-
-* Wed May 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git10.1
-- Linux v3.9-5308-g8a72f38
-
-* Wed May 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git9.1
-- Linux v3.9-5293-g823e75f
-
-* Wed May  1 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM updates
-
-* Wed May 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git8.1
-- Linux v3.9-5165-g5f56886
-
-* Tue Apr 30 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git7.1
-- Linux v3.9-4597-g8c55f14
-
-* Tue Apr 30 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Enable CONFIG_SERIAL_8250_DW on ARM
-
-* Tue Apr 30 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git6.1
-- Linux v3.9-4516-gc9ef713
-
-* Tue Apr 30 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git5.1
-- Linux v3.9-3520-g5a5a1bf
-
-* Tue Apr 30 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git4.1
-- Linux v3.9-3143-g56847d8
-
-* Mon Apr 29 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git3.1
-- Linux v3.9-2154-gec25e24
-
-* Mon Apr 29 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git2.1
-- Linux v3.9-332-g92ddcf4
-
-* Mon Apr 29 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git1.1
-- Linux v3.9-84-g916bb6d7
-- Reenable debugging options.
-
-* Mon Apr 29 2013 Neil Horman <nhorman@redhat.com>
-- Enable CONFIG_PACKET_DIAG (rhbz 956870)
-
-* Mon Apr 29 2013 Alexandre Oliva <lxoliva@fsfla.org> -libre
-- GNU Linux-libre 3.9-gnu.
-
-* Mon Apr 29 2013 Josh Boyer <jwboyer@redhat.com>
-- Linux v3.9
-
-* Fri Apr 26 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patch to prevent scheduling while atomic error in blkcg
-
-* Wed Apr 24 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patch to fix EFI boot on Macs (rhbz 953447)
-
-* Mon Apr 22 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc8.git0.1
-- Linux v3.9-rc8
-- Disable debugging options.
-
-* Mon Apr 22 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM updates
-
-* Fri Apr 19 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patch to fix RCU splat from perf events
-
-* Fri Apr 19 2013 Peter Robinson <pbrobinson@fedoraproject.org> 
-- Temporaily disable cpu idle on ARM as it appears to be causing stability issues
-
-* Fri Apr 19 2013 Josh Boyer <jwboyer@redhat.com>
-- Disable Intel HDA and enable RSXX block dev on ppc64/ppc64p7
-
-* Thu Apr 18 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc7.git3.1
-- Linux v3.9-rc7-70-gd202f05
-
-* Wed Apr 17 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc7.git2.1
-- Linux v3.9-rc7-24-g542a672
-
-* Wed Apr 17 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM config updates
-- Add patch for DT DMA issues that affect at least highbank/tegra ARM devices
-
-* Tue Apr 16 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc7.git1.1
-- Linux v3.9-rc7-4-gbb33db7
-- Reenable debugging options.
-
-* Tue Apr 16 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix uninitialized variable free in iwlwifi (rhbz 951241)
-- Fix race in regulatory code (rhbz 919176)
-
-* Mon Apr 15 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix debug patches to build on s390x/ppc
-
-* Mon Apr 15 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc7.git0.1
-- Linux v3.9-rc7
-- Disable debugging options.
-
-* Fri Apr 12 2013 Josh Boyer <jwboyer@redhat.com>
-- Enable CONFIG_LDM_PARTITION (rhbz 948636)
-
-* Fri Apr 12 2013 Justin M. Forbes <jforbes@redhat.com>
-- Fix forcedeth DMA check error (rhbz 928024)
-
-* Thu Apr 11 2013 Dave Jones <davej@redhat.com>
-- Print out some extra debug information when we hit bad page tables.
-
-* Thu Apr 11 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc6.git2.1
-- Linux v3.9-rc6-115-g7ee32a6
-- libsas: use right function to alloc smp response (rhbz 949875)
-
-* Tue Apr 09 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc6.git1.1
-- Linux v3.9-rc6-36-ge8f2b54
-- Reenable debugging options.
-
-* Tue Apr  9 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Add patch to fix building some ARM tegra modules
-- Some minor ARM OMAP updates
-
-* Mon Apr 08 2013 Neil Horman <nhorman@redhat.com>
-- Fix dma unmap error in e100 (rhbz 907694)
-
-* Mon Apr 08 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc6.git0.1
-- Disable debugging options.
-- Linux-3.9-rc6
-
-* Thu Apr 04 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc5.git3.1
-- Linux v3.9-rc5-183-g22d1e6f
-
-* Wed Apr 03 2013 Dave Jones <davej@redhat.com>
-- Enable MTD_CHAR/MTD_BLOCK (Needed for SFC)
-  Enable 10gigE on 64-bit only.
-
-* Wed Apr 03 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc5.git2.1
-- Linux v3.9-rc5-146-gda241ef
-
-* Wed Apr  3 2013 Peter Robinson <pbrobinson@fedoraproject.org> 
-- Add upstream usb-next OMAP patch to fix usb on omap/mvebu
-
-* Tue Apr 02 2013 Josh Boyer <jwboyer@redhat.com>
-- Enable CONFIG_FB_MATROX_G on powerpc
-
-* Tue Apr 02 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc5.git1.1
-- Linux v3.9-rc5-108-g118c9a4
-- Reenable debugging options.
-
-* Tue Apr 02 2013 Josh Boyer <jwboyer@redhat.com>
-- Enable CONFIG_SCSI_DMX3191D (rhbz 919874)
-
-* Mon Apr 01 2013 Josh Boyer <jwboyer@redhat.com>
-- Enable CONFIG_MCE_INJECT (rhbz 927353)
-
-* Mon Apr 01 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc5.git0.1
-- Disable debugging options.
-- Linux v3.9-rc5
-- fix htmldoc build for 8250 rename. Patch from Kyle McMartin
-
-* Mon Apr  1 2013 Peter Robinson <pbrobinson@fedoraproject.org> 
-- Minor ARM LPAE updates
-
-* Sun Mar 31 2013 Peter Robinson <pbrobinson@fedoraproject.org> 
-- Make tegra inherit armv7-generic, fix and re-enable tegra
-- Enable SPI on ARM
-- Drop config-arm-generic
-- ARM config updates
-
-* Thu Mar 28 2013 Peter Robinson <pbrobinson@fedoraproject.org> 
-- Update ARM unified config for OMAP
-
-* Tue Mar 26 2013 Justin M. Forbes <jforbes@redhat.com>
-- Fix child thread introspection of of /proc/self/exe (rhbz 927469)
-
-* Tue Mar 26 2013 Dave Jones <davej@redhat.com>
-- Enable CONFIG_DM_CACHE (rhbz 924325)
-
-* Tue Mar 26 2013 Josh Boyer <jwboyer@redhat.com>
-- Add quirk for Realtek card reader to avoid 10 sec boot delay (rhbz 806587)
-- Add quirk for MSI keyboard backlight to avoid 10 sec boot delay (rhbz 907221)
-
-* Mon Mar 25 2013 Justin M. Forbes <jforbes@redhat.com>
-- disable whci-hcd since it doesnt seem to have users (rhbz 919289)
-
-* Sun Mar 24 2013 Dave Jones <davej@redhat.com> -3.9.0-0.rc4.git0.1
-- Linux 3.9-rc4
-  merged: drm-i915-bounds-check-execbuffer-relocation-count.patch
-
-* Sun Mar 24 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Update ARM config for OMAP/mvebu/lpae
-
-* Fri Mar 22 2013 Dave Jones <davej@redhat.com>
-- Fix calculation of current frequency in intel_pstate driver. (rhbz 923942)
-- Add missing build-req for perl-Carp
-
-* Thu Mar 21 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix workqueue crash in mac80211 (rhbz 920218)
-
-* Thu Mar 21 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc3.git1.1
-- Linux v3.9-rc3-148-g2ffdd7e
-- Fixes CVE-2013-1796, CVE-2013-1797, CVE-2013-1798 in kvm.
-
-* Wed Mar 20 2013 Dave Jones <davej@redhat.com>
-- Enable CONFIG_DM_DELAY (rhbz 923721)
-
-* Tue Mar 19 2013 Dave Jones <davej@redhat.com> - 3.9.0-0.rc3.git0.5
-- Reenable debugging options.
-
-* Tue Mar 19 2013 Dave Jones <davej@redhat.com>
-- cpufreq/intel_pstate: Add function to check that all MSR's are valid (rhbz 922923)
-
-* Mon Mar 18 2013 Dave Jones <davej@redhat.com> - 3.9.0-0.rc3.git0.4
-- s390x config option changes from Dan Horák <dan@danny.cz>
-   - enable PCI
-   - disable few useless drivers
-   - disable drivers conflicting with s390x
-
-* Mon Mar 18 2013 Dave Jones <davej@redhat.com> - 3.9.0-0.rc3.git0.3
-- Linux v3.9-rc3
-  merged: w1-fix-oops-when-w1_search-is-called-from.patch
-- Disable debugging options.
-
-* Sun Mar 17 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Merge OMAP support into ARM unified kernel
-- Add ARM LPAE kernel for Cortex A-15 devices that support LPAE and HW virtualisation
-- Unified ARM kernel provides highbank and OMAP support
-- Drop remantents of ARM softfp kernels
-
-* Fri Mar 15 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix divide by zero on host TSC calibration failure (rhbz 859282)
-
-* Fri Mar 15 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc2.git1.1
-- Linux v3.9-rc2-292-ga2362d2
-- Fixes CVE-2013-1860 kernel: usb: cdc-wdm buffer overflow triggered by device
-
-* Thu Mar 14 2013 Dave Jones <davej@redhat.com>
-- Move cpufreq drivers to be modular (rhbz 746372)
-
-* Wed Mar 13 2013 Dave Jones <davej@redhat.com> - 3.9.0-0.rc2.git0.3
-- Reenable debugging options.
-
-* Tue Mar 12 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patch to fix ieee80211_do_stop (rhbz 892599)
-- Add patches to fix cfg80211 issues with suspend (rhbz 856863)
-- CVE-2013-0913 drm/i915: head writing overflow (rhbz 920471 920529)
-- CVE-2013-0914 sa_restorer information leak (rhbz 920499 920510)
-
-* Tue Mar 12 2013 Dave Airlie <airlied@redhat.com>
-- add QXL driver (f19 only)
-
-* Mon Mar 11 2013 Dave Jones <davej@redhat.com> - 3.9.0-0.rc2.git0.2
-- Disable debugging options.
-
-* Mon Mar 11 2013 Dave Jones <davej@redhat.com>
-- Linux 3.9-rc2
-
-* Mon Mar 11 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patch to allow "8250." prefix to keep working (rhbz 911771)
-- Add patch to fix w1_search oops (rhbz 857954)
-
-* Sun Mar 10 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc1.git2.1
-- Linux v3.9-rc1-278-g8343bce
-
-* Sun Mar 10 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Enable Xilinx Zynq
-- Enable highbank cpufreq driver
-
-* Fri Mar 08 2013 Josh Boyer <jwboyer@redhat.com>
-- Add turbostat and x86_engery_perf_policy debuginfo to kernel-tools-debuginfo
-
-* Fri Mar 08 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc1.git1.1
-- Linux v3.9-rc1-211-g47b3bc9
-- Reenable debugging options.
-- CVE-2013-1828 sctp: SCTP_GET_ASSOC_STATS stack buffer overflow (rhbz 919315 919316)
-
-* Thu Mar 07 2013 Josh Boyer <jwboyer@redhat.com>
-- CVE-2013-1792 keys: race condition in install_user_keyrings (rhbz 916646 919021)
-
-* Wed Mar 06 2013 Josh Boyer <jwboyer@redhat.com>
-- Adjust secure-boot patchset to work with boot_params sanitizing
-- Don't clear efi_info in boot_params (rhbz 918408)
-
-* Wed Mar 06 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Update ARM mvebu config
-
-* Wed Mar 06 2013 Dave Jones <davej@redhat.com>
-- drop acpi debugging patch.
-
-* Wed Mar 06 2013 Justin M. Forbes <jforbes@redhat.com>
-- Remove Ricoh multifunction DMAR patch as it's no longer needed (rhbz 880051)
-
-* Tue Mar 05 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc1.git0.3
-- Fix intel_pstate init error path (rhbz 916833)
-
-* Tue Mar  5 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Temporarily disable tegra until we get a fix from upstream
-
-* Tue Mar 05 2013 Josh Boyer <jwboyer@redhat.com>
-- Add 3 fixes for efi issues (rhbz 917984)
-- Enable CONFIG_IP6_NF_TARGET_MASQUERADE
-
-* Mon Mar 04 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc1.git0.1
-- Linux v3.9-rc1
-- Add patch from Dirk Brandewie to fix intel pstate divide error (rhbz 916833)
-- Disable debugging options.
-
-* Mon Mar  4 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Update vexpress and omap options (fix MMC on qemu, hopefully fix OMAP3)
-
-* Sun Mar 03 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git15.1
-- Linux v3.8-10734-ga7c1120
-
-* Fri Mar 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git14.1
-- Linux v3.8-10206-gb0af9cd
-
-* Fri Mar 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git13.1
-- Linux v3.8-9761-gde1a226
-
-* Thu Feb 28 2013 Kyle McMartin <kmcmarti@redhat.com>
-- Make iso9660 a module.
-
-* Thu Feb 28 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git12.1
-- Linux v3.8-9633-g2a7d2b9
-
-* Wed Feb 27 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Drop ARM kirkwood kernel
-- Enable SPI on ARM
-- General 3.9 updates
-
-* Wed Feb 27 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git11.1
-- Linux v3.8-9456-g309667e
-
-* Wed Feb 27 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git10.1
-- Linux v3.8-9405-gd895cb1
-
-* Tue Feb 26 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git9.1
-- Linux v3.8-9165-g1cef935
-
-* Tue Feb 26 2013 Kyle McMartin <kmcmarti@redhat.com>
-- Move VMXNET3 to config-x86-generic from config-generic, it's VMware
-  virtual ethernet.
-
-* Tue Feb 26 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git8.1
-- Linux v3.8-8664-gc41b381
-
-* Tue Feb 26 2013 Kyle McMartin <kmcmarti@redhat.com>
-- Add blk_queue_physical_block_size and register_netdevice to the symbols
-  used for initrd generation (synched from .el6)
-- ipr.ko driven SAS VRAID cards found on x86_64 machines these days, and not
-  just on ppc64
-
-* Tue Feb 26 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix vmalloc_fault oops during lazy MMU (rhbz 914737)
-
-* Mon Feb 25 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git7.1
-- Honor dmesg_restrict for /dev/kmsg (rhbz 903192)
-- Linux v3.8-7888-gab78265
-
-* Sun Feb 24 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git6.1
-- Linux v3.8-6988-g9e2d59a
-
-* Sun Feb 24 2013 Josh Boyer <jwboyer@redhat.com>
-- CVE-2013-1763 sock_diag: out-of-bounds access to sock_diag_handlers (rhbz 915052,915057)
-
-* Fri Feb 22 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git5.1
-- Linux v3.8-6071-g8b5628a
-
-* Fri Feb 22 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git4.1
-- Linux v3.8-6071-g8b5628a
-- Enable the rtl8192e driver (rhbz 913753)
-
-* Thu Feb 21 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git3.1
-- Linux v3.8-3195-g024e4ec
-- Shut up perf about missing build things we don't care about
-- Drop the old aic7xxx driver, from Paul Bolle
-
-* Thu Feb 21 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git2.1
-- Linux v3.8-3040-ga0b1c42
-
-* Thu Feb 21 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git1.1
-- Linux v3.8-523-gece8e0b
-- Reenable debugging options.
-
-* Tue Feb 19 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-2
-- Add pekey support from David Howells and rework secure-boot patchset on top
-- Add support for Atheros 04ca:3004 bluetooth devices (rhbz 844750)
-- Backport support for newer ALPS touchpads (rhbz 812111)
-- Enable CONFIG_AUDIT_LOGINUID_IMMUTABLE
-
-* Tue Feb 19 2013 Alexandre Oliva <lxoliva@fsfla.org> -libre
-- GNU Linux-libre 3.8-gnu.
-
-* Tue Feb 19 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-1
-- Linux v3.8
-- Fix build with CONFIG_EFI disabled, reported by Peter Bowey (rhbz 911833)
-- Disable debugging options.
-
-* Mon Feb 18 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc7.git4.1
-- Linux v3.8-rc7-93-gf741656
-
-* Thu Feb 14 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc7.git3.1
-- Linux v3.8-rc7-73-g323a72d
-
-* Thu Feb 14 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patch to fix corruption on newer M6116 SATA bridges (rhbz 909591)
-- CVE-2013-0228 xen: xen_iret() invalid %ds local DoS (rhbz 910848 906309)
-
-* Wed Feb 13 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Disable tegra30
-
-* Wed Feb 13 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc7.git2.1
-- Linux v3.8-rc7-32-gecf223f
-
-* Tue Feb 12 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patch to create a convenient mount point for pstore (rhbz 910126)
-
-* Tue Feb 12 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc7.git1.1
-- Linux v3.8-rc7-6-g211b0cd
-- Reenable debugging options.
-
-* Mon Feb 11 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patch from Kees Cook to restrict MSR writting in secure boot mode
-- Build PATA_MACIO in on powerpc (rhbz 831361)
-
-* Sat Feb  9 2013 Alexandre Oliva <lxoliva@fsfla.org> -libre
-- GNU Linux-libre 3.8-rc7-gnu.
-
-* Fri Feb 08 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc7.git0.1
-- Linux v3.8-rc7
-- Add patch to fix atomic sleep issue on alloc_pid failure (rhbz 894623)
-- Disable debugging options.
-
-* Thu Feb  7 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM build fixes
-
-* Wed Feb 06 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc6.git3.3
-- Enable CONFIG_NAMESPACES everywhere (rhbz 907576)
-- Add patch to fix ath9k dma stop checks (rhbz 892811)
-
-* Wed Feb 06 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc6.git3.1
-- Linux v3.8-rc6-98-g1589a3e
-- Add patch to honor MokSBState (rhbz 907406)
-
-* Wed Feb  6 2013 Alexandre Oliva <lxoliva@fsfla.org> -libre
-- GNU Linux-libre 3.8-rc6-gnu.
-
-* Tue Feb 05 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc6.git2.1
-- Linux v3.8-rc6-62-gfe547d7
-- Enable CONFIG_DRM_VMWGFX_FBCON (rhbz 907620)
-- Enable CONFIG_DETECT_HUNG_TASK
-
-* Mon Feb 04 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc6.git1.1
-- Linux v3.8-rc6-22-g6edacf0
-- Enable CONFIG_EXT4_DEBUG
-- Fix rtlwifi scheduling while atomic from Larry Finger (rhbz 903881)
-
-* Fri Feb 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc6.git0.1
-- Linux v3.8-rc6
-- Enable CONFIG_DMA_API_DEBUG
-- Add patches to improve mac80211 latency and throughput (rhbz 830151)
-
-* Thu Jan 31 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc5.git3.1
-- Linux v3.8-rc5-245-g04c2eee
-- Enable CONFIG_DEBUG_STACK_USAGE
-
-* Wed Jan 30 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc5.git2.1
-- Linux v3.8-rc5-218-ga56e160
-- Enable NAMESPACES and CHECKPOINT_RESTORE on x86_64 for F19 CRIU feature
-- Enable CONFIG_DEBUG_ATOMIC_SLEEP
-
-* Tue Jan 29 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc5.git1.1
-- Linux v3.8-rc5-150-g6abb7c2
-
-* Tue Jan 29 2013 Josh Boyer <jwboyer@redhat.com>
-- Backport driver for Cypress PS/2 trackpad (rhbz 799564)
-
-* Mon Jan 28 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc5.git0.1
-- Linux v3.8-rc5
-- Add patches to fix issues with iwlwifi (rhbz 863424)
-- Enable CONFIG_PROVE_RCU
-
-* Sun Jan 27 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Reenable perf on ARM (was suppose to be temporary)
-- Build and package dtbs on ARM
-- Enable FB options for qemu vexpress on unified
-
-* Fri Jan 25 2013 Kyle McMartin <kmcmarti@redhat.com>
-- Sign all modules with the mod-extra-sign.sh script, ensures nothing gets
-  missed because of .config differences between invocations of BuildKernel.
-
-* Fri Jan 25 2013 Justin M. Forbes <jforbes@redhat.com>
-- Turn off THP for 32bit
-
-* Fri Jan 25 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc4.git5.1
-- Linux v3.8-rc4-277-g66e2d3e
-- Enable slub debug
-
-* Thu Jan 24 2013 Josh Boyer <jwboyer@redhat.com>
-- Update secure-boot patchset
-
-* Thu Jan 24 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc4.git4.1
-- Linux v3.8-rc4-183-gff7532c
-- Enable lockdep
-
-* Wed Jan 23 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc4.git3.1
-- Linux v3.8-rc4-139-g1d85490
-- Enable debug spinlocks
-
-* Wed Jan 23 2013 Dave Jones <davej@redhat.com>
-- Remove warnings about empty IPI masks.
-
-* Sun Jan 20 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Remove obsolete ARM configs
-- Update OMAP config for TI AM35XX SoCs
-- Add patch to fix versatile build failure
-
-* Sat Jan 19 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc4.git1.1
-- Linux v3.8-rc4-42-g5da1f88
-
-* Fri Jan 18 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc4.git0.1
-- Linux v3.8-rc4
-- Disable debugging options.
-
-* Fri Jan 18 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Disable problematic PL310 ARM errata
-- Minor ARM config tweaks
-- OMAP DRM driver to fix OMAP kernel build
-
-* Wed Jan 16 2013 Josh Boyer <jwboyer@redhat.com>
-- Fix power management sysfs on non-secure boot machines (rhbz 896243)
-
-* Wed Jan 16 2013 Dave Jones <davej@redhat.com>
-- Experiment: Double the length of the brcmsmac transmit timeout.
-
-* Wed Jan 16 2013 Josh Boyer <jwboyer@redhat.com>
-- Add patch from Stanislaw Gruszka to fix iwlegacy IBSS cleanup (rhbz 886946)
-
-* Tue Jan 15 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc3.git2.1
-- Linux v3.8-rc3-293-g406089d
-
-* Tue Jan 15 2013 Josh Boyer <jwboyer@redhat.com>
-- Enable CONFIG_DVB_USB_V2 (rhbz 895460)
-
-* Mon Jan 14 2013 Josh Boyer <jwboyer@redhat.com>
-- Enable Orinoco drivers in kernel-modules-extra (rhbz 894069)
-
-* Mon Jan 14 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc3.git1.1
-- Linux v3.8-rc3-74-gb719f43
-
-* Fri Jan 11 2013 Josh Boyer <jwboyer@redhat.com>
-- Update secure-boot patchset
-
-* Thu Jan 10 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc3.git0.2
-- Reenable debugging options.
-
-* Thu Jan 10 2013 Dave Jones <davej@redhat.com>
-- Drop old Montevina era E1000 workaround.
-
-* Thu Jan 10 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc3.git0.1
-- Linux v3.8-rc3
-- Disable debugging options.
-
-* Wed Jan 09 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc2.git4.1
-- Linux v3.8-rc2-370-g57a0c1e
-
-* Wed Jan  9 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Update ARM mvebu config
-
-* Wed Jan 09 2013 Josh Boyer <jwboyer@redhat.com>
-- Enable CONFIG_CIFS_DEBUG as it was on before it was split out
-
-* Tue Jan 08 2013 Kyle McMartin <kmcmarti@redhat.com>
-- Ensure modules are signed even if *-debuginfo rpms are not produced by
-  re-defining __spec_install_post and adding a hook after all strip
-  invocations. Ideally, in the future, we could patch the rpm macro and
-  remove the re-define from kernel.spec, but that's another windmill to tilt
-  at.
-
-* Tue Jan 08 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc2.git3.1
-- Linux v3.8-rc2-222-g2a893f9
-
-* Mon Jan 07 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc2.git2.1
-- Linux v3.8-rc2-191-gd287b87
-- remove the namei-include.patch, it's upstream now
-
-* Mon Jan 07 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc2.git1.2
-- Reenable debugging options.
-
-* Mon Jan  7 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Further ARM config updates
-- Add patch to fix building omapdrm
-
-* Mon Jan 07 2013 Justin M. Forbes <jforbes@redhat.com>
-- Bye sparc
-
-* Mon Jan 07 2013 Justin M. Forbes <jforbes@redhat.com>
-- Fix up configs for build
-
-* Mon Jan 07 2013 Josh Boyer <jwboyer@redhat.com>
-- Patch to fix efivarfs underflow from Lingzhu Xiang (rhbz 888163)
-
-* Sat Jan  5 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Initial update of ARM configs for 3.8
-- Enable DRM driver for tegra
-- Drop separate imx kernel. Will be reintroduced soon in unified
-
-* Fri Jan 04 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc2.git1.1
-- Linux v3.8-rc2-116-g5f243b9
-
-* Thu Jan 03 2013 Justin M. Forbes <jforbes@redhat.com>
-- Initial 3.8-rc2 rebase
-
-* Wed Jan 02 2013 Josh Boyer <jwboyer@redhat.com>
-- BR the hostname package (rhbz 886113)
-
-* Tue Dec 18 2012 Dave Jones <davej@redhat.com>
-- On rebases, list new config options.
-  (Revert to pre-18 behaviour)
-
-* Mon Dec 17 2012 Josh Boyer <jwboyer@redhat.com>
-- Fix oops in sony-laptop setup (rhbz 873107)
-
-* Fri Dec 14 2012 Peter Robinson <pbrobinson@fedoraproject.org>
-- Add patch to fix arm imx drm driver build
-
-* Wed Dec 12 2012 Josh Boyer <jwboyer@redhat.com>
-- Fix infinite loop in efi signature parser
-- Don't error out if db doesn't exist
-
-* Tue Dec 11 2012 Peter Robinson <pbrobinson@fedoraproject.org>
-- Update ARM configs for latest 3.7
-- Drop highbank kernel build variant as its in unified kernel
-
-* Tue Dec 11 2012 Josh Boyer <jwboyer@redhat.com>
-- Update secure boot patches to include MoK support
-- Fix IBSS scanning in mac80211 (rhbz 883414)
-
-* Tue Dec 11 2012 Dave Jones <davej@redhat.com> - 3.7.0-2
-- Reenable debugging options.
-
-* Tue Dec 11 2012 Alexandre Oliva <lxoliva@fsfla.org> -libre
-- GNU Linux-libre 3.7-gnu
-
-* Tue Dec 11 2012 Dave Jones <davej@redhat.com> - 3.7.0-1
-- Linux v3.7
-
-=======
->>>>>>> 9c9c166
 ###
 # The following Emacs magic makes C-c C-e use UTC dates.
 # Local Variables:
diff --git a/freed-ora/current/master/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch b/freed-ora/current/master/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
new file mode 100644
index 000000000..684a2dbc9
--- /dev/null
+++ b/freed-ora/current/master/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
@@ -0,0 +1,44 @@
+From ec4a73a3990e6c02b5cb896f8df69f6ee2808250 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
+ loading restrictions
+
+kexec permits the loading and execution of arbitrary code in ring 0, which
+is something that module signing enforcement is meant to prevent. It makes
+sense to disable kexec in this situation.
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ kernel/kexec.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/kernel/kexec.c b/kernel/kexec.c
+index 2bee072268d9..891477dbfee0 100644
+--- a/kernel/kexec.c
++++ b/kernel/kexec.c
+@@ -36,6 +36,7 @@
+ #include <linux/syscore_ops.h>
+ #include <linux/compiler.h>
+ #include <linux/hugetlb.h>
++#include <linux/module.h>
+ 
+ #include <asm/page.h>
+ #include <asm/uaccess.h>
+@@ -1251,6 +1252,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
+ 		return -EPERM;
+ 
+ 	/*
++	 * kexec can be used to circumvent module loading restrictions, so
++	 * prevent loading in that case
++	 */
++	if (secure_modules())
++		return -EPERM;
++
++	/*
+ 	 * Verify we have a legal set of flags
+ 	 * This leaves us room for future extensions.
+ 	 */
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/0001-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch b/freed-ora/current/master/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
index d25452268..93c69d536 100644
--- a/freed-ora/current/master/0001-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
+++ b/freed-ora/current/master/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
@@ -1,7 +1,4 @@
-Bugzilla: N/A
-Upstream-status: Nak'd, supposedly replacement coming to auto-select
-
-From 0f3f5c5b4ca2eb1f41947c50bedb9b17aa1a1f80 Mon Sep 17 00:00:00 2001
+From 2bfcb3ee492e35879b41452600b87de82199ebc7 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
@@ -14,16 +11,19 @@ operation of the feature, and we need CPUMASK_OFFSTACK to increase the
 NR_CPUS value beyond 512 on x86.  We drop the current dependency and make
 sure SMP is set.
 
+Bugzilla: N/A
+Upstream-status: Nak'd, supposedly replacement coming to auto-select
+
 Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
 ---
  lib/Kconfig | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/lib/Kconfig b/lib/Kconfig
-index b3c8be0..50b47cd 100644
+index 54cf309a92a5..64f8bb4882fb 100644
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
-@@ -342,7 +342,8 @@ config CHECK_SIGNATURE
+@@ -382,7 +382,8 @@ config CHECK_SIGNATURE
  	bool
  
  config CPUMASK_OFFSTACK
@@ -34,5 +34,5 @@ index b3c8be0..50b47cd 100644
  	  Use dynamic allocation for cpumask_var_t, instead of putting
  	  them on the stack.  This is a bit more expensive, but avoids
 -- 
-1.8.3.1
+1.9.3
 
diff --git a/freed-ora/current/master/lis3-improve-handling-of-null-rate.patch b/freed-ora/current/master/lis3-improve-handling-of-null-rate.patch
index ead58ce2b..6f1d39018 100644
--- a/freed-ora/current/master/lis3-improve-handling-of-null-rate.patch
+++ b/freed-ora/current/master/lis3-improve-handling-of-null-rate.patch
@@ -1,13 +1,7 @@
-Bugzilla: 785814
-Upstream-status: ??
-
->From 56fb161a9ca0129f8e266e4dbe79346552ff8089 Mon Sep 17 00:00:00 2001
+From 250af253738f67bc929b95653b46d2c60247e5e8 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
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+Subject: [PATCH] lis3: improve handling of null rate
 
 When obtaining a rate of 0, we would disable the device supposely
 because it seems to behave incorectly. It actually only comes from the
@@ -15,16 +9,19 @@ fact that the device is off and on lis3dc it's reflected in the rate.
 So handle this nicely by just waiting a safe time, and then using the
 device as normally.
 
+Bugzilla: 785814
+Upstream-status: ??
+
 Signed-off-by: ??ric Piel <eric.piel@tremplin-utc.net>
 ---
- drivers/misc/lis3lv02d/lis3lv02d.c |   16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
+ drivers/misc/lis3lv02d/lis3lv02d.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
-index 35c67e0..42dce2a 100644
+index 3ef4627f9cb1..2b2d2e8e5eeb 100644
 --- a/drivers/misc/lis3lv02d/lis3lv02d.c
 +++ b/drivers/misc/lis3lv02d/lis3lv02d.c
-@@ -188,7 +188,8 @@ static void lis3lv02d_get_xyz(struct lis3lv02d *lis3, int *x, int *y, int *z)
+@@ -216,7 +216,8 @@ static void lis3lv02d_get_xyz(struct lis3lv02d *lis3, int *x, int *y, int *z)
  /* conversion btw sampling rate and the register values */
  static int lis3_12_rates[4] = {40, 160, 640, 2560};
  static int lis3_8_rates[2] = {100, 400};
@@ -34,7 +31,7 @@ index 35c67e0..42dce2a 100644
  static int lis3_3dlh_rates[4] = {50, 100, 400, 1000};
  
  /* ODR is Output Data Rate */
-@@ -202,12 +203,11 @@ static int lis3lv02d_get_odr(struct lis3lv02d *lis3)
+@@ -231,12 +232,11 @@ static int lis3lv02d_get_odr(struct lis3lv02d *lis3)
  	return lis3->odrs[(ctrl >> shift)];
  }
  
@@ -50,7 +47,7 @@ index 35c67e0..42dce2a 100644
  
  	/* LIS3 power on delay is quite long */
  	msleep(lis3->pwron_delay / div);
-@@ -274,7 +274,7 @@ static int lis3lv02d_selftest(struct lis3lv02d *lis3, s16 results[3])
+@@ -303,7 +303,7 @@ static int lis3lv02d_selftest(struct lis3lv02d *lis3, s16 results[3])
  
  	lis3->read(lis3, ctlreg, &reg);
  	lis3->write(lis3, ctlreg, (reg | selftest));
@@ -59,7 +56,7 @@ index 35c67e0..42dce2a 100644
  	if (ret)
  		goto fail;
  
-@@ -285,7 +285,7 @@ static int lis3lv02d_selftest(struct lis3lv02d *lis3, s16 results[3])
+@@ -314,7 +314,7 @@ static int lis3lv02d_selftest(struct lis3lv02d *lis3, s16 results[3])
  
  	/* back to normal settings */
  	lis3->write(lis3, ctlreg, reg);
@@ -68,8 +65,8 @@ index 35c67e0..42dce2a 100644
  	if (ret)
  		goto fail;
  
-@@ -397,7 +397,7 @@ int lis3lv02d_poweron(struct lis3lv02d *lis3)
- 		lis3->write(lis3, CTRL_REG2, reg);
+@@ -434,7 +434,7 @@ int lis3lv02d_poweron(struct lis3lv02d *lis3)
+ 		}
  	}
  
 -	err = lis3lv02d_get_pwron_wait(lis3);
@@ -78,5 +75,5 @@ index 35c67e0..42dce2a 100644
  		return err;
  
 -- 
-1.7.7.1
+1.9.3
 
diff --git a/freed-ora/current/master/modsign-uefi.patch b/freed-ora/current/master/modsign-uefi.patch
deleted file mode 100644
index 5f8cc3313..000000000
--- a/freed-ora/current/master/modsign-uefi.patch
+++ /dev/null
@@ -1,624 +0,0 @@
-Bugzilla: N/A
-Upstream-status: Fedora mustard for now
-
-From fa2bfe718da40bf24f92c85846577e9bc788882c Mon Sep 17 00:00:00 2001
-From: Dave Howells <dhowells@redhat.com>
-Date: Tue, 23 Oct 2012 09:30:54 -0400
-Subject: [PATCH 1/5] Add EFI signature data types
-
-Add the data types that are used for containing hashes, keys and certificates
-for cryptographic verification.
-
-Signed-off-by: David Howells <dhowells@redhat.com>
----
- include/linux/efi.h | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/include/linux/efi.h b/include/linux/efi.h
-index e73f391fd3c8..3d66a61bbbca 100644
---- a/include/linux/efi.h
-+++ b/include/linux/efi.h
-@@ -578,6 +578,12 @@ typedef efi_status_t efi_query_variable_store_t(u32 attributes, unsigned long si
- #define DEVICE_TREE_GUID \
-     EFI_GUID(  0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 )
- 
-+#define EFI_CERT_SHA256_GUID \
-+    EFI_GUID(  0xc1c41626, 0x504c, 0x4092, 0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 )
-+
-+#define EFI_CERT_X509_GUID \
-+    EFI_GUID(  0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 )
-+
- typedef struct {
- 	efi_guid_t guid;
- 	u64 table;
-@@ -793,6 +799,20 @@ typedef struct _efi_file_io_interface {
- 
- #define EFI_INVALID_TABLE_ADDR		(~0UL)
- 
-+typedef struct  {
-+	efi_guid_t signature_owner;
-+	u8 signature_data[];
-+} efi_signature_data_t;
-+
-+typedef struct {
-+	efi_guid_t signature_type;
-+	u32 signature_list_size;
-+	u32 signature_header_size;
-+	u32 signature_size;
-+	u8 signature_header[];
-+	/* efi_signature_data_t signatures[][] */
-+} efi_signature_list_t;
-+
- /*
-  * All runtime access to EFI goes through this structure:
-  */
--- 
-1.9.3
-
-
-From 922e0512ce70101b596558d5bb075cd40a450322 Mon Sep 17 00:00:00 2001
-From: Dave Howells <dhowells@redhat.com>
-Date: Tue, 23 Oct 2012 09:36:28 -0400
-Subject: [PATCH 2/5] Add an EFI signature blob parser and key loader.
-
-X.509 certificates are loaded into the specified keyring as asymmetric type
-keys.
-
-Signed-off-by: David Howells <dhowells@redhat.com>
----
- crypto/asymmetric_keys/Kconfig      |   8 +++
- crypto/asymmetric_keys/Makefile     |   1 +
- crypto/asymmetric_keys/efi_parser.c | 109 ++++++++++++++++++++++++++++++++++++
- include/linux/efi.h                 |   4 ++
- 4 files changed, 122 insertions(+)
- create mode 100644 crypto/asymmetric_keys/efi_parser.c
-
-diff --git a/crypto/asymmetric_keys/Kconfig b/crypto/asymmetric_keys/Kconfig
-index 03a6eb95ab50..6306ffc2a7fe 100644
---- a/crypto/asymmetric_keys/Kconfig
-+++ b/crypto/asymmetric_keys/Kconfig
-@@ -37,4 +37,12 @@ config X509_CERTIFICATE_PARSER
- 	  data and provides the ability to instantiate a crypto key from a
- 	  public key packet found inside the certificate.
- 
-+config EFI_SIGNATURE_LIST_PARSER
-+	bool "EFI signature list parser"
-+	depends on EFI
-+	select X509_CERTIFICATE_PARSER
-+	help
-+	  This option provides support for parsing EFI signature lists for
-+	  X.509 certificates and turning them into keys.
-+
- endif # ASYMMETRIC_KEY_TYPE
-diff --git a/crypto/asymmetric_keys/Makefile b/crypto/asymmetric_keys/Makefile
-index 0727204aab68..cd8388e5f2f1 100644
---- a/crypto/asymmetric_keys/Makefile
-+++ b/crypto/asymmetric_keys/Makefile
-@@ -8,6 +8,7 @@ asymmetric_keys-y := asymmetric_type.o signature.o
- 
- obj-$(CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE) += public_key.o
- obj-$(CONFIG_PUBLIC_KEY_ALGO_RSA) += rsa.o
-+obj-$(CONFIG_EFI_SIGNATURE_LIST_PARSER) += efi_parser.o
- 
- #
- # X.509 Certificate handling
-diff --git a/crypto/asymmetric_keys/efi_parser.c b/crypto/asymmetric_keys/efi_parser.c
-new file mode 100644
-index 000000000000..424896a0b169
---- /dev/null
-+++ b/crypto/asymmetric_keys/efi_parser.c
-@@ -0,0 +1,109 @@
-+/* EFI signature/key/certificate list parser
-+ *
-+ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
-+ * Written by David Howells (dhowells@redhat.com)
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public Licence
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the Licence, or (at your option) any later version.
-+ */
-+
-+#define pr_fmt(fmt) "EFI: "fmt
-+#include <linux/module.h>
-+#include <linux/printk.h>
-+#include <linux/err.h>
-+#include <linux/efi.h>
-+#include <keys/asymmetric-type.h>
-+
-+static __initdata efi_guid_t efi_cert_x509_guid = EFI_CERT_X509_GUID;
-+
-+/**
-+ * parse_efi_signature_list - Parse an EFI signature list for certificates
-+ * @data: The data blob to parse
-+ * @size: The size of the data blob
-+ * @keyring: The keyring to add extracted keys to
-+ */
-+int __init parse_efi_signature_list(const void *data, size_t size, struct key *keyring)
-+{
-+	unsigned offs = 0;
-+	size_t lsize, esize, hsize, elsize;
-+
-+	pr_devel("-->%s(,%zu)\n", __func__, size);
-+
-+	while (size > 0) {
-+		efi_signature_list_t list;
-+		const efi_signature_data_t *elem;
-+		key_ref_t key;
-+
-+		if (size < sizeof(list))
-+			return -EBADMSG;
-+
-+		memcpy(&list, data, sizeof(list));
-+		pr_devel("LIST[%04x] guid=%pUl ls=%x hs=%x ss=%x\n",
-+			 offs,
-+			 list.signature_type.b, list.signature_list_size,
-+			 list.signature_header_size, list.signature_size);
-+
-+		lsize = list.signature_list_size;
-+		hsize = list.signature_header_size;
-+		esize = list.signature_size;
-+		elsize = lsize - sizeof(list) - hsize;
-+
-+		if (lsize > size) {
-+			pr_devel("<--%s() = -EBADMSG [overrun @%x]\n",
-+				 __func__, offs);
-+			return -EBADMSG;
-+		}
-+		if (lsize < sizeof(list) ||
-+		    lsize - sizeof(list) < hsize ||
-+		    esize < sizeof(*elem) ||
-+		    elsize < esize ||
-+		    elsize % esize != 0) {
-+			pr_devel("- bad size combo @%x\n", offs);
-+			return -EBADMSG;
-+		}
-+
-+		if (efi_guidcmp(list.signature_type, efi_cert_x509_guid) != 0) {
-+			data += lsize;
-+			size -= lsize;
-+			offs += lsize;
-+			continue;
-+		}
-+
-+		data += sizeof(list) + hsize;
-+		size -= sizeof(list) + hsize;
-+		offs += sizeof(list) + hsize;
-+
-+		for (; elsize > 0; elsize -= esize) {
-+			elem = data;
-+
-+			pr_devel("ELEM[%04x]\n", offs);
-+
-+			key = key_create_or_update(
-+				make_key_ref(keyring, 1),
-+				"asymmetric",
-+				NULL,
-+				&elem->signature_data,
-+				esize - sizeof(*elem),
-+				(KEY_POS_ALL & ~KEY_POS_SETATTR) |
-+				KEY_USR_VIEW,
-+				KEY_ALLOC_NOT_IN_QUOTA |
-+				KEY_ALLOC_TRUSTED);
-+
-+			if (IS_ERR(key))
-+				pr_err("Problem loading in-kernel X.509 certificate (%ld)\n",
-+				       PTR_ERR(key));
-+			else
-+				pr_notice("Loaded cert '%s' linked to '%s'\n",
-+					  key_ref_to_ptr(key)->description,
-+					  keyring->description);
-+
-+			data += esize;
-+			size -= esize;
-+			offs += esize;
-+		}
-+	}
-+
-+	return 0;
-+}
-diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 3d66a61bbbca..7854ff3c0f11 100644
---- a/include/linux/efi.h
-+++ b/include/linux/efi.h
-@@ -901,6 +901,10 @@ extern struct efi_memory_map memmap;
- 	     (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
- 	     (md) = (void *)(md) + (m)->desc_size)
- 
-+struct key;
-+extern int __init parse_efi_signature_list(const void *data, size_t size,
-+					   struct key *keyring);
-+
- /**
-  * efi_range_is_wc - check the WC bit on an address range
-  * @start: starting kvirt address
--- 
-1.9.3
-
-
-From 2534dedee545507c00973279d5db515e122b5104 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Fri, 26 Oct 2012 12:36:24 -0400
-Subject: [PATCH 3/5] KEYS: Add a system blacklist keyring
-
-This adds an additional keyring that is used to store certificates that
-are blacklisted.  This keyring is searched first when loading signed modules
-and if the module's certificate is found, it will refuse to load.  This is
-useful in cases where third party certificates are used for module signing.
-
-Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
----
- include/keys/system_keyring.h |  4 ++++
- init/Kconfig                  |  9 +++++++++
- kernel/module_signing.c       | 12 ++++++++++++
- kernel/system_keyring.c       | 17 +++++++++++++++++
- 4 files changed, 42 insertions(+)
-
-diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h
-index 8dabc399bd1d..e466de10ceec 100644
---- a/include/keys/system_keyring.h
-+++ b/include/keys/system_keyring.h
-@@ -18,6 +18,10 @@
- 
- extern struct key *system_trusted_keyring;
- 
-+#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
-+extern struct key *system_blacklist_keyring;
-+#endif
-+
- #endif
- 
- #endif /* _KEYS_SYSTEM_KEYRING_H */
-diff --git a/init/Kconfig b/init/Kconfig
-index 9d76b99af1b9..ac5f580437a0 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1677,6 +1677,15 @@ config SYSTEM_TRUSTED_KEYRING
- 
- 	  Keys in this keyring are used by module signature checking.
- 
-+config SYSTEM_BLACKLIST_KEYRING
-+	bool "Provide system-wide ring of blacklisted keys"
-+	depends on KEYS
-+	help
-+	  Provide a system keyring to which blacklisted keys can be added.
-+	  Keys in the keyring are considered entirely untrusted.  Keys in this
-+	  keyring are used by the module signature checking to reject loading
-+	  of modules signed with a blacklisted key.
-+
- config PROFILING
- 	bool "Profiling support"
- 	help
-diff --git a/kernel/module_signing.c b/kernel/module_signing.c
-index be5b8fac4bd0..fed815fcdaf2 100644
---- a/kernel/module_signing.c
-+++ b/kernel/module_signing.c
-@@ -158,6 +158,18 @@ static struct key *request_asymmetric_key(const char *signer, size_t signer_len,
- 
- 	pr_debug("Look up: \"%s\"\n", id);
- 
-+#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
-+	key = keyring_search(make_key_ref(system_blacklist_keyring, 1),
-+				   &key_type_asymmetric, id);
-+	if (!IS_ERR(key)) {
-+		/* module is signed with a cert in the blacklist.  reject */
-+		pr_err("Module key '%s' is in blacklist\n", id);
-+		key_ref_put(key);
-+		kfree(id);
-+		return ERR_PTR(-EKEYREJECTED);
-+	}
-+#endif
-+
- 	key = keyring_search(make_key_ref(system_trusted_keyring, 1),
- 			     &key_type_asymmetric, id);
- 	if (IS_ERR(key))
-diff --git a/kernel/system_keyring.c b/kernel/system_keyring.c
-index 52ebc70263f4..478c4f8ec908 100644
---- a/kernel/system_keyring.c
-+++ b/kernel/system_keyring.c
-@@ -20,6 +20,9 @@
- 
- struct key *system_trusted_keyring;
- EXPORT_SYMBOL_GPL(system_trusted_keyring);
-+#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
-+struct key *system_blacklist_keyring;
-+#endif
- 
- extern __initconst const u8 system_certificate_list[];
- extern __initconst const unsigned long system_certificate_list_size;
-@@ -41,6 +44,20 @@ static __init int system_trusted_keyring_init(void)
- 		panic("Can't allocate system trusted keyring\n");
- 
- 	set_bit(KEY_FLAG_TRUSTED_ONLY, &system_trusted_keyring->flags);
-+
-+#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
-+	system_blacklist_keyring = keyring_alloc(".system_blacklist_keyring",
-+				    KUIDT_INIT(0), KGIDT_INIT(0),
-+				    current_cred(),
-+				    (KEY_POS_ALL & ~KEY_POS_SETATTR) |
-+				    KEY_USR_VIEW | KEY_USR_READ,
-+				    KEY_ALLOC_NOT_IN_QUOTA, NULL);
-+	if (IS_ERR(system_blacklist_keyring))
-+		panic("Can't allocate system blacklist keyring\n");
-+
-+	set_bit(KEY_FLAG_TRUSTED_ONLY, &system_blacklist_keyring->flags);
-+#endif
-+
- 	return 0;
- }
- 
--- 
-1.9.3
-
-
-From a72ed58241f0d62b7f9fbf4e1fbbcc1e02145098 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Fri, 26 Oct 2012 12:42:16 -0400
-Subject: [PATCH 4/5] MODSIGN: Import certificates from UEFI Secure Boot
-
-Secure Boot stores a list of allowed certificates in the 'db' variable.
-This imports those certificates into the system trusted keyring.  This
-allows for a third party signing certificate to be used in conjunction
-with signed modules.  By importing the public certificate into the 'db'
-variable, a user can allow a module signed with that certificate to
-load.  The shim UEFI bootloader has a similar certificate list stored
-in the 'MokListRT' variable.  We import those as well.
-
-In the opposite case, Secure Boot maintains a list of disallowed
-certificates in the 'dbx' variable.  We load those certificates into
-the newly introduced system blacklist keyring and forbid any module
-signed with those from loading.
-
-Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
----
- include/linux/efi.h   |  6 ++++
- init/Kconfig          |  9 +++++
- kernel/Makefile       |  3 ++
- kernel/modsign_uefi.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 110 insertions(+)
- create mode 100644 kernel/modsign_uefi.c
-
-diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 7854ff3c0f11..31fd75e7230b 100644
---- a/include/linux/efi.h
-+++ b/include/linux/efi.h
-@@ -584,6 +584,12 @@ typedef efi_status_t efi_query_variable_store_t(u32 attributes, unsigned long si
- #define EFI_CERT_X509_GUID \
-     EFI_GUID(  0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 )
- 
-+#define EFI_IMAGE_SECURITY_DATABASE_GUID \
-+    EFI_GUID(  0xd719b2cb, 0x3d3a, 0x4596, 0xa3, 0xbc, 0xda, 0xd0, 0x0e, 0x67, 0x65, 0x6f )
-+
-+#define EFI_SHIM_LOCK_GUID \
-+    EFI_GUID(  0x605dab50, 0xe046, 0x4300, 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 )
-+
- typedef struct {
- 	efi_guid_t guid;
- 	u64 table;
-diff --git a/init/Kconfig b/init/Kconfig
-index ac5f580437a0..ca7268b594aa 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1831,6 +1831,15 @@ config MODULE_SIG_ALL
- comment "Do not forget to sign required modules with scripts/sign-file"
- 	depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL
- 
-+config MODULE_SIG_UEFI
-+	bool "Allow modules signed with certs stored in UEFI"
-+	depends on MODULE_SIG && SYSTEM_BLACKLIST_KEYRING && EFI
-+	select EFI_SIGNATURE_LIST_PARSER
-+	help
-+	  This will import certificates stored in UEFI and allow modules
-+	  signed with those to be loaded.  It will also disallow loading
-+	  of modules stored in the UEFI dbx variable.
-+
- choice
- 	prompt "Which hash algorithm should modules be signed with?"
- 	depends on MODULE_SIG
-diff --git a/kernel/Makefile b/kernel/Makefile
-index f2a8b6246ce9..706e7952bde5 100644
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -46,6 +46,7 @@ obj-$(CONFIG_UID16) += uid16.o
- obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o
- obj-$(CONFIG_MODULES) += module.o
- obj-$(CONFIG_MODULE_SIG) += module_signing.o
-+obj-$(CONFIG_MODULE_SIG_UEFI) += modsign_uefi.o
- obj-$(CONFIG_KALLSYMS) += kallsyms.o
- obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
- obj-$(CONFIG_KEXEC) += kexec.o
-@@ -99,6 +100,8 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o
- 
- $(obj)/configs.o: $(obj)/config_data.h
- 
-+$(obj)/modsign_uefi.o: KBUILD_CFLAGS += -fshort-wchar
-+
- # config_data.h contains the same information as ikconfig.h but gzipped.
- # Info from config_data can be extracted from /proc/config*
- targets += config_data.gz
-diff --git a/kernel/modsign_uefi.c b/kernel/modsign_uefi.c
-new file mode 100644
-index 000000000000..94b0eb38a284
---- /dev/null
-+++ b/kernel/modsign_uefi.c
-@@ -0,0 +1,92 @@
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/cred.h>
-+#include <linux/err.h>
-+#include <linux/efi.h>
-+#include <linux/slab.h>
-+#include <keys/asymmetric-type.h>
-+#include <keys/system_keyring.h>
-+#include "module-internal.h"
-+
-+static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, unsigned long *size)
-+{
-+	efi_status_t status;
-+	unsigned long lsize = 4;
-+	unsigned long tmpdb[4];
-+	void *db = NULL;
-+
-+	status = efi.get_variable(name, guid, NULL, &lsize, &tmpdb);
-+	if (status != EFI_BUFFER_TOO_SMALL) {
-+		pr_err("Couldn't get size: 0x%lx\n", status);
-+		return NULL;
-+	}
-+
-+	db = kmalloc(lsize, GFP_KERNEL);
-+	if (!db) {
-+		pr_err("Couldn't allocate memory for uefi cert list\n");
-+		goto out;
-+	}
-+
-+	status = efi.get_variable(name, guid, NULL, &lsize, db);
-+	if (status != EFI_SUCCESS) {
-+		kfree(db);
-+		db = NULL;
-+		pr_err("Error reading db var: 0x%lx\n", status);
-+	}
-+out:
-+	*size = lsize;
-+	return db;
-+}
-+
-+/*
-+ *  * Load the certs contained in the UEFI databases
-+ *   */
-+static int __init load_uefi_certs(void)
-+{
-+	efi_guid_t secure_var = EFI_IMAGE_SECURITY_DATABASE_GUID;
-+	efi_guid_t mok_var = EFI_SHIM_LOCK_GUID;
-+	void *db = NULL, *dbx = NULL, *mok = NULL;
-+	unsigned long dbsize = 0, dbxsize = 0, moksize = 0;
-+	int rc = 0;
-+
-+	/* Check if SB is enabled and just return if not */
-+	if (!efi_enabled(EFI_SECURE_BOOT))
-+		return 0;
-+
-+	/* Get db, MokListRT, and dbx.  They might not exist, so it isn't
-+	 * an error if we can't get them.
-+	 */
-+	db = get_cert_list(L"db", &secure_var, &dbsize);
-+	if (!db) {
-+		pr_err("MODSIGN: Couldn't get UEFI db list\n");
-+	} else {
-+		rc = parse_efi_signature_list(db, dbsize, system_trusted_keyring);
-+		if (rc)
-+			pr_err("Couldn't parse db signatures: %d\n", rc);
-+		kfree(db);
-+	}
-+
-+	mok = get_cert_list(L"MokListRT", &mok_var, &moksize);
-+	if (!mok) {
-+		pr_info("MODSIGN: Couldn't get UEFI MokListRT\n");
-+	} else {
-+		rc = parse_efi_signature_list(mok, moksize, system_trusted_keyring);
-+		if (rc)
-+			pr_err("Couldn't parse MokListRT signatures: %d\n", rc);
-+		kfree(mok);
-+	}
-+
-+	dbx = get_cert_list(L"dbx", &secure_var, &dbxsize);
-+	if (!dbx) {
-+		pr_info("MODSIGN: Couldn't get UEFI dbx list\n");
-+	} else {
-+		rc = parse_efi_signature_list(dbx, dbxsize,
-+			system_blacklist_keyring);
-+		if (rc)
-+			pr_err("Couldn't parse dbx signatures: %d\n", rc);
-+		kfree(dbx);
-+	}
-+
-+	return rc;
-+}
-+late_initcall(load_uefi_certs);
--- 
-1.9.3
-
-
-From 11bb98e3a62de77fc66a3e2197578dd9d891b998 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Thu, 3 Oct 2013 10:14:23 -0400
-Subject: [PATCH 5/5] MODSIGN: Support not importing certs from db
-
-If a user tells shim to not use the certs/hashes in the UEFI db variable
-for verification purposes, shim will set a UEFI variable called MokIgnoreDB.
-Have the uefi import code look for this and not import things from the db
-variable.
-
-Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
----
- kernel/modsign_uefi.c | 40 +++++++++++++++++++++++++++++++---------
- 1 file changed, 31 insertions(+), 9 deletions(-)
-
-diff --git a/kernel/modsign_uefi.c b/kernel/modsign_uefi.c
-index 94b0eb38a284..ae28b974d49a 100644
---- a/kernel/modsign_uefi.c
-+++ b/kernel/modsign_uefi.c
-@@ -8,6 +8,23 @@
- #include <keys/system_keyring.h>
- #include "module-internal.h"
- 
-+static __init int check_ignore_db(void)
-+{
-+	efi_status_t status;
-+	unsigned int db = 0;
-+	unsigned long size = sizeof(db);
-+	efi_guid_t guid = EFI_SHIM_LOCK_GUID;
-+
-+	/* Check and see if the MokIgnoreDB variable exists.  If that fails
-+	 * then we don't ignore DB.  If it succeeds, we do.
-+	 */
-+	status = efi.get_variable(L"MokIgnoreDB", &guid, NULL, &size, &db);
-+	if (status != EFI_SUCCESS)
-+		return 0;
-+
-+	return 1;
-+}
-+
- static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, unsigned long *size)
- {
- 	efi_status_t status;
-@@ -47,23 +64,28 @@ static int __init load_uefi_certs(void)
- 	efi_guid_t mok_var = EFI_SHIM_LOCK_GUID;
- 	void *db = NULL, *dbx = NULL, *mok = NULL;
- 	unsigned long dbsize = 0, dbxsize = 0, moksize = 0;
--	int rc = 0;
-+	int ignore_db, rc = 0;
- 
- 	/* Check if SB is enabled and just return if not */
- 	if (!efi_enabled(EFI_SECURE_BOOT))
- 		return 0;
- 
-+	/* See if the user has setup Ignore DB mode */
-+	ignore_db = check_ignore_db();
-+
- 	/* Get db, MokListRT, and dbx.  They might not exist, so it isn't
- 	 * an error if we can't get them.
- 	 */
--	db = get_cert_list(L"db", &secure_var, &dbsize);
--	if (!db) {
--		pr_err("MODSIGN: Couldn't get UEFI db list\n");
--	} else {
--		rc = parse_efi_signature_list(db, dbsize, system_trusted_keyring);
--		if (rc)
--			pr_err("Couldn't parse db signatures: %d\n", rc);
--		kfree(db);
-+	if (!ignore_db) {
-+		db = get_cert_list(L"db", &secure_var, &dbsize);
-+		if (!db) {
-+			pr_err("MODSIGN: Couldn't get UEFI db list\n");
-+		} else {
-+			rc = parse_efi_signature_list(db, dbsize, system_trusted_keyring);
-+			if (rc)
-+				pr_err("Couldn't parse db signatures: %d\n", rc);
-+			kfree(db);
-+		}
- 	}
- 
- 	mok = get_cert_list(L"MokListRT", &mok_var, &moksize);
--- 
-1.9.3
-
diff --git a/freed-ora/current/master/no-pcspkr-modalias.patch b/freed-ora/current/master/no-pcspkr-modalias.patch
index 701178b5f..b7d63cc5f 100644
--- a/freed-ora/current/master/no-pcspkr-modalias.patch
+++ b/freed-ora/current/master/no-pcspkr-modalias.patch
@@ -1,11 +1,19 @@
+From 9aa15f9c2fec6f95c267b23a5f826f17ea8be9de 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
+
 Bugzilla: N/A
 Upstream-status: Fedora mustard
+---
+ drivers/input/misc/pcspkr.c | 1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
-index 34f4d2e..3e40c70 100644
+index 674a2cfc3c0e..9a2807227c69 100644
 --- a/drivers/input/misc/pcspkr.c
 +++ b/drivers/input/misc/pcspkr.c
-@@ -24,7 +24,6 @@
+@@ -23,7 +23,6 @@
  MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
  MODULE_DESCRIPTION("PC Speaker beeper driver");
  MODULE_LICENSE("GPL");
@@ -13,3 +21,6 @@ index 34f4d2e..3e40c70 100644
  
  static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
  {
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/patch-3.16-gnu-3.17-rc6-gnu.xz.sign b/freed-ora/current/master/patch-3.16-gnu-3.17-rc6-gnu.xz.sign
new file mode 100644
index 000000000..51cb04d18
--- /dev/null
+++ b/freed-ora/current/master/patch-3.16-gnu-3.17-rc6-gnu.xz.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEABECAAYFAlQn4yMACgkQvLfPh359R6filQCgidiHRsQEUn7FuTlBg+jzMt+x
+OcsAn1WC6OnF1y/BPk7sjVrIb9GFrvqH
+=fJUL
+-----END PGP SIGNATURE-----
diff --git a/freed-ora/current/master/perf-install-trace-event-plugins.patch b/freed-ora/current/master/perf-install-trace-event-plugins.patch
new file mode 100644
index 000000000..9306ac493
--- /dev/null
+++ b/freed-ora/current/master/perf-install-trace-event-plugins.patch
@@ -0,0 +1,31 @@
+From 535d6761f99adb5480237cf8a08ab3a8b20db092 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
+
+perf hardcodes $libdir to be lib for all but x86_64, so kludge around it
+until upstream gets their act together.
+---
+ tools/perf/config/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
+index 86c21a24da46..bf0fe97bd358 100644
+--- a/tools/perf/config/Makefile
++++ b/tools/perf/config/Makefile
+@@ -642,8 +642,12 @@ endif
+ ifeq ($(IS_X86_64),1)
+ lib = lib64
+ else
++ifdef MULTILIBDIR
++lib = $(MULTILIBDIR)
++else
+ lib = lib
+ endif
++endif
+ libdir = $(prefix)/$(lib)
+ 
+ # Shell quote (do not use $(call) to accommodate ancient setups);
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/perf-lib64.patch b/freed-ora/current/master/perf-lib64.patch
deleted file mode 100644
index 85790ba92..000000000
--- a/freed-ora/current/master/perf-lib64.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
-index 802cf54..7f30bfa 100644
---- a/tools/perf/config/Makefile
-+++ b/tools/perf/config/Makefile
-@@ -621,8 +621,12 @@ endif
- ifeq ($(IS_X86_64),1)
- lib = lib64
- else
-+ifdef MULTILIBDIR
-+lib = $(MULTILIBDIR)
-+else
- lib = lib
- endif
-+endif
- libdir = $(prefix)/$(lib)
-
- # Shell quote (do not use $(call) to accommodate ancient setups);
diff --git a/freed-ora/current/master/pinctrl-pinctrl-single-must-be-initialized-early.patch b/freed-ora/current/master/pinctrl-pinctrl-single-must-be-initialized-early.patch
new file mode 100644
index 000000000..45ba6cbcd
--- /dev/null
+++ b/freed-ora/current/master/pinctrl-pinctrl-single-must-be-initialized-early.patch
@@ -0,0 +1,38 @@
+From fbeb8858cc40075f223ebc14dad7b43063c17510 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.
+
+When using pinctrl-single to handle i2c initialization, it has
+to be done early. Whether this is the best way to do so, is an
+exercise left to the reader.
+---
+ drivers/pinctrl/pinctrl-single.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
+index 95dd9cf55cb3..800fc34d7ea9 100644
+--- a/drivers/pinctrl/pinctrl-single.c
++++ b/drivers/pinctrl/pinctrl-single.c
+@@ -2012,7 +2012,17 @@ static struct platform_driver pcs_driver = {
+ #endif
+ };
+ 
+-module_platform_driver(pcs_driver);
++static int __init pcs_init(void)
++{
++	return platform_driver_register(&pcs_driver);
++}
++postcore_initcall(pcs_init);
++
++static void __exit pcs_exit(void)
++{
++	platform_driver_unregister(&pcs_driver);
++}
++module_exit(pcs_exit);
+ 
+ MODULE_AUTHOR("Tony Lindgren <tony@atomide.com>");
+ MODULE_DESCRIPTION("One-register-per-pin type device tree based pinctrl driver");
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/ppc64-fixtools.patch b/freed-ora/current/master/ppc64-fixtools.patch
new file mode 100644
index 000000000..f461d298a
--- /dev/null
+++ b/freed-ora/current/master/ppc64-fixtools.patch
@@ -0,0 +1,12 @@
+diff --git a/tools/perf/arch/powerpc/util/skip-callchain-idx.c b/tools/perf/arch/powerpc/util/skip-callchain-idx.c
+index a7c23a4..d73ef8b 100644
+--- a/tools/perf/arch/powerpc/util/skip-callchain-idx.c
++++ b/tools/perf/arch/powerpc/util/skip-callchain-idx.c
+@@ -15,6 +15,7 @@
+ 
+ #include "util/thread.h"
+ #include "util/callchain.h"
++#include "util/debug.h"
+ 
+ /*
+  * When saving the callchain on Power, the kernel conservatively saves
diff --git a/freed-ora/current/master/psmouse-Add-psmouse_matches_pnp_id-helper-function.patch b/freed-ora/current/master/psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
new file mode 100644
index 000000000..1b5c20571
--- /dev/null
+++ b/freed-ora/current/master/psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
@@ -0,0 +1,100 @@
+From d60ad4f488169a5cfc72b75a9abdf6c005fe1c86 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Fri, 27 Jun 2014 18:46:42 +0200
+Subject: [PATCH] psmouse: Add psmouse_matches_pnp_id helper function
+
+The matches_pnp_id function from the synaptics driver is useful for other
+drivers too. Make it a generic psmouse helper function.
+
+Bugzilla: 1110011
+Upstream-status: sent for 3.17/3.18
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/input/mouse/psmouse-base.c | 14 ++++++++++++++
+ drivers/input/mouse/psmouse.h      |  1 +
+ drivers/input/mouse/synaptics.c    | 17 +++--------------
+ 3 files changed, 18 insertions(+), 14 deletions(-)
+
+diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
+index b4e1f014ddc2..02e68c3008a3 100644
+--- a/drivers/input/mouse/psmouse-base.c
++++ b/drivers/input/mouse/psmouse-base.c
+@@ -462,6 +462,20 @@ static int psmouse_poll(struct psmouse *psmouse)
+ 			   PSMOUSE_CMD_POLL | (psmouse->pktsize << 8));
+ }
+ 
++/*
++ * psmouse_matches_pnp_id - check if psmouse matches one of the passed in ids.
++ */
++bool psmouse_matches_pnp_id(struct psmouse *psmouse, const char * const ids[])
++{
++	int i;
++
++	if (!strncmp(psmouse->ps2dev.serio->firmware_id, "PNP:", 4))
++		for (i = 0; ids[i]; i++)
++			if (strstr(psmouse->ps2dev.serio->firmware_id, ids[i]))
++				return true;
++
++	return false;
++}
+ 
+ /*
+  * Genius NetMouse magic init.
+diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
+index 2f0b39d59a9b..f4cf664c7db3 100644
+--- a/drivers/input/mouse/psmouse.h
++++ b/drivers/input/mouse/psmouse.h
+@@ -108,6 +108,7 @@ void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution);
+ psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse);
+ int psmouse_activate(struct psmouse *psmouse);
+ int psmouse_deactivate(struct psmouse *psmouse);
++bool psmouse_matches_pnp_id(struct psmouse *psmouse, const char * const ids[]);
+ 
+ struct psmouse_attribute {
+ 	struct device_attribute dattr;
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index fd23181c1fb7..6394d9b5bfd3 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -185,18 +185,6 @@ static const char * const topbuttonpad_pnp_ids[] = {
+ 	NULL
+ };
+ 
+-static bool matches_pnp_id(struct psmouse *psmouse, const char * const ids[])
+-{
+-	int i;
+-
+-	if (!strncmp(psmouse->ps2dev.serio->firmware_id, "PNP:", 4))
+-		for (i = 0; ids[i]; i++)
+-			if (strstr(psmouse->ps2dev.serio->firmware_id, ids[i]))
+-				return true;
+-
+-	return false;
+-}
+-
+ /*****************************************************************************
+  *	Synaptics communications functions
+  ****************************************************************************/
+@@ -362,7 +350,8 @@ static int synaptics_resolution(struct psmouse *psmouse)
+ 	}
+ 
+ 	for (i = 0; min_max_pnpid_table[i].pnp_ids; i++) {
+-		if (matches_pnp_id(psmouse, min_max_pnpid_table[i].pnp_ids)) {
++		if (psmouse_matches_pnp_id(psmouse,
++					   min_max_pnpid_table[i].pnp_ids)) {
+ 			priv->x_min = min_max_pnpid_table[i].x_min;
+ 			priv->x_max = min_max_pnpid_table[i].x_max;
+ 			priv->y_min = min_max_pnpid_table[i].y_min;
+@@ -1492,7 +1481,7 @@ static void set_input_params(struct psmouse *psmouse,
+ 
+ 	if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) {
+ 		__set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
+-		if (matches_pnp_id(psmouse, topbuttonpad_pnp_ids))
++		if (psmouse_matches_pnp_id(psmouse, topbuttonpad_pnp_ids))
+ 			__set_bit(INPUT_PROP_TOPBUTTONPAD, dev->propbit);
+ 		/* Clickpads report only left button */
+ 		__clear_bit(BTN_RIGHT, dev->keybit);
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch b/freed-ora/current/master/psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
new file mode 100644
index 000000000..760cd9128
--- /dev/null
+++ b/freed-ora/current/master/psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
@@ -0,0 +1,158 @@
+From 1a506e1f64b4ef6be20c8cddede77a94c40e92bc Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Fri, 27 Jun 2014 18:50:33 +0200
+Subject: [PATCH] psmouse: Add support for detecting FocalTech PS/2 touchpads
+
+The Asus X450 and X550 laptops use a PS/2 touchpad from a new manufacturer
+called FocalTech:
+
+https://bugzilla.kernel.org/show_bug.cgi?id=77391
+https://bugzilla.redhat.com/show_bug.cgi?id=1110011
+
+The protocol for these devices is not known at this time, but even without
+knowing the protocol they need some special handling. They get upset by some
+of our other PS/2 device probing, and once upset generate random mouse events
+making things unusable even with an external mouse.
+
+This patch adds detection of these devices based on their pnp ids, and when
+they are detected, treats them as a bare ps/2 mouse. Doing things this way
+they at least work in their ps/2 mouse emulation mode.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/input/mouse/Makefile       |  2 +-
+ drivers/input/mouse/focaltech.c    | 44 ++++++++++++++++++++++++++++++++++++++
+ drivers/input/mouse/focaltech.h    | 21 ++++++++++++++++++
+ drivers/input/mouse/psmouse-base.c | 10 +++++++++
+ 4 files changed, 76 insertions(+), 1 deletion(-)
+ create mode 100644 drivers/input/mouse/focaltech.c
+ create mode 100644 drivers/input/mouse/focaltech.h
+
+diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
+index c25efdb3f288..dda507f8b3a2 100644
+--- a/drivers/input/mouse/Makefile
++++ b/drivers/input/mouse/Makefile
+@@ -23,7 +23,7 @@ obj-$(CONFIG_MOUSE_SYNAPTICS_I2C)	+= synaptics_i2c.o
+ obj-$(CONFIG_MOUSE_SYNAPTICS_USB)	+= synaptics_usb.o
+ obj-$(CONFIG_MOUSE_VSXXXAA)		+= vsxxxaa.o
+ 
+-psmouse-objs := psmouse-base.o synaptics.o
++psmouse-objs := psmouse-base.o synaptics.o focaltech.o
+ 
+ psmouse-$(CONFIG_MOUSE_PS2_ALPS)	+= alps.o
+ psmouse-$(CONFIG_MOUSE_PS2_ELANTECH)	+= elantech.o
+diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
+new file mode 100644
+index 000000000000..d83a23554d63
+--- /dev/null
++++ b/drivers/input/mouse/focaltech.c
+@@ -0,0 +1,44 @@
++/*
++ * Focaltech TouchPad PS/2 mouse driver
++ *
++ * Copyright (c) 2014 Red Hat Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * Red Hat authors:
++ *
++ * Hans de Goede <hdegoede@redhat.com>
++ */
++
++/*
++ * The Focaltech PS/2 touchpad protocol is unknown. This drivers deals with
++ * detection only, to avoid further detection attempts confusing the touchpad
++ * this way it at least works in PS/2 mouse compatibility mode.
++ */
++
++#include <linux/device.h>
++#include <linux/libps2.h>
++#include "psmouse.h"
++
++static const char * const focaltech_pnp_ids[] = {
++	"FLT0101",
++	"FLT0102",
++	"FLT0103",
++	NULL
++};
++
++int focaltech_detect(struct psmouse *psmouse, bool set_properties)
++{
++	if (!psmouse_matches_pnp_id(psmouse, focaltech_pnp_ids))
++		return -ENODEV;
++
++	if (set_properties) {
++		psmouse->vendor = "FocalTech";
++		psmouse->name = "FocalTech Touchpad in mouse emulation mode";
++	}
++
++	return 0;
++}
+diff --git a/drivers/input/mouse/focaltech.h b/drivers/input/mouse/focaltech.h
+new file mode 100644
+index 000000000000..0d0fc49451fe
+--- /dev/null
++++ b/drivers/input/mouse/focaltech.h
+@@ -0,0 +1,21 @@
++/*
++ * Focaltech TouchPad PS/2 mouse driver
++ *
++ * Copyright (c) 2014 Red Hat Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * Red Hat authors:
++ *
++ * Hans de Goede <hdegoede@redhat.com>
++ */
++
++#ifndef _FOCALTECH_H
++#define _FOCALTECH_H
++
++int focaltech_detect(struct psmouse *psmouse, bool set_properties);
++
++#endif
+diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
+index 02e68c3008a3..2c8c8e2172a2 100644
+--- a/drivers/input/mouse/psmouse-base.c
++++ b/drivers/input/mouse/psmouse-base.c
+@@ -35,6 +35,7 @@
+ #include "elantech.h"
+ #include "sentelic.h"
+ #include "cypress_ps2.h"
++#include "focaltech.h"
+ 
+ #define DRIVER_DESC	"PS/2 mouse driver"
+ 
+@@ -722,6 +723,13 @@ static int psmouse_extensions(struct psmouse *psmouse,
+ {
+ 	bool synaptics_hardware = false;
+ 
++/* Always check for focaltech, this is safe as it uses pnp-id matching */
++	if (psmouse_do_detect(focaltech_detect, psmouse, set_properties) == 0) {
++		/* Not supported yet, use bare protocol */
++		psmouse_max_proto = max_proto = PSMOUSE_PS2;
++		goto reset_to_defaults;
++	}
++
+ /*
+  * We always check for lifebook because it does not disturb mouse
+  * (it only checks DMI information).
+@@ -873,6 +881,8 @@ static int psmouse_extensions(struct psmouse *psmouse,
+ 		}
+ 	}
+ 
++reset_to_defaults:
++
+ /*
+  * Reset to defaults in case the device got confused by extended
+  * protocol probes. Note that we follow up with full reset because
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch b/freed-ora/current/master/revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch
deleted file mode 100644
index f9f4a72a0..000000000
--- a/freed-ora/current/master/revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Bugzilla: N/A
-Upstream-status: Sent upstream
-
-This reverts commit 1b2faaf7e219fc2905d75afcd4c815e5d39eda80.
-
-The Intuos4 series presents a bug in which it hangs if it receives
-a set feature command while switching to the enhanced mode.
-This bug is triggered when plugging an Intuos 4 while having
-a gnome user session up and running.
-
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
----
-
-Hi Aris,
-
-actually, you bisected the bug, so can I consider that I have your signed-off-by?
-
-Cheers,
-Benjamin
-
- drivers/input/tablet/wacom_sys.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
-index 7087b33..319a3ff 100644
---- a/drivers/input/tablet/wacom_sys.c
-+++ b/drivers/input/tablet/wacom_sys.c
-@@ -536,6 +536,9 @@ static int wacom_set_device_mode(struct usb_interface *intf, int report_id, int
- 
- 		error = wacom_set_report(intf, WAC_HID_FEATURE_REPORT,
- 		                         report_id, rep_data, length, 1);
-+		if (error >= 0)
-+			error = wacom_get_report(intf, WAC_HID_FEATURE_REPORT,
-+			                         report_id, rep_data, length, 1);
- 	} while ((error < 0 || rep_data[1] != mode) && limit++ < WAC_MSG_RETRIES);
- 
- 	kfree(rep_data);
--- 
-1.9.0
-
diff --git a/freed-ora/current/master/samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch b/freed-ora/current/master/samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
index 93c4073ce..d74f190f7 100644
--- a/freed-ora/current/master/samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
+++ b/freed-ora/current/master/samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
@@ -1,21 +1,19 @@
-Bugzilla: 861573
-Upstream-status: Waiting for feedback from reporter
-
-From 2fa2078cdd4198b49c02cb03087158d398476463 Mon Sep 17 00:00:00 2001
+From cfb7d69676ca23c8f2910cdd3181e509dcf76676 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 02/14] samsung-laptop: Add broken-acpi-video quirk for
- NC210/NC110
+Subject: [PATCH] samsung-laptop: Add broken-acpi-video quirk for NC210/NC110
 
 Reported (and tested) here:
 https://bugzilla.redhat.com/show_bug.cgi?id=861573
 
+Bugzilla: 861573
+Upstream-status: Waiting for feedback from reporter
+
 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
 ---
  drivers/platform/x86/samsung-laptop.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
-
 diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
 index 5a5966512277..0d7954e0fc74 100644
 --- a/drivers/platform/x86/samsung-laptop.c
@@ -37,3 +35,6 @@ index 5a5966512277..0d7954e0fc74 100644
  	{ },
  };
  MODULE_DEVICE_TABLE(dmi, samsung_dmi_table);
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/sb-hibernate.patch b/freed-ora/current/master/sb-hibernate.patch
deleted file mode 100644
index 4b1bd1673..000000000
--- a/freed-ora/current/master/sb-hibernate.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Bugzilla: N/A
-Upstream-status: Fedora mustard
-
-From 9cdffb6980a2c573844b4b87f907da24d68fb916 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Fri, 26 Oct 2012 14:02:09 -0400
-Subject: [PATCH] hibernate: Disable in a signed modules environment
-
-There is currently no way to verify the resume image when returning
-from hibernate.  This might compromise the signed modules trust model,
-so until we can work with signed hibernate images we disable it in
-a secure modules environment.
-
-Signed-off-by: Josh Boyer <jwboyer@fedoraproject.com>
----
- kernel/power/hibernate.c | 16 +++++++++++++++-
- kernel/power/main.c      |  7 ++++++-
- kernel/power/user.c      |  1 +
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
-index 49e0a20fd010..777eff68e8ef 100644
---- a/kernel/power/hibernate.c
-+++ b/kernel/power/hibernate.c
-@@ -29,6 +29,8 @@
- #include <linux/ctype.h>
- #include <linux/genhd.h>
- #include <trace/events/power.h>
-+#include <linux/module.h>
-+#include <linux/efi.h>
- 
- #include "power.h"
- 
-@@ -642,6 +644,10 @@ int hibernate(void)
- {
- 	int error;
- 
-+	if (secure_modules()) {
-+		return -EPERM;
-+	}
-+
- 	lock_system_sleep();
- 	/* The snapshot device should not be opened while we're running */
- 	if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
-@@ -734,7 +740,7 @@ static int software_resume(void)
- 	/*
- 	 * If the user said "noresume".. bail out early.
- 	 */
--	if (noresume)
-+	if (noresume || secure_modules())
- 		return 0;
- 
- 	/*
-@@ -900,6 +906,11 @@ static ssize_t disk_show(struct kobject *kobj, struct kobj_attribute *attr,
- 	int i;
- 	char *start = buf;
- 
-+	if (efi_enabled(EFI_SECURE_BOOT)) {
-+		buf += sprintf(buf, "[%s]\n", "disabled");
-+		return buf-start;
-+	}
-+
- 	for (i = HIBERNATION_FIRST; i <= HIBERNATION_MAX; i++) {
- 		if (!hibernation_modes[i])
- 			continue;
-@@ -934,6 +945,9 @@ static ssize_t disk_store(struct kobject *kobj, struct kobj_attribute *attr,
- 	char *p;
- 	int mode = HIBERNATION_INVALID;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	p = memchr(buf, '\n', n);
- 	len = p ? p - buf : n;
- 
-diff --git a/kernel/power/main.c b/kernel/power/main.c
-index 573410d6647e..f5201093adc4 100644
---- a/kernel/power/main.c
-+++ b/kernel/power/main.c
-@@ -15,6 +15,7 @@
- #include <linux/workqueue.h>
- #include <linux/debugfs.h>
- #include <linux/seq_file.h>
-+#include <linux/efi.h>
- 
- #include "power.h"
- 
-@@ -301,7 +302,11 @@ static ssize_t state_show(struct kobject *kobj, struct kobj_attribute *attr,
- 
- #endif
- #ifdef CONFIG_HIBERNATION
--	s += sprintf(s, "%s\n", "disk");
-+	if (!efi_enabled(EFI_SECURE_BOOT)) {
-+		s += sprintf(s, "%s\n", "disk");
-+	} else {
-+		s += sprintf(s, "\n");
-+	}
- #else
- 	if (s != buf)
- 		/* convert the last space to a newline */
-diff --git a/kernel/power/user.c b/kernel/power/user.c
-index efe99dee9510..5f5d1026f1e2 100644
---- a/kernel/power/user.c
-+++ b/kernel/power/user.c
-@@ -25,6 +25,7 @@
- #include <linux/cpu.h>
- #include <linux/freezer.h>
- #include <linux/module.h>
-+#include <linux/efi.h>
- 
- #include <asm/uaccess.h>
- 
--- 
-1.9.3
-
diff --git a/freed-ora/current/master/sched-fix-sched_setparam-policy-1-logic.patch b/freed-ora/current/master/sched-fix-sched_setparam-policy-1-logic.patch
deleted file mode 100644
index 060e0dcef..000000000
--- a/freed-ora/current/master/sched-fix-sched_setparam-policy-1-logic.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Bugzilla: 1117942
-Upstream-status: Sent for 3.16 and seen by peterz
-
-The scheduler uses policy=-1 to preserve the current policy state to
-implement sched_setparam(). But, as (int) -1 is equals to 0xffffffff,
-it's matching the if (policy & SCHED_RESET_ON_FORK) on
-_sched_setscheduler(). This match changes the policy value to an
-invalid value, breaking the sched_setparam() syscall.
-
-This patch checks policy=-1 before check the SCHED_RESET_ON_FORK flag.
-
-The following program shows the bug:
-
-int main(void)
-{
-	struct sched_param param = {
-		.sched_priority = 5,
-	};
-
-	sched_setscheduler(0, SCHED_FIFO, &param);
-	param.sched_priority = 1;
-	sched_setparam(0, &param);
-	param.sched_priority = 0;
-	sched_getparam(0, &param);
-	if (param.sched_priority != 1)
-		printf("failed priority setting (found %d instead of 1)\n",
-			param.sched_priority);
-	else
-		printf("priority setting fine\n");
-}
-
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Ingo Molnar <mingo@kernel.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: stable@vger.kernel.org # 3.14+
-Fixes: 7479f3c9cf67 "sched: Move SCHED_RESET_ON_FORK into attr::sched_flags"
-Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
-Signed-off-by: Daniel Bristot de Oliveira <bristot@redhat.com>
-
----
- kernel/sched/core.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index bc1638b..0acf96b 100644
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -3558,9 +3558,10 @@ static int _sched_setscheduler(struct task_struct *p, int policy,
- 	};
- 
- 	/*
--	 * Fixup the legacy SCHED_RESET_ON_FORK hack
-+	 * Fixup the legacy SCHED_RESET_ON_FORK hack, except if
-+	 * the policy=-1 was passed by sched_setparam().
- 	 */
--	if (policy & SCHED_RESET_ON_FORK) {
-+	if ((policy != -1) && (policy & SCHED_RESET_ON_FORK)) {
- 		attr.sched_flags |= SCHED_FLAG_RESET_ON_FORK;
- 		policy &= ~SCHED_RESET_ON_FORK;
- 		attr.sched_policy = policy;
--- 
-1.9.3
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
diff --git a/freed-ora/current/master/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch b/freed-ora/current/master/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
index 2cdbc31f5..548ca10dd 100644
--- a/freed-ora/current/master/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
+++ b/freed-ora/current/master/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -1,16 +1,26 @@
+From c9a95dea81e2a29a6bb216ba4b8e6f4cf949864f 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
+
 Bugzilla: 754518
 Upstream-status: Fedora mustard (might be worth dropping...)
+---
+ drivers/scsi/sd.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
---- a/drivers/scsi/sd.c	
-+++ a/drivers/scsi/sd.c	
-@@ -2362,13 +2362,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
+diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
+index 2c2041ca4b70..e10812d985af 100644
+--- a/drivers/scsi/sd.c
++++ b/drivers/scsi/sd.c
+@@ -2749,13 +2749,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
  static int sd_revalidate_disk(struct gendisk *disk)
  {
  	struct scsi_disk *sdkp = scsi_disk(disk);
 -	struct scsi_device *sdp = sdkp->device;
 +	struct scsi_device *sdp;
  	unsigned char *buffer;
- 	unsigned flush = 0;
+ 	unsigned int max_xfer;
  
  	SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp,
  				      "sd_revalidate_disk\n"));
@@ -23,3 +33,6 @@ Upstream-status: Fedora mustard (might be worth dropping...)
  	/*
  	 * If the device is offline, don't try and read capacity or any
  	 * of the other niceties.
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/secure-modules.patch b/freed-ora/current/master/secure-modules.patch
deleted file mode 100644
index 2d3174c22..000000000
--- a/freed-ora/current/master/secure-modules.patch
+++ /dev/null
@@ -1,877 +0,0 @@
-Bugzilla: N/A
-Upstream-status: Fedora mustard.  Replaced by securelevels, but that was nak'd
-
-From 952dbcbea4cffb1a05773af3b5f41e8ed477c5fe 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 01/14] Add secure_modules() call
-
-Provide a single call to allow kernel code to determine whether the system
-has been configured to either disable module loading entirely or to load
-only modules signed with a trusted key.
-
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
----
- include/linux/module.h |  7 +++++++
- kernel/module.c        | 10 ++++++++++
- 2 files changed, 17 insertions(+)
-
-diff --git a/include/linux/module.h b/include/linux/module.h
-index f520a767c86c..fc9b54eb779e 100644
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -509,6 +509,8 @@ int unregister_module_notifier(struct notifier_block *nb);
- 
- extern void print_modules(void);
- 
-+extern bool secure_modules(void);
-+
- #else /* !CONFIG_MODULES... */
- 
- /* Given an address, look for it in the exception tables. */
-@@ -619,6 +621,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
- static inline void print_modules(void)
- {
- }
-+
-+static inline bool secure_modules(void)
-+{
-+	return false;
-+}
- #endif /* CONFIG_MODULES */
- 
- #ifdef CONFIG_SYSFS
-diff --git a/kernel/module.c b/kernel/module.c
-index 81e727cf6df9..fc14f48915dd 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -3843,3 +3843,13 @@ void module_layout(struct module *mod,
- }
- EXPORT_SYMBOL(module_layout);
- #endif
-+
-+bool secure_modules(void)
-+{
-+#ifdef CONFIG_MODULE_SIG
-+	return (sig_enforce || modules_disabled);
-+#else
-+	return modules_disabled;
-+#endif
-+}
-+EXPORT_SYMBOL(secure_modules);
--- 
-1.9.3
-
-
-From 3b451a12e60a47d152ecce1c02634c4d7320b024 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 02/14] PCI: Lock down BAR access when module security is
- enabled
-
-Any hardware that can potentially generate DMA has to be locked down from
-userspace in order to avoid it being possible for an attacker to modify
-kernel code, allowing them to circumvent disabled module loading or module
-signing. Default to paranoid - in future we can potentially relax this for
-sufficiently IOMMU-isolated devices.
-
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
----
- drivers/pci/pci-sysfs.c | 10 ++++++++++
- drivers/pci/proc.c      |  8 +++++++-
- drivers/pci/syscall.c   |  3 ++-
- 3 files changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
-index 9ff0a901ecf7..8d0d5d92b8d9 100644
---- a/drivers/pci/pci-sysfs.c
-+++ b/drivers/pci/pci-sysfs.c
-@@ -30,6 +30,7 @@
- #include <linux/vgaarb.h>
- #include <linux/pm_runtime.h>
- #include <linux/of.h>
-+#include <linux/module.h>
- #include "pci.h"
- 
- static int sysfs_initialized;	/* = 0 */
-@@ -704,6 +705,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj,
- 	loff_t init_off = off;
- 	u8 *data = (u8 *) buf;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	if (off > dev->cfg_size)
- 		return 0;
- 	if (off + count > dev->cfg_size) {
-@@ -998,6 +1002,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
- 	resource_size_t start, end;
- 	int i;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	for (i = 0; i < PCI_ROM_RESOURCE; i++)
- 		if (res == &pdev->resource[i])
- 			break;
-@@ -1099,6 +1106,9 @@ static ssize_t pci_write_resource_io(struct file *filp, struct kobject *kobj,
- 				     struct bin_attribute *attr, char *buf,
- 				     loff_t off, size_t count)
- {
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	return pci_resource_io(filp, kobj, attr, buf, off, count, true);
- }
- 
-diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
-index 3f155e78513f..4265ea07e3b0 100644
---- a/drivers/pci/proc.c
-+++ b/drivers/pci/proc.c
-@@ -116,6 +116,9 @@ static ssize_t proc_bus_pci_write(struct file *file, const char __user *buf,
- 	int size = dev->cfg_size;
- 	int cnt;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	if (pos >= size)
- 		return 0;
- 	if (nbytes >= size)
-@@ -195,6 +198,9 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
- #endif /* HAVE_PCI_MMAP */
- 	int ret = 0;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	switch (cmd) {
- 	case PCIIOC_CONTROLLER:
- 		ret = pci_domain_nr(dev->bus);
-@@ -233,7 +239,7 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
- 	struct pci_filp_private *fpriv = file->private_data;
- 	int i, ret;
- 
--	if (!capable(CAP_SYS_RAWIO))
-+	if (!capable(CAP_SYS_RAWIO) || secure_modules())
- 		return -EPERM;
- 
- 	/* Make sure the caller is mapping a real resource for this device */
-diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
-index b91c4da68365..98f5637304d1 100644
---- a/drivers/pci/syscall.c
-+++ b/drivers/pci/syscall.c
-@@ -10,6 +10,7 @@
- #include <linux/errno.h>
- #include <linux/pci.h>
- #include <linux/syscalls.h>
-+#include <linux/module.h>
- #include <asm/uaccess.h>
- #include "pci.h"
- 
-@@ -92,7 +93,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn,
- 	u32 dword;
- 	int err = 0;
- 
--	if (!capable(CAP_SYS_ADMIN))
-+	if (!capable(CAP_SYS_ADMIN) || secure_modules())
- 		return -EPERM;
- 
- 	dev = pci_get_bus_and_slot(bus, dfn);
--- 
-1.9.3
-
-
-From 42a620055ac873fb378ec69731c7a2200f6779cc 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 03/14] x86: Lock down IO port access when module security is
- enabled
-
-IO port access would permit users to gain access to PCI configuration
-registers, which in turn (on a lot of hardware) give access to MMIO register
-space. This would potentially permit root to trigger arbitrary DMA, so lock
-it down by default.
-
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
----
- arch/x86/kernel/ioport.c | 5 +++--
- drivers/char/mem.c       | 4 ++++
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
-index 4ddaf66ea35f..00b440307419 100644
---- a/arch/x86/kernel/ioport.c
-+++ b/arch/x86/kernel/ioport.c
-@@ -15,6 +15,7 @@
- #include <linux/thread_info.h>
- #include <linux/syscalls.h>
- #include <linux/bitmap.h>
-+#include <linux/module.h>
- #include <asm/syscalls.h>
- 
- /*
-@@ -28,7 +29,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
- 
- 	if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
- 		return -EINVAL;
--	if (turn_on && !capable(CAP_SYS_RAWIO))
-+	if (turn_on && (!capable(CAP_SYS_RAWIO) || secure_modules()))
- 		return -EPERM;
- 
- 	/*
-@@ -103,7 +104,7 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
- 		return -EINVAL;
- 	/* Trying to gain more privileges? */
- 	if (level > old) {
--		if (!capable(CAP_SYS_RAWIO))
-+		if (!capable(CAP_SYS_RAWIO) || secure_modules())
- 			return -EPERM;
- 	}
- 	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
-diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index 917403fe10da..cdf839f9defe 100644
---- a/drivers/char/mem.c
-+++ b/drivers/char/mem.c
-@@ -27,6 +27,7 @@
- #include <linux/export.h>
- #include <linux/io.h>
- #include <linux/aio.h>
-+#include <linux/module.h>
- 
- #include <asm/uaccess.h>
- 
-@@ -568,6 +569,9 @@ static ssize_t write_port(struct file *file, const char __user *buf,
- 	unsigned long i = *ppos;
- 	const char __user *tmp = buf;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	if (!access_ok(VERIFY_READ, buf, count))
- 		return -EFAULT;
- 	while (count-- > 0 && i < 65536) {
--- 
-1.9.3
-
-
-From 8019fb7c7b5f18b19f7c980987953680ee218c9f 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 04/14] ACPI: Limit access to custom_method
-
-custom_method effectively allows arbitrary access to system memory, making
-it possible for an attacker to circumvent restrictions on module loading.
-Disable it if any such restrictions have been enabled.
-
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
----
- drivers/acpi/custom_method.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
-index c68e72414a67..4277938af700 100644
---- a/drivers/acpi/custom_method.c
-+++ b/drivers/acpi/custom_method.c
-@@ -29,6 +29,9 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
- 	struct acpi_table_header table;
- 	acpi_status status;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	if (!(*ppos)) {
- 		/* parse the table header to get the table length */
- 		if (count <= sizeof(struct acpi_table_header))
--- 
-1.9.3
-
-
-From bf84e9e1022b2d3d0c97ae48fb8b61e5336c50f8 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 05/14] asus-wmi: Restrict debugfs interface when module
- loading is restricted
-
-We have no way of validating what all of the Asus WMI methods do on a
-given machine, and there's a risk that some will allow hardware state to
-be manipulated in such a way that arbitrary code can be executed in the
-kernel, circumventing module loading restrictions. Prevent that if any of
-these features are enabled.
-
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
----
- drivers/platform/x86/asus-wmi.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
-index 3c6ccedc82b6..960c46536c65 100644
---- a/drivers/platform/x86/asus-wmi.c
-+++ b/drivers/platform/x86/asus-wmi.c
-@@ -1592,6 +1592,9 @@ static int show_dsts(struct seq_file *m, void *data)
- 	int err;
- 	u32 retval = -1;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
- 
- 	if (err < 0)
-@@ -1608,6 +1611,9 @@ static int show_devs(struct seq_file *m, void *data)
- 	int err;
- 	u32 retval = -1;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
- 				    &retval);
- 
-@@ -1632,6 +1638,9 @@ static int show_call(struct seq_file *m, void *data)
- 	union acpi_object *obj;
- 	acpi_status status;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
- 				     1, asus->debug.method_id,
- 				     &input, &output);
--- 
-1.9.3
-
-
-From 9a56e8715d3b6dc84989997f34b6b5d407cabad2 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 06/14] Restrict /dev/mem and /dev/kmem when module loading is
- restricted
-
-Allowing users to write to address space makes it possible for the kernel
-to be subverted, avoiding module loading restrictions. Prevent this when
-any restrictions have been imposed on loading modules.
-
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
----
- drivers/char/mem.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index cdf839f9defe..c63cf93b00eb 100644
---- a/drivers/char/mem.c
-+++ b/drivers/char/mem.c
-@@ -164,6 +164,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
- 	if (p != *ppos)
- 		return -EFBIG;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	if (!valid_phys_addr_range(p, count))
- 		return -EFAULT;
- 
-@@ -502,6 +505,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
- 	char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
- 	int err = 0;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	if (p < (unsigned long) high_memory) {
- 		unsigned long to_write = min_t(unsigned long, count,
- 					       (unsigned long)high_memory - p);
--- 
-1.9.3
-
-
-From 8d6faa19bbbaa4df411becda7e40c4ea0684c134 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@redhat.com>
-Date: Mon, 25 Jun 2012 19:57:30 -0400
-Subject: [PATCH 07/14] acpi: Ignore acpi_rsdp kernel parameter when module
- loading is restricted
-
-This option allows userspace to pass the RSDP address to the kernel, which
-makes it possible for a user to circumvent any restrictions imposed on
-loading modules. Disable it in that case.
-
-Signed-off-by: Josh Boyer <jwboyer@redhat.com>
----
- drivers/acpi/osl.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
-index bad25b070fe0..0606585e8b93 100644
---- a/drivers/acpi/osl.c
-+++ b/drivers/acpi/osl.c
-@@ -44,6 +44,7 @@
- #include <linux/list.h>
- #include <linux/jiffies.h>
- #include <linux/semaphore.h>
-+#include <linux/module.h>
- 
- #include <asm/io.h>
- #include <asm/uaccess.h>
-@@ -245,7 +246,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
- acpi_physical_address __init acpi_os_get_root_pointer(void)
- {
- #ifdef CONFIG_KEXEC
--	if (acpi_rsdp)
-+	if (acpi_rsdp && !secure_modules())
- 		return acpi_rsdp;
- #endif
- 
--- 
-1.9.3
-
-
-From 1ff86ddea019f543f6668b56889f86811028f303 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 08/14] kexec: Disable at runtime if the kernel enforces module
- loading restrictions
-
-kexec permits the loading and execution of arbitrary code in ring 0, which
-is something that module signing enforcement is meant to prevent. It makes
-sense to disable kexec in this situation.
-
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
----
- kernel/kexec.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/kernel/kexec.c b/kernel/kexec.c
-index 4b8f0c925884..df14daa323a9 100644
---- a/kernel/kexec.c
-+++ b/kernel/kexec.c
-@@ -34,6 +34,7 @@
- #include <linux/syscore_ops.h>
- #include <linux/compiler.h>
- #include <linux/hugetlb.h>
-+#include <linux/module.h>
- 
- #include <asm/page.h>
- #include <asm/uaccess.h>
-@@ -947,6 +948,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
- 		return -EPERM;
- 
- 	/*
-+	 * kexec can be used to circumvent module loading restrictions, so
-+	 * prevent loading in that case
-+	 */
-+	if (secure_modules())
-+		return -EPERM;
-+
-+	/*
- 	 * Verify we have a legal set of flags
- 	 * This leaves us room for future extensions.
- 	 */
--- 
-1.9.3
-
-
-From 4d56368f1364b45c18067bab1d6abc5ce0f67183 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 09/14] x86: Restrict MSR access when module loading is
- restricted
-
-Writing to MSRs should not be allowed if module loading is restricted,
-since it could lead to execution of arbitrary code in kernel mode. Based
-on a patch by Kees Cook.
-
-Cc: Kees Cook <keescook@chromium.org>
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
----
- arch/x86/kernel/msr.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
-index c9603ac80de5..8bef43fc3f40 100644
---- a/arch/x86/kernel/msr.c
-+++ b/arch/x86/kernel/msr.c
-@@ -103,6 +103,9 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
- 	int err = 0;
- 	ssize_t bytes = 0;
- 
-+	if (secure_modules())
-+		return -EPERM;
-+
- 	if (count % 8)
- 		return -EINVAL;	/* Invalid chunk size */
- 
-@@ -150,6 +153,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
- 			err = -EBADF;
- 			break;
- 		}
-+		if (secure_modules()) {
-+			err = -EPERM;
-+			break;
-+		}
- 		if (copy_from_user(&regs, uregs, sizeof regs)) {
- 			err = -EFAULT;
- 			break;
--- 
-1.9.3
-
-
-From aab8ba85241a85a0b2ed622edd7874c74cafa496 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 10/14] Add option to automatically enforce module signatures
- when in Secure Boot mode
-
-UEFI Secure Boot provides a mechanism for ensuring that the firmware will
-only load signed bootloaders and kernels. Certain use cases may also
-require that all kernel modules also be signed. Add a configuration option
-that enforces this automatically when enabled.
-
-Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
----
- Documentation/x86/zero-page.txt       |  2 ++
- arch/x86/Kconfig                      | 10 ++++++++++
- arch/x86/boot/compressed/eboot.c      | 36 +++++++++++++++++++++++++++++++++++
- arch/x86/include/uapi/asm/bootparam.h |  3 ++-
- arch/x86/kernel/setup.c               |  6 ++++++
- include/linux/module.h                |  6 ++++++
- kernel/module.c                       |  7 +++++++
- 7 files changed, 69 insertions(+), 1 deletion(-)
-
-diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt
-index 199f453cb4de..ec38acf00b40 100644
---- a/Documentation/x86/zero-page.txt
-+++ b/Documentation/x86/zero-page.txt
-@@ -30,6 +30,8 @@ Offset	Proto	Name		Meaning
- 1E9/001	ALL	eddbuf_entries	Number of entries in eddbuf (below)
- 1EA/001	ALL	edd_mbr_sig_buf_entries	Number of entries in edd_mbr_sig_buffer
- 				(below)
-+1EB/001	ALL     kbd_status      Numlock is enabled
-+1EC/001	ALL     secure_boot	Secure boot is enabled in the firmware
- 1EF/001	ALL	sentinel	Used to detect broken bootloaders
- 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 d24887b645dc..870aac9520b3 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -1557,6 +1557,16 @@ config EFI_MIXED
- 
- 	   If unsure, say N.
- 
-+config EFI_SECURE_BOOT_SIG_ENFORCE
-+        def_bool n
-+	prompt "Force module signing when UEFI Secure Boot is enabled"
-+	---help---
-+	  UEFI Secure Boot provides a mechanism for ensuring that the
-+	  firmware will only load signed bootloaders and kernels. Certain
-+	  use cases may also require that all kernel modules also be signed.
-+	  Say Y here to automatically enable module signature enforcement
-+	  when a system boots with UEFI Secure Boot enabled.
-+
- config SECCOMP
- 	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 0331d765c2bb..85defaf5a27c 100644
---- a/arch/x86/boot/compressed/eboot.c
-+++ b/arch/x86/boot/compressed/eboot.c
-@@ -12,6 +12,7 @@
- #include <asm/efi.h>
- #include <asm/setup.h>
- #include <asm/desc.h>
-+#include <asm/bootparam_utils.h>
- 
- #undef memcpy			/* Use memcpy from misc.c */
- 
-@@ -809,6 +810,37 @@ out:
- 	return status;
- }
- 
-+static int get_secure_boot(void)
-+{
-+	u8 sb, setup;
-+	unsigned long datasize = sizeof(sb);
-+	efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID;
-+	efi_status_t status;
-+
-+	status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
-+				L"SecureBoot", &var_guid, NULL, &datasize, &sb);
-+
-+	if (status != EFI_SUCCESS)
-+		return 0;
-+
-+	if (sb == 0)
-+		return 0;
-+
-+
-+	status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
-+				L"SetupMode", &var_guid, NULL, &datasize,
-+				&setup);
-+
-+	if (status != EFI_SUCCESS)
-+		return 0;
-+
-+	if (setup == 1)
-+		return 0;
-+
-+	return 1;
-+}
-+
-+
- /*
-  * See if we have Graphics Output Protocol
-  */
-@@ -1372,6 +1404,10 @@ struct boot_params *efi_main(struct efi_config *c,
- 	else
- 		setup_boot_services32(efi_early);
- 
-+	sanitize_boot_params(boot_params);
-+
-+	boot_params->secure_boot = get_secure_boot();
-+
- 	setup_graphics(boot_params);
- 
- 	setup_efi_pci(boot_params);
-diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
-index 225b0988043a..90dbfb73e11f 100644
---- a/arch/x86/include/uapi/asm/bootparam.h
-+++ b/arch/x86/include/uapi/asm/bootparam.h
-@@ -133,7 +133,8 @@ struct boot_params {
- 	__u8  eddbuf_entries;				/* 0x1e9 */
- 	__u8  edd_mbr_sig_buf_entries;			/* 0x1ea */
- 	__u8  kbd_status;				/* 0x1eb */
--	__u8  _pad5[3];					/* 0x1ec */
-+	__u8  secure_boot;				/* 0x1ec */
-+	__u8  _pad5[2];					/* 0x1ed */
- 	/*
- 	 * The sentinel is set to a nonzero value (0xff) in header.S.
- 	 *
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 78a0e6298922..8ecfec85e527 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -1142,6 +1142,12 @@ void __init setup_arch(char **cmdline_p)
- 
- 	io_delay_init();
- 
-+#ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
-+	if (boot_params.secure_boot) {
-+		enforce_signed_modules();
-+	}
-+#endif
-+
- 	/*
- 	 * Parse the ACPI tables for possible boot-time SMP configuration.
- 	 */
-diff --git a/include/linux/module.h b/include/linux/module.h
-index fc9b54eb779e..7377bc851461 100644
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -188,6 +188,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add);
- 
- struct notifier_block;
- 
-+#ifdef CONFIG_MODULE_SIG
-+extern void enforce_signed_modules(void);
-+#else
-+static inline void enforce_signed_modules(void) {};
-+#endif
-+
- #ifdef CONFIG_MODULES
- 
- extern int modules_disabled; /* for sysctl */
-diff --git a/kernel/module.c b/kernel/module.c
-index fc14f48915dd..2d68d276f3b6 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -3844,6 +3844,13 @@ void module_layout(struct module *mod,
- EXPORT_SYMBOL(module_layout);
- #endif
- 
-+#ifdef CONFIG_MODULE_SIG
-+void enforce_signed_modules(void)
-+{
-+	sig_enforce = true;
-+}
-+#endif
-+
- bool secure_modules(void)
- {
- #ifdef CONFIG_MODULE_SIG
--- 
-1.9.3
-
-
-From eae8a80ddc185b3f233e2620dbfc6454b6f0c3a6 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Tue, 5 Feb 2013 19:25:05 -0500
-Subject: [PATCH 11/14] efi: Disable secure boot if shim is in insecure mode
-
-A user can manually tell the shim boot loader to disable validation of
-images it loads.  When a user does this, it creates a UEFI variable called
-MokSBState that does not have the runtime attribute set.  Given that the
-user explicitly disabled validation, we can honor that and not enable
-secure boot mode if that variable is set.
-
-Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
----
- arch/x86/boot/compressed/eboot.c | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
-index 85defaf5a27c..b4013a4ba005 100644
---- a/arch/x86/boot/compressed/eboot.c
-+++ b/arch/x86/boot/compressed/eboot.c
-@@ -812,8 +812,9 @@ out:
- 
- static int get_secure_boot(void)
- {
--	u8 sb, setup;
-+	u8 sb, setup, moksbstate;
- 	unsigned long datasize = sizeof(sb);
-+	u32 attr;
- 	efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID;
- 	efi_status_t status;
- 
-@@ -837,6 +838,23 @@ static int get_secure_boot(void)
- 	if (setup == 1)
- 		return 0;
- 
-+	/* See if a user has put shim into insecure_mode.  If so, and the variable
-+	 * doesn't have the runtime attribute set, we might as well honor that.
-+	 */
-+	var_guid = EFI_SHIM_LOCK_GUID;
-+	status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
-+				L"MokSBState", &var_guid, &attr, &datasize,
-+				&moksbstate);
-+
-+	/* If it fails, we don't care why.  Default to secure */
-+	if (status != EFI_SUCCESS)
-+		return 1;
-+
-+	if (!(attr & EFI_VARIABLE_RUNTIME_ACCESS)) {
-+		if (moksbstate == 1)
-+			return 0;
-+	}
-+
- 	return 1;
- }
- 
--- 
-1.9.3
-
-
-From 9728a4f49b284b7354876e1d77174d5838306e21 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Tue, 27 Aug 2013 13:28:43 -0400
-Subject: [PATCH 12/14] efi: Make EFI_SECURE_BOOT_SIG_ENFORCE depend on EFI
-
-The functionality of the config option is dependent upon the platform being
-UEFI based.  Reflect this in the config deps.
-
-Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
----
- arch/x86/Kconfig | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 870aac9520b3..7aecd3f9f8ee 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -1558,7 +1558,8 @@ config EFI_MIXED
- 	   If unsure, say N.
- 
- config EFI_SECURE_BOOT_SIG_ENFORCE
--        def_bool n
-+	def_bool n
-+	depends on EFI
- 	prompt "Force module signing when UEFI Secure Boot is enabled"
- 	---help---
- 	  UEFI Secure Boot provides a mechanism for ensuring that the
--- 
-1.9.3
-
-
-From 4211b4919b8ccecc4f4cdc0a46ead7294478b687 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Tue, 27 Aug 2013 13:33:03 -0400
-Subject: [PATCH 13/14] efi: Add EFI_SECURE_BOOT bit
-
-UEFI machines can be booted in Secure Boot mode.  Add a EFI_SECURE_BOOT bit
-for use with efi_enabled.
-
-Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
----
- arch/x86/kernel/setup.c | 2 ++
- include/linux/efi.h     | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 8ecfec85e527..5ce785fc9f05 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -1144,7 +1144,9 @@ void __init setup_arch(char **cmdline_p)
- 
- #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
- 	if (boot_params.secure_boot) {
-+		set_bit(EFI_SECURE_BOOT, &efi.flags);
- 		enforce_signed_modules();
-+		pr_info("Secure boot enabled\n");
- 	}
- #endif
- 
-diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 41bbf8ba4ba8..e73f391fd3c8 100644
---- a/include/linux/efi.h
-+++ b/include/linux/efi.h
-@@ -917,6 +917,7 @@ extern int __init efi_setup_pcdp_console(char *);
- #define EFI_MEMMAP		4	/* Can we use EFI memory map? */
- #define EFI_64BIT		5	/* Is the firmware 64-bit? */
- #define EFI_ARCH_1		6	/* First arch-specific bit */
-+#define EFI_SECURE_BOOT		7 /* Are we in Secure Boot mode? */
- 
- #ifdef CONFIG_EFI
- /*
--- 
-1.9.3
-
-
-From 18b50c6f0597b606cb03cbd8a9fdef7478cb2b21 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@fedoraproject.org>
-Date: Fri, 20 Jun 2014 08:53:24 -0400
-Subject: [PATCH 14/14] hibernate: Disable in a signed modules environment
-
-There is currently no way to verify the resume image when returning
-from hibernate.  This might compromise the signed modules trust model,
-so until we can work with signed hibernate images we disable it in
-a secure modules environment.
-
-Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
----
- kernel/power/hibernate.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
-index fcc2611d3f14..61711801a9c4 100644
---- a/kernel/power/hibernate.c
-+++ b/kernel/power/hibernate.c
-@@ -28,6 +28,7 @@
- #include <linux/syscore_ops.h>
- #include <linux/ctype.h>
- #include <linux/genhd.h>
-+#include <linux/module.h>
- #include <trace/events/power.h>
- 
- #include "power.h"
-@@ -65,7 +66,7 @@ static const struct platform_hibernation_ops *hibernation_ops;
- 
- bool hibernation_available(void)
- {
--	return (nohibernate == 0);
-+	return ((nohibernate == 0) && !secure_modules());
- }
- 
- /**
--- 
-1.9.3
-
diff --git a/freed-ora/current/master/serial-460800.patch b/freed-ora/current/master/serial-460800.patch
deleted file mode 100644
index 2abea1e4c..000000000
--- a/freed-ora/current/master/serial-460800.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Bugzilla: N/A
-Upstream-status: Fedora mustard but I have no idea why.
-
-diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
-index 2209620..659c1bb 100644
---- a/drivers/tty/serial/8250/8250_core.c
-+++ b/drivers/tty/serial/8250/8250_core.c
-@@ -7,6 +7,9 @@
-  *
-  *  Copyright (C) 2001 Russell King.
-  *
-+ *  2005/09/16: Enabled higher baud rates for 16C95x.
-+ *		(Mathias Adam <a2@adamis.de>)
-+ *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation; either version 2 of the License, or
-@@ -2227,6 +2230,14 @@ static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int
- 	else if ((port->flags & UPF_MAGIC_MULTIPLIER) &&
- 		 baud == (port->uartclk/8))
- 		quot = 0x8002;
-+	/*
-+	 * For 16C950s UART_TCR is used in combination with divisor==1
-+	 * to achieve baud rates up to baud_base*4.
-+	 */
-+	else if ((port->type == PORT_16C950) &&
-+		 baud > (port->uartclk/16))
-+		quot = 1;
-+
- 	else
- 		quot = uart_get_divisor(port, baud);
- 
-@@ -2240,7 +2251,7 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
-		container_of(port, struct uart_8250_port, port);
- 	unsigned char cval, fcr = 0;
- 	unsigned long flags;
--	unsigned int baud, quot;
-+	unsigned int baud, quot, max_baud;
-	int fifo_bug = 0;
- 
- 	switch (termios->c_cflag & CSIZE) {
-@@ -2272,9 +2283,10 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
- 	/*
- 	 * Ask the core to calculate the divisor for us.
- 	 */
-+	max_baud = (up->port.type == PORT_16C950 ? port->uartclk/4 : port->uartclk/16);
- 	baud = uart_get_baud_rate(port, termios, old,
- 				  port->uartclk / 16 / 0xffff,
--				  port->uartclk / 16);
-+				  max_baud);
- 	quot = serial8250_get_divisor(port, baud);
- 
- 	/*
-@@ -2311,6 +2323,19 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
- 	spin_lock_irqsave(&up->port.lock, flags);
- 
- 	/*
-+	 * 16C950 supports additional prescaler ratios between 1:16 and 1:4
-+	 * thus increasing max baud rate to uartclk/4.
-+	 */
-+	if (up->port.type == PORT_16C950) {
-+		if (baud == port->uartclk/4)
-+			serial_icr_write(up, UART_TCR, 0x4);
-+		else if (baud == port->uartclk/8)
-+			serial_icr_write(up, UART_TCR, 0x8);
-+		else
-+			serial_icr_write(up, UART_TCR, 0);
-+	}
-+
-+	/*
- 	 * Update the per-port timeout.
- 	 */
- 	uart_update_timeout(port, termios->c_cflag, baud);
diff --git a/freed-ora/current/master/silence-fbcon-logo.patch b/freed-ora/current/master/silence-fbcon-logo.patch
index ccb76386c..dd03a8277 100644
--- a/freed-ora/current/master/silence-fbcon-logo.patch
+++ b/freed-ora/current/master/silence-fbcon-logo.patch
@@ -1,11 +1,19 @@
+From d928a050ea6e7dd7e602bb0e6640e23234cf0b05 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
+
 Bugzilla: N/A
 Upstream-status: Fedora mustard
+---
+ drivers/video/console/fbcon.c | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
-index 1657b96..4c5c2be 100644
+index 57b1d44acbfe..31048a85713d 100644
 --- a/drivers/video/console/fbcon.c
 +++ b/drivers/video/console/fbcon.c
-@@ -631,13 +631,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
+@@ -638,13 +638,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
  		kfree(save);
  	}
  
@@ -28,7 +36,7 @@ index 1657b96..4c5c2be 100644
  	}
  }
  #endif /* MODULE */
-@@ -3489,6 +3491,14 @@ static int __init fb_console_init(void)
+@@ -3625,6 +3627,14 @@ static int __init fb_console_init(void)
  	return 0;
  }
  
@@ -43,3 +51,6 @@ index 1657b96..4c5c2be 100644
  module_init(fb_console_init);
  
  #ifdef MODULE
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/sources b/freed-ora/current/master/sources
index 33f6e7f9d..0b4ba02b3 100644
--- a/freed-ora/current/master/sources
+++ b/freed-ora/current/master/sources
@@ -1,2 +1,3 @@
 71e2d15b48e14db5a464424878362b42  linux-libre-3.16-gnu.tar.xz
 49868ce6467b35cd9ffea1120d129462  perf-man-3.16.tar.gz
+c0ed737a272f37c983f23edd98e9637b  patch-3.16-gnu-3.17-rc6-gnu.xz
diff --git a/freed-ora/current/master/nowatchdog-on-virt.patch b/freed-ora/current/master/watchdog-Disable-watchdog-on-virtual-machines.patch
index d8cf87953..33a852eb6 100644
--- a/freed-ora/current/master/nowatchdog-on-virt.patch
+++ b/freed-ora/current/master/watchdog-Disable-watchdog-on-virtual-machines.patch
@@ -1,10 +1,7 @@
-Bugzilla: 971139
-Upstream-status: Fedora mustard for now
-
-From 17109685bfce322c73a816e097b137458fbd55ae Mon Sep 17 00:00:00 2001
+From ff01dc32fb72be6582f076a0db975350b8fa6758 Mon Sep 17 00:00:00 2001
 From: Dave Jones <davej@redhat.com>
 Date: Tue, 24 Jun 2014 08:43:34 -0400
-Subject: [PATCH] Disable watchdog on virtual machines.
+Subject: [PATCH] watchdog: Disable watchdog on virtual machines.
 
 For various reasons, VMs seem to trigger the soft lockup detector a lot,
 in cases where it's just not possible for a lockup to occur.
@@ -15,13 +12,16 @@ the VM for a very long time (Could be the host was under heavy load).
 
 Just disable the detector on VMs.
 
+Bugzilla: 971139
+Upstream-status: Fedora mustard for now
+
 Signed-off-by: Dave Jones <davej@redhat.com>
 ---
  kernel/watchdog.c | 29 +++++++++++++++++++++++++++++
  1 file changed, 29 insertions(+)
 
 diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index c3319bd1b040..0e3687675aaa 100644
+index a8d6914030fe..d0a8c308170d 100644
 --- a/kernel/watchdog.c
 +++ b/kernel/watchdog.c
 @@ -24,6 +24,7 @@
@@ -65,7 +65,7 @@ index c3319bd1b040..0e3687675aaa 100644
  /*
   * Hard-lockup warnings should be triggered after just a few seconds. Soft-
   * lockups can have false positives under extreme conditions. So we generally
-@@ -641,6 +668,8 @@ out:
+@@ -644,6 +671,8 @@ out:
  
  void __init lockup_detector_init(void)
  {
diff --git a/freed-ora/current/master/x86-Lock-down-IO-port-access-when-module-security-is.patch b/freed-ora/current/master/x86-Lock-down-IO-port-access-when-module-security-is.patch
new file mode 100644
index 000000000..88d042ee4
--- /dev/null
+++ b/freed-ora/current/master/x86-Lock-down-IO-port-access-when-module-security-is.patch
@@ -0,0 +1,71 @@
+From 04469bec6a21c9400ff38a9443886162016370f9 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
+
+IO port access would permit users to gain access to PCI configuration
+registers, which in turn (on a lot of hardware) give access to MMIO register
+space. This would potentially permit root to trigger arbitrary DMA, so lock
+it down by default.
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ arch/x86/kernel/ioport.c | 5 +++--
+ drivers/char/mem.c       | 4 ++++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
+index 4ddaf66ea35f..00b440307419 100644
+--- a/arch/x86/kernel/ioport.c
++++ b/arch/x86/kernel/ioport.c
+@@ -15,6 +15,7 @@
+ #include <linux/thread_info.h>
+ #include <linux/syscalls.h>
+ #include <linux/bitmap.h>
++#include <linux/module.h>
+ #include <asm/syscalls.h>
+ 
+ /*
+@@ -28,7 +29,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
+ 
+ 	if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
+ 		return -EINVAL;
+-	if (turn_on && !capable(CAP_SYS_RAWIO))
++	if (turn_on && (!capable(CAP_SYS_RAWIO) || secure_modules()))
+ 		return -EPERM;
+ 
+ 	/*
+@@ -103,7 +104,7 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
+ 		return -EINVAL;
+ 	/* Trying to gain more privileges? */
+ 	if (level > old) {
+-		if (!capable(CAP_SYS_RAWIO))
++		if (!capable(CAP_SYS_RAWIO) || secure_modules())
+ 			return -EPERM;
+ 	}
+ 	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
+diff --git a/drivers/char/mem.c b/drivers/char/mem.c
+index 917403fe10da..cdf839f9defe 100644
+--- a/drivers/char/mem.c
++++ b/drivers/char/mem.c
+@@ -27,6 +27,7 @@
+ #include <linux/export.h>
+ #include <linux/io.h>
+ #include <linux/aio.h>
++#include <linux/module.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -568,6 +569,9 @@ static ssize_t write_port(struct file *file, const char __user *buf,
+ 	unsigned long i = *ppos;
+ 	const char __user *tmp = buf;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (!access_ok(VERIFY_READ, buf, count))
+ 		return -EFAULT;
+ 	while (count-- > 0 && i < 65536) {
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/x86-Restrict-MSR-access-when-module-loading-is-restr.patch b/freed-ora/current/master/x86-Restrict-MSR-access-when-module-loading-is-restr.patch
new file mode 100644
index 000000000..dde76299d
--- /dev/null
+++ b/freed-ora/current/master/x86-Restrict-MSR-access-when-module-loading-is-restr.patch
@@ -0,0 +1,43 @@
+From a62ea08b53ca9f643dc736a04e77d403993ab1da 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
+
+Writing to MSRs should not be allowed if module loading is restricted,
+since it could lead to execution of arbitrary code in kernel mode. Based
+on a patch by Kees Cook.
+
+Cc: Kees Cook <keescook@chromium.org>
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ arch/x86/kernel/msr.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
+index c9603ac80de5..8bef43fc3f40 100644
+--- a/arch/x86/kernel/msr.c
++++ b/arch/x86/kernel/msr.c
+@@ -103,6 +103,9 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
+ 	int err = 0;
+ 	ssize_t bytes = 0;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (count % 8)
+ 		return -EINVAL;	/* Invalid chunk size */
+ 
+@@ -150,6 +153,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
+ 			err = -EBADF;
+ 			break;
+ 		}
++		if (secure_modules()) {
++			err = -EPERM;
++			break;
++		}
+ 		if (copy_from_user(&regs, uregs, sizeof regs)) {
+ 			err = -EFAULT;
+ 			break;
+-- 
+1.9.3
+
diff --git a/freed-ora/current/master/x86-efi-Delete-misleading-efi_printk-error-message.patch b/freed-ora/current/master/x86-efi-Delete-misleading-efi_printk-error-message.patch
new file mode 100644
index 000000000..a178bb168
--- /dev/null
+++ b/freed-ora/current/master/x86-efi-Delete-misleading-efi_printk-error-message.patch
@@ -0,0 +1,49 @@
+From ac93ab562e935184d08facf3ac292e243df8e950 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
+