Linux v3.14.34

- CVE-2014-3611 kvm: PIT timer race condition (rhbz 1144878 1156537)
- CVE-2014-3646 kvm: vmx: invvpid vm exit not handled (rhbz 1144825 1156534)
- CVE-2014-8369 kvm: excessive pages un-pinning in kvm_iommu_map error path (rhbz 1156518 1156522)

.gitignore

@@ -4,3 +4,4 @@ clog
 *.rpm
 *.orig
 kernel-[23].*/
+perf-man-*.tar.gz

0001-HID-rmi-do-not-handle-touchscreens-through-hid-rmi.patch

@@ -0,0 +1,102 @@
+Bugzilla: 1089583
+Upstream-status: Sent for 3.15
+
+From 4cebb979af8d7bd1ec463406eaf57a44bd5b9f04 Mon Sep 17 00:00:00 2001
+From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Date: Tue, 22 Apr 2014 11:21:00 -0400
+Subject: [PATCH] HID: rmi: do not handle touchscreens through hid-rmi
+
+Currently, hid-rmi drives every Synaptics product, but the touchscreens
+on the Windows tablets should be handled through hid-multitouch.
+
+Instead of providing a long list of PIDs, rely on the scan_report
+capability to detect which should go to hid-multitouch, and which
+should not go to hid-rmi.
+
+We introduce a generic HID_GROUP_HAVE_SPECIAL_DRIVER which can be reused
+amoung other drivers if they want to have a catch rule but still
+have multitouch devices handled through hid-multitouch.
+
+related bug:
+https://bugzilla.kernel.org/show_bug.cgi?id=74241
+https://bugzilla.redhat.com/show_bug.cgi?id=1089583
+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+---
+ drivers/hid/hid-core.c | 10 ++++++++--
+ drivers/hid/hid-rmi.c  |  6 ++++--
+ include/linux/hid.h    | 13 +++++++++++++
+ 3 files changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
+index 6ba2fd0..ea18639 100644
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -776,6 +776,14 @@ static int hid_scan_report(struct hid_device *hid)
+ 	    (hid->group == HID_GROUP_MULTITOUCH))
+ 		hid->group = HID_GROUP_MULTITOUCH_WIN_8;
+ 
++	/*
++	* Vendor specific handlings
++	*/
++	if ((hid->vendor == USB_VENDOR_ID_SYNAPTICS) &&
++	    (hid->group == HID_GROUP_GENERIC))
++		/* hid-rmi should take care of them, not hid-generic */
++		hid->group = HID_GROUP_HAVE_SPECIAL_DRIVER;
++
+ 	vfree(parser);
+ 	return 0;
+ }
+@@ -1840,8 +1848,6 @@ static const struct hid_device_id hid_have_special_driver[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, HID_ANY_ID) },
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_SYNAPTICS, HID_ANY_ID) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_THINGM, USB_DEVICE_ID_BLINK1) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
+diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
+index a4f04d4..a97a373 100644
+--- a/drivers/hid/hid-rmi.c
++++ b/drivers/hid/hid-rmi.c
+@@ -863,8 +863,10 @@ static void rmi_remove(struct hid_device *hdev)
+ }
+ 
+ static const struct hid_device_id rmi_id[] = {
+-	{ HID_I2C_DEVICE(USB_VENDOR_ID_SYNAPTICS, HID_ANY_ID) },
+-	{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, HID_ANY_ID) },
++	{ HID_DEVICE(BUS_I2C, HID_GROUP_HAVE_SPECIAL_DRIVER,
++		USB_VENDOR_ID_SYNAPTICS, HID_ANY_ID) },
++	{ HID_DEVICE(BUS_USB, HID_GROUP_HAVE_SPECIAL_DRIVER,
++		USB_VENDOR_ID_SYNAPTICS, HID_ANY_ID) },
+ 	{ }
+ };
+ MODULE_DEVICE_TABLE(hid, rmi_id);
+diff --git a/include/linux/hid.h b/include/linux/hid.h
+index 1b5f1e9..2fdd612 100644
+--- a/include/linux/hid.h
++++ b/include/linux/hid.h
+@@ -299,6 +299,19 @@ struct hid_item {
+ #define HID_GROUP_MULTITOUCH			0x0002
+ #define HID_GROUP_SENSOR_HUB			0x0003
+ #define HID_GROUP_MULTITOUCH_WIN_8		0x0004
++#define HID_GROUP_HAVE_SPECIAL_DRIVER		0xffff
++/*
++ * HID_GROUP_HAVE_SPECIAL_DRIVER should be used when the device needs to be
++ * scanned in case it is handled by either hid-multitouch, hid-generic,
++ * hid-sensor-hub or any other generic hid driver.
++ *
++ * Devices declared in hid_have_special_driver[] in hid-core.c can use
++ * HID_GROUP_ANY instead because there will be not overlap between their
++ * specific driver and a generic one.
++ *
++ * Note: HID_GROUP_ANY is declared in linux/mod_devicetable.h
++ * and has a value of 0x0000
++ */
+ 
+ /*
+  * This is the global environment of the parser. This information is
+-- 
+1.9.0
+

0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch

@@ -0,0 +1,100 @@
+From 5d5ef0e96f03a975feb67f70d57e55cd502885fe Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 30 Apr 2014 15:24:19 +0200
+Subject: [PATCH] acpi-video: Add 4 new models to the use_native_backlight dmi
+ list
+
+Acer Aspire V5-171
+https://bugzilla.redhat.com/show_bug.cgi?id=983342
+
+Acer Aspire V5-471G
+Lenovo Yoga 2 11
+Reported-and-tested-by: Vincent Gerris <vgerris@gmail.com>
+
+HP EliteBook 8470p
+https://bugzilla.redhat.com/show_bug.cgi?id=1093120
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+Backport to 3.14, Conflicts: drivers/acpi/video.c, 3.14 is missing the
+Thinkpad Helix entry from master add that while at it.
+---
+ drivers/acpi/video.c | 40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
+index b6ba88e..083c89f 100644
+--- a/drivers/acpi/video.c
++++ b/drivers/acpi/video.c
+@@ -491,6 +491,22 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+ 	},
+ 	{
+ 	 .callback = video_set_use_native_backlight,
++	 .ident = "Lenovo Yoga 2 11",
++	 .matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++		DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2 11"),
++		},
++	},
++	{
++	.callback = video_set_use_native_backlight,
++	.ident = "Thinkpad Helix",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad Helix"),
++		},
++	},
++	{
++	 .callback = video_set_use_native_backlight,
+ 	 .ident = "Dell Inspiron 7520",
+ 	 .matches = {
+ 		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+@@ -507,6 +523,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+ 	},
+ 	{
+ 	 .callback = video_set_use_native_backlight,
++	 .ident = "Acer Aspire V5-171",
++	 .matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "V5-171"),
++		},
++	},
++	{
++	 .callback = video_set_use_native_backlight,
+ 	 .ident = "Acer Aspire V5-431",
+ 	 .matches = {
+ 		DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+@@ -514,6 +538,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+ 		},
+ 	},
+ 	{
++	 .callback = video_set_use_native_backlight,
++	 .ident = "Acer Aspire V5-471G",
++	 .matches = {
++		DMI_MATCH(DMI_BOARD_VENDOR, "Acer"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-471G"),
++		},
++	},
++	{
+ 	.callback = video_set_use_native_backlight,
+ 	.ident = "HP ProBook 4340s",
+ 	.matches = {
+@@ -565,6 +597,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+ 	},
+ 	{
+ 	.callback = video_set_use_native_backlight,
++	.ident = "HP EliteBook 8470p",
++	.matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook 8470p"),
++		},
++	},
++	{
++	.callback = video_set_use_native_backlight,
+ 	.ident = "HP EliteBook 8780w",
+ 	.matches = {
+ 		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+-- 
+1.9.0
+

0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch

@@ -1,61 +0,0 @@
-From fe7963cbe464048cfae4523975aa208a6c7dc420 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@redhat.com>
-Date: Mon, 18 Feb 2013 10:32:13 -0500
-Subject: [PATCH] bluetooth: Add support for atheros 04ca:3004 device to ath3k
-
-Yet another version of the atheros bluetooth chipset
-
-T:  Bus=01 Lev=02 Prnt=02 Port=03 Cnt=01 Dev#=  3 Spd=12  MxCh= 0
-D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
-P:  Vendor=04ca ProdID=3004 Rev=00.01
-S:  Manufacturer=Atheros Communications
-S:  Product=Bluetooth USB Host Controller
-S:  SerialNumber=Alaska Day 2006
-C:  #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
-I:  If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
-I:  If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
-
-This resolves https://bugzilla.redhat.com/show_bug.cgi?id=844750
-
-Reported-by: niktr@mail.ru
-Signed-off-by: Josh Boyer <jwboyer@redhat.com>
----
- drivers/bluetooth/ath3k.c | 2 ++
- drivers/bluetooth/btusb.c | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
-index 33c9a44..b9908dd 100644
---- a/drivers/bluetooth/ath3k.c
-+++ b/drivers/bluetooth/ath3k.c
-@@ -76,6 +76,7 @@ static struct usb_device_id ath3k_table[] = {
- 	{ USB_DEVICE(0x0CF3, 0x3004) },
- 	{ USB_DEVICE(0x0CF3, 0x311D) },
- 	{ USB_DEVICE(0x13d3, 0x3375) },
-+	{ USB_DEVICE(0x04CA, 0x3004) },
- 	{ USB_DEVICE(0x04CA, 0x3005) },
- 	{ USB_DEVICE(0x04CA, 0x3006) },
- 	{ USB_DEVICE(0x04CA, 0x3008) },
-@@ -108,6 +109,7 @@ static struct usb_device_id ath3k_blist_tbl[] = {
- 	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
- 	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
- 	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
-+	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
- 	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
- 	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
- 	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
-diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index 7e351e3..59cde8e 100644
---- a/drivers/bluetooth/btusb.c
-+++ b/drivers/bluetooth/btusb.c
-@@ -134,6 +134,7 @@ static struct usb_device_id blacklist_table[] = {
- 	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
- 	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
- 	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
-+	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
- 	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
- 	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
- 	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
--- 
-1.8.1.2
-

0001-ideapad-laptop-Blacklist-rfkill-control-on-the-Lenov.patch

@@ -0,0 +1,73 @@
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1021036
+Upstream-status: Accepted into 3.16
+
+From ec5a006650d13c183124bd4279b95625f85efc6d Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Mon, 2 Jun 2014 17:41:00 +0200
+Subject: [PATCH 03/14] ideapad-laptop: Blacklist rfkill control on the Lenovo
+ Yoga 2 11
+
+The Lenovo Yoga 2 11 always reports everything as blocked, causing userspace
+to not even try to use the wlan / bluetooth even though they work fine.
+
+Note this patch also removes the "else priv->rfk[i] = NULL;" bit of the
+rfkill initialization, it is not necessary as the priv struct is allocated
+with kzalloc.
+
+Reported-and-tested-by: Vincent Gerris <vgerris@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/platform/x86/ideapad-laptop.c | 23 ++++++++++++++++++-----
+ 1 file changed, 18 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
+index 6dd060a0bb65..219eb289a909 100644
+--- a/drivers/platform/x86/ideapad-laptop.c
++++ b/drivers/platform/x86/ideapad-laptop.c
+@@ -36,6 +36,7 @@
+ #include <linux/debugfs.h>
+ #include <linux/seq_file.h>
+ #include <linux/i8042.h>
++#include <linux/dmi.h>
+ 
+ #define IDEAPAD_RFKILL_DEV_NUM	(3)
+ 
+@@ -819,6 +820,19 @@ 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 */
++	{
++		.ident = "Lenovo Yoga 2 11",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2 11"),
++		},
++	},
++	{}
++};
++
+ static int ideapad_acpi_add(struct platform_device *pdev)
+ {
+ 	int ret, i;
+@@ -854,11 +868,10 @@ static int ideapad_acpi_add(struct platform_device *pdev)
+ 	if (ret)
+ 		goto input_failed;
+ 
+-	for (i = 0; i < IDEAPAD_RFKILL_DEV_NUM; i++) {
+-		if (test_bit(ideapad_rfk_data[i].cfgbit, &priv->cfg))
+-			ideapad_register_rfkill(priv, i);
+-		else
+-			priv->rfk[i] = NULL;
++	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);
+ 	}
+ 	ideapad_sync_rfk_state(priv);
+ 	ideapad_sync_touchpad_state(priv);
+-- 
+1.9.0
+

0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch

@@ -1,46 +0,0 @@
-From feaf4959c30d0640093a607c577940d3e9351076 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@redhat.com>
-Date: Fri, 22 Feb 2013 11:47:37 -0500
-Subject: [PATCH] kmsg: Honor dmesg_restrict sysctl on /dev/kmsg
-
-Originally, the addition of the dmesg_restrict covered both the syslog
-method of accessing dmesg, as well as /dev/kmsg itself.  This was done
-indirectly by security_syslog calling cap_syslog before doing any LSM
-checks.
-
-However, commit 12b3052c3ee (capabilities/syslog: open code cap_syslog
-logic to fix build failure) moved the code around and pushed the checks
-into the caller itself.  That seems to have inadvertently dropped the
-checks for dmesg_restrict on /dev/kmsg.  Most people haven't noticed
-because util-linux dmesg(1) defaults to using the syslog method for
-access in older versions.  With util-linux 2.22 and a kernel newer than
-3.5, dmesg(1) defaults to reading directly from /dev/kmsg.
-
-Fix this by making an explicit check in the devkmsg_open function.
-
-This fixes https://bugzilla.redhat.com/show_bug.cgi?id=903192
-
-Reported-by: Christian Kujau <lists@nerdbynature.de>
-CC: stable@vger.kernel.org
-Signed-off-by: Josh Boyer <jwboyer@redhat.com>
----
- kernel/printk.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/kernel/printk.c b/kernel/printk.c
-index f24633a..398ef9a 100644
---- a/kernel/printk.c
-+++ b/kernel/printk.c
-@@ -615,6 +615,9 @@ static int devkmsg_open(struct inode *inode, struct file *file)
- 	struct devkmsg_user *user;
- 	int err;
- 
-+	if (dmesg_restrict && !capable(CAP_SYSLOG))
-+		return -EACCES;
-+
- 	/* write-only does not need any file context */
- 	if ((file->f_flags & O_ACCMODE) == O_WRONLY)
- 		return 0;
--- 
-1.8.1.2
-

0001-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch

@@ -0,0 +1,38 @@
+Bugzilla: N/A
+Upstream-status: Nak'd, supposedly replacement coming to auto-select
+
+From 0f3f5c5b4ca2eb1f41947c50bedb9b17aa1a1f80 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
+ dependency
+
+When CPUMASK_OFFSTACK was added in 2008, it was dependent upon
+DEBUG_PER_CPU_MAPS being enabled, or an architecture could select it.
+The debug dependency adds additional overhead that isn't required for
+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.
+
+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
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -342,7 +342,8 @@ config CHECK_SIGNATURE
+ 	bool
+ 
+ config CPUMASK_OFFSTACK
+-	bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS
++	bool "Force CPU masks off stack"
++	depends on SMP
+ 	help
+ 	  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
+

0001-synaptics-Add-min-max-quirk-for-ThinkPad-T431s-L440-.patch

@@ -0,0 +1,99 @@
+From 555b84220a7c84c2faa1964d19733d867d7bf61f Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Thu, 10 Apr 2014 11:36:14 +0200
+Subject: [PATCH v3] synaptics: Add min/max quirk for ThinkPad T431s, L440,
+ L540, S1 Yoga and X1
+
+We expect that all the Haswell series will need such quirks, sigh.
+
+The T431s seems to be T430 hardware in a T440s case, using the T440s touchpad,
+with the same min/max issue.
+
+The X1 Carbon 3rd generation name says 2nd while it is a 3rd generation.
+
+The X1 and T431s share a PnPID with the T540p, but the reported ranges are
+closer to those of the T440s.
+
+HdG: Squashed 5 quirk patches into one. T431s + L440 + L540 are written by me,
+S1 Yoga and X1 are written by Benjamin Tissoires.
+
+Hdg: Standardized S1 Yoga and X1 values, Yoga uses the same touchpad as the
+X240, X1 uses the same touchpad as the T440.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/input/mouse/synaptics.c | 42 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index a8b57d7..7c9f509 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -1566,6 +1566,14 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = {
+ 		.driver_data = (int []){1232, 5710, 1156, 4696},
+ 	},
+ 	{
++		/* Lenovo ThinkPad T431s */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T431"),
++		},
++		.driver_data = (int []){1024, 5112, 2024, 4832},
++	},
++	{
+ 		/* Lenovo ThinkPad T440s */
+ 		.matches = {
+ 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+@@ -1574,6 +1582,14 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = {
+ 		.driver_data = (int []){1024, 5112, 2024, 4832},
+ 	},
+ 	{
++		/* Lenovo ThinkPad L440 */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L440"),
++		},
++		.driver_data = (int []){1024, 5112, 2024, 4832},
++	},
++	{
+ 		/* Lenovo ThinkPad T540p */
+ 		.matches = {
+ 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+@@ -1581,6 +1597,32 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = {
+ 		},
+ 		.driver_data = (int []){1024, 5056, 2058, 4832},
+ 	},
++	{
++		/* Lenovo ThinkPad L540 */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L540"),
++		},
++		.driver_data = (int []){1024, 5112, 2024, 4832},
++	},
++	{
++		/* Lenovo Yoga S1 */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++			DMI_EXACT_MATCH(DMI_PRODUCT_VERSION,
++					"ThinkPad S1 Yoga"),
++		},
++		.driver_data = (int []){1232, 5710, 1156, 4696},
++	},
++	{
++		/* Lenovo ThinkPad X1 Carbon Haswell (3rd generation) */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_VERSION,
++					"ThinkPad X1 Carbon 2nd"),
++		},
++		.driver_data = (int []){1024, 5112, 2024, 4832},
++	},
+ #endif
+ 	{ }
+ };
+-- 
+1.9.0
+

0002-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch

@@ -0,0 +1,138 @@
+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
+

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

@@ -0,0 +1,39 @@
+From f46debb4f324d6ab66782de6ad3b884fbf223ec4 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Thu, 1 May 2014 14:20:06 +0200
+Subject: [PATCH 3/4] samsung-laptop: Add broken-acpi-video quirk for
+ NC210/NC110
+
+Reported (and tested) here:
+https://bugzilla.redhat.com/show_bug.cgi?id=861573
+
+Cc: stable@vger.kernel.org
+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 d1f03005..98f61f6 100644
+--- a/drivers/platform/x86/samsung-laptop.c
++++ b/drivers/platform/x86/samsung-laptop.c
+@@ -1534,6 +1534,16 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = {
+ 		},
+ 	 .driver_data = &samsung_broken_acpi_video,
+ 	},
++	{
++	 .callback = samsung_dmi_matched,
++	 .ident = "NC210",
++	 .matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
++		DMI_MATCH(DMI_PRODUCT_NAME, "NC210/NC110"),
++		DMI_MATCH(DMI_BOARD_NAME, "NC210/NC110"),
++		},
++	 .driver_data = &samsung_broken_acpi_video,
++	},
+ 	{ },
+ };
+ MODULE_DEVICE_TABLE(dmi, samsung_dmi_table);
+-- 
+1.9.0
+

Bluetooth-allocate-static-minor-for-vhci.patch

@@ -0,0 +1,71 @@
+Bugzilla: 1051748
+Upstream-status: Queued for 3.15
+
+From b075dd40c95d11c2c8690f6c4d6232fc0d9e7f56 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi@intel.com>
+Date: Tue, 18 Feb 2014 05:19:26 +0000
+Subject: Bluetooth: allocate static minor for vhci
+
+Commit bfacbb9 (Bluetooth: Use devname:vhci module alias for virtual HCI
+driver) added the module alias to hci_vhci module so it's possible to
+create the /dev/vhci node. However creating an alias without
+specifying the minor doesn't allow us to create the node ahead,
+triggerring module auto-load when it's first accessed.
+
+Starting with depmod from kmod 16 we started to warn if there's a
+devname alias without specifying the major and minor.
+
+Let's do the same done for uhid, kvm, fuse and others, specifying a
+fixed minor. In systems with systemd as the init the following will
+happen: on early boot systemd will call "kmod static-nodes" to read
+/lib/modules/$(uname -r)/modules.devname and then create the nodes. When
+first accessed these "dead" nodes will trigger the module loading.
+
+Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+---
+diff --git a/Documentation/devices.txt b/Documentation/devices.txt
+index 10378cc..04356f5 100644
+--- a/Documentation/devices.txt
++++ b/Documentation/devices.txt
+@@ -353,6 +353,7 @@ Your cooperation is appreciated.
+ 		133 = /dev/exttrp	External device trap
+ 		134 = /dev/apm_bios	Advanced Power Management BIOS
+ 		135 = /dev/rtc		Real Time Clock
++		137 = /dev/vhci		Bluetooth virtual HCI driver
+ 		139 = /dev/openprom	SPARC OpenBoot PROM
+ 		140 = /dev/relay8	Berkshire Products Octal relay card
+ 		141 = /dev/relay16	Berkshire Products ISO-16 relay card
+diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
+index 1ef6990..add1c6a 100644
+--- a/drivers/bluetooth/hci_vhci.c
++++ b/drivers/bluetooth/hci_vhci.c
+@@ -359,7 +359,7 @@ static const struct file_operations vhci_fops = {
+ static struct miscdevice vhci_miscdev= {
+ 	.name	= "vhci",
+ 	.fops	= &vhci_fops,
+-	.minor	= MISC_DYNAMIC_MINOR,
++	.minor	= VHCI_MINOR,
+ };
+ 
+ static int __init vhci_init(void)
+@@ -385,3 +385,4 @@ MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
+ MODULE_VERSION(VERSION);
+ MODULE_LICENSE("GPL");
+ MODULE_ALIAS("devname:vhci");
++MODULE_ALIAS_MISCDEV(VHCI_MINOR);
+diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
+index 3737f72..7bb6148 100644
+--- a/include/linux/miscdevice.h
++++ b/include/linux/miscdevice.h
+@@ -23,6 +23,7 @@
+ #define TEMP_MINOR		131	/* Temperature Sensor */
+ #define RTC_MINOR		135
+ #define EFI_RTC_MINOR		136	/* EFI Time services */
++#define VHCI_MINOR		137
+ #define SUN_OPENPROM_MINOR	139
+ #define DMAPI_MINOR		140	/* DMAPI */
+ #define NVRAM_MINOR		144
+--
+cgit v0.9.2

HID-rmi-do-not-fetch-more-than-16-bytes-in-a-query.patch

@@ -0,0 +1,60 @@
+Bugzilla: 1090161
+Upstream-status: sent https://patchwork.kernel.org/patch/4055781/
+
+From patchwork Thu Apr 24 22:26:38 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: HID: rmi: do not fetch more than 16 bytes in a query
+From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+X-Patchwork-Id: 4055781
+Message-Id: <1398378398-24825-1-git-send-email-benjamin.tissoires@redhat.com>
+To: Andrew Duggan <aduggan@synaptics.com>,
+	Christopher Heiny <cheiny@synaptics.com>,
+	Jiri Kosina <jkosina@suse.cz>, linux-input@vger.kernel.org,
+	linux-kernel@vger.kernel.org
+Date: Thu, 24 Apr 2014 18:26:38 -0400
+
+A firmware bug is present on the XPS Haswell edition which silently
+split the request in two responses when the caller ask for a read of
+more than 16 bytes.
+The FW sends the first 16 then the 4 next, but it says that it answered
+the 20 bytes in the first report.
+
+This occurs only on the retrieving of the min/max of X and Y of the F11
+function.
+We only use the first 10 bytes of the Ctrl register, so we can get only
+those 10 bytes to prevent the bug from happening.
+
+Resolves:
+https://bugzilla.redhat.com/show_bug.cgi?id=1090161
+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+
+---
+drivers/hid/hid-rmi.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
+index 7da9509..cee89c9 100644
+--- a/drivers/hid/hid-rmi.c
++++ b/drivers/hid/hid-rmi.c
+@@ -613,10 +613,15 @@ static int rmi_populate_f11(struct hid_device *hdev)
+ 		}
+ 	}
+ 
+-	/* retrieve the ctrl registers */
+-	ret = rmi_read_block(hdev, data->f11.control_base_addr, buf, 20);
++	/*
++	 * retrieve the ctrl registers
++	 * the ctrl register has a size of 20 but a fw bug split it into 16 + 4,
++	 * and there is no way to know if the first 20 bytes are here or not.
++	 * We use only the first 10 bytes, so get only them.
++	 */
++	ret = rmi_read_block(hdev, data->f11.control_base_addr, buf, 10);
+ 	if (ret) {
+-		hid_err(hdev, "can not read ctrl block of size 20: %d.\n", ret);
++		hid_err(hdev, "can not read ctrl block of size 10: %d.\n", ret);
+ 		return ret;
+ 	}
+ 

Input-elantech-add-support-for-newer-elantech-touchpads.patch

@@ -0,0 +1,32 @@
+Bugzilla: 1051668
+Upstream-status: 3.15
+
+From ae4bedf0679d99f0a9b80a7ea9b8dd205de05d06 Mon Sep 17 00:00:00 2001
+From: Jordan Rife <jrife0@gmail.com>
+Date: Tue, 22 Apr 2014 17:44:51 -0700
+Subject: Input: elantech - add support for newer elantech touchpads
+
+Newer elantech touchpads are not recognized by the current driver, since it
+fails to detect their firmware version number. This prevents more advanced
+touchpad features from being usable such as two-finger scrolling. This
+patch allows newer touchpads to be detected and be fully functional. Tested
+on Sony Vaio SVF13N17PXB.
+
+Signed-off-by: Jordan Rife <jrife0@gmail.com>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+
+diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
+index ef1cf52..088d354 100644
+--- a/drivers/input/mouse/elantech.c
++++ b/drivers/input/mouse/elantech.c
+@@ -1353,6 +1353,7 @@ static int elantech_set_properties(struct elantech_data *etd)
+ 		case 6:
+ 		case 7:
+ 		case 8:
++		case 9:
+ 			etd->hw_version = 4;
+ 			break;
+ 		default:
+-- 
+cgit v0.10.1
+

KVM-ioapic-fix-assignment-of-ioapic-rtc_status-pending_eoi.patch

@@ -0,0 +1,38 @@
+Bugzilla: 1085016
+Upstream-status: Queued for 3.15
+
+From 5678de3f15010b9022ee45673f33bcfc71d47b60 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Fri, 28 Mar 2014 20:41:50 +0100
+Subject: KVM: ioapic: fix assignment of ioapic->rtc_status.pending_eoi
+ (CVE-2014-0155)
+
+QE reported that they got the BUG_ON in ioapic_service to trigger.
+I cannot reproduce it, but there are two reasons why this could happen.
+
+The less likely but also easiest one, is when kvm_irq_delivery_to_apic
+does not deliver to any APIC and returns -1.
+
+Because irqe.shorthand == 0, the kvm_for_each_vcpu loop in that
+function is never reached.  However, you can target the similar loop in
+kvm_irq_delivery_to_apic_fast; just program a zero logical destination
+address into the IOAPIC, or an out-of-range physical destination address.
+
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+
+diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
+index d4b6015..d98d107 100644
+--- a/virt/kvm/ioapic.c
++++ b/virt/kvm/ioapic.c
+@@ -356,7 +356,7 @@ static int ioapic_service(struct kvm_ioapic *ioapic, int irq, bool line_status)
+ 		BUG_ON(ioapic->rtc_status.pending_eoi != 0);
+ 		ret = kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe,
+ 				ioapic->rtc_status.dest_map);
+-		ioapic->rtc_status.pending_eoi = ret;
++		ioapic->rtc_status.pending_eoi = (ret < 0 ? 0 : ret);
+ 	} else
+ 		ret = kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe, NULL);
+ 
+-- 
+cgit v0.10.1
+

Makefile.config

@@ -9,9 +9,7 @@ CONFIGFILES	= \
 	$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
 	$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
 	$(CFG)-s390x.config \
-	$(CFG)-armv7l.config  $(CFG)-armv7hl.config \
-	$(CFG)-armv7l-omap.config $(CFG)-armv7hl-omap.config \
-	$(CFG)-armv7l-tegra.config $(CFG)-armv7hl-tegra.config \
+	$(CFG)-armv7hl.config $(CFG)-armv7hl-lpae.config\
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64p7.config $(CFG)-ppc64-debug.config 
 
@@ -33,17 +31,17 @@ temp-generic: config-generic
 temp-debug-generic: config-generic
 	cat config-generic config-debug > temp-debug-generic
 
-temp-armv7: config-armv7 temp-generic
+temp-arm-generic: config-arm-generic temp-generic
 	perl merge.pl $^ > $@
 
-temp-arm-generic: config-arm-generic temp-generic
-	perl merge.pl $^  > $@
+temp-armv7-generic: config-armv7-generic temp-arm-generic
+	perl merge.pl $^ > $@
 
-temp-armv7l-omap: config-arm-omap temp-arm-generic
-	perl merge.pl $^  > $@
+temp-armv7: config-armv7 temp-armv7-generic
+	perl merge.pl $^ > $@
 
-temp-armv7l-tegra: config-arm-tegra temp-arm-generic
-	perl merge.pl $^  > $@
+temp-armv7-lpae: config-armv7-lpae temp-armv7-generic
+	perl merge.pl $^ > $@
 
 temp-x86-32: config-x86-32-generic config-x86-generic
 	perl merge.pl $^  > $@
@@ -108,22 +106,10 @@ kernel-$(VERSION)-ppc64p7.config: config-powerpc64p7 temp-powerpc64-generic
 kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
 	perl merge.pl $^ s390 > $@
 
-kernel-$(VERSION)-armv7l.config: /dev/null temp-armv7
-	perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap
-	perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv7l-tegra.config: /dev/null temp-armv7l-tegra
-	perl merge.pl $^ arm > $@
-
 kernel-$(VERSION)-armv7hl.config: /dev/null temp-armv7
 	perl merge.pl $^ arm > $@
 
-kernel-$(VERSION)-armv7hl-omap.config: /dev/null temp-armv7l-omap
-	perl merge.pl $^ arm > $@
-
-kernel-$(VERSION)-armv7hl-tegra.config: /dev/null temp-armv7l-tegra
+kernel-$(VERSION)-armv7hl-lpae.config: /dev/null temp-armv7-lpae
 	perl merge.pl $^ arm > $@
 
 kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic

Makefile.release

@@ -79,3 +79,7 @@ config-release:
 
 	@# Disable UAS for release until it's ready. (#717633, #744099)
 	@perl -pi -e 's/CONFIG_USB_UAS=m/# CONFIG_USB_UAS is not set/' config-generic
+
+	@perl -pi -e 's/CONFIG_SCHEDSTATS=y/# CONFIG_SCHEDSTATS is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_LATENCYTOP=y/# CONFIG_LATENCYTOP is not set/' config-nodebug
+

Revert-userns-Allow-unprivileged-users-to-create-use.patch

@@ -0,0 +1,44 @@
+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
+

acpi-sony-nonvs-blacklist.patch

@@ -1,38 +0,0 @@
-diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
-index 3ed80b2..17fc718 100644
---- a/drivers/acpi/sleep.c
-+++ b/drivers/acpi/sleep.c
-@@ -390,6 +390,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
- 	},
- 	{
- 	.callback = init_nvs_nosave,
-+	.ident = "Sony Vaio VGN-FW21E",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW21E"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
- 	.ident = "Sony Vaio VGN-SR11M",
- 	.matches = {
- 		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
-index 0e46fae..6d9a3ab 100644
---- a/drivers/acpi/sleep.c
-+++ b/drivers/acpi/sleep.c
-@@ -398,6 +398,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
- 	},
- 	{
- 	.callback = init_nvs_nosave,
-+	.ident = "Sony Vaio VPCEB17FX",
-+	.matches = {
-+		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
-+		DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB17FX"),
-+		},
-+	},
-+	{
-+	.callback = init_nvs_nosave,
- 	.ident = "Sony Vaio VGN-SR11M",
- 	.matches = {
- 		DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),

acpi-video-dos.patch

@@ -1,17 +0,0 @@
-Disable firmware video brightness change on AC/Battery switch by default
-
--- mjg59
-
-diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index bac2901..93b1a9e 100644
---- a/drivers/acpi/video.c
-+++ b/drivers/acpi/video.c
-@@ -1818,7 +1818,7 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
- 
- static int acpi_video_bus_start_devices(struct acpi_video_bus *video)
- {
--	return acpi_video_bus_DOS(video, 0, 0);
-+	return acpi_video_bus_DOS(video, 0, 1);
- }
- 
- static int acpi_video_bus_stop_devices(struct acpi_video_bus *video)

alps-v2.patch

@@ -1,248 +0,0 @@
-From db7192fa07fa5c70c9849d8f658a7ff696cff99d Mon Sep 17 00:00:00 2001
-From: Kevin Cernekee <cernekee@gmail.com>
-Date: Sat, 16 Feb 2013 22:40:03 -0800
-Subject: [PATCH 14/15] Input: ALPS - Remove unused argument to
- alps_enter_command_mode()
-
-Now that alps_identify() explicitly issues an EC report using
-alps_rpt_cmd(), we no longer need to look at the magic numbers returned
-by alps_enter_command_mode().
-
-Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
----
- drivers/input/mouse/alps.c | 18 +++++++-----------
- 1 file changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
-index 7b99fc7..9c97531 100644
---- a/drivers/input/mouse/alps.c
-+++ b/drivers/input/mouse/alps.c
-@@ -994,8 +994,7 @@ static int alps_rpt_cmd(struct psmouse *psmouse, int init_command,
- 	return 0;
- }
- 
--static int alps_enter_command_mode(struct psmouse *psmouse,
--				   unsigned char *resp)
-+static int alps_enter_command_mode(struct psmouse *psmouse)
- {
- 	unsigned char param[4];
- 
-@@ -1009,9 +1008,6 @@ static int alps_enter_command_mode(struct psmouse *psmouse,
- 			    "unknown response while entering command mode\n");
- 		return -1;
- 	}
--
--	if (resp)
--		*resp = param[2];
- 	return 0;
- }
- 
-@@ -1176,7 +1172,7 @@ static int alps_passthrough_mode_v3(struct psmouse *psmouse,
- {
- 	int reg_val, ret = -1;
- 
--	if (alps_enter_command_mode(psmouse, NULL))
-+	if (alps_enter_command_mode(psmouse))
- 		return -1;
- 
- 	reg_val = alps_command_mode_read_reg(psmouse, reg_base + 0x0008);
-@@ -1216,7 +1212,7 @@ static int alps_probe_trackstick_v3(struct psmouse *psmouse, int reg_base)
- {
- 	int ret = -EIO, reg_val;
- 
--	if (alps_enter_command_mode(psmouse, NULL))
-+	if (alps_enter_command_mode(psmouse))
- 		goto error;
- 
- 	reg_val = alps_command_mode_read_reg(psmouse, reg_base + 0x08);
-@@ -1279,7 +1275,7 @@ static int alps_setup_trackstick_v3(struct psmouse *psmouse, int reg_base)
- 		 * supported by this driver. If bit 1 isn't set the packet
- 		 * format is different.
- 		 */
--		if (alps_enter_command_mode(psmouse, NULL) ||
-+		if (alps_enter_command_mode(psmouse) ||
- 		    alps_command_mode_write_reg(psmouse,
- 						reg_base + 0x08, 0x82) ||
- 		    alps_exit_command_mode(psmouse))
-@@ -1306,7 +1302,7 @@ static int alps_hw_init_v3(struct psmouse *psmouse)
- 	    alps_setup_trackstick_v3(psmouse, ALPS_REG_BASE_PINNACLE) == -EIO)
- 		goto error;
- 
--	if (alps_enter_command_mode(psmouse, NULL) ||
-+	if (alps_enter_command_mode(psmouse) ||
- 	    alps_absolute_mode_v3(psmouse)) {
- 		psmouse_err(psmouse, "Failed to enter absolute mode\n");
- 		goto error;
-@@ -1381,7 +1377,7 @@ static int alps_hw_init_rushmore_v3(struct psmouse *psmouse)
- 			priv->flags &= ~ALPS_DUALPOINT;
- 	}
- 
--	if (alps_enter_command_mode(psmouse, NULL) ||
-+	if (alps_enter_command_mode(psmouse) ||
- 	    alps_command_mode_read_reg(psmouse, 0xc2d9) == -1 ||
- 	    alps_command_mode_write_reg(psmouse, 0xc2cb, 0x00))
- 		goto error;
-@@ -1431,7 +1427,7 @@ static int alps_hw_init_v4(struct psmouse *psmouse)
- 	struct ps2dev *ps2dev = &psmouse->ps2dev;
- 	unsigned char param[4];
- 
--	if (alps_enter_command_mode(psmouse, NULL))
-+	if (alps_enter_command_mode(psmouse))
- 		goto error;
- 
- 	if (alps_absolute_mode_v4(psmouse)) {
--- 
-1.8.1.2
-
-
-From 10740a25bb3b895b5de7773f926a978416b38409 Mon Sep 17 00:00:00 2001
-From: Dave Turvene <dturvene@dahetral.com>
-Date: Sat, 16 Feb 2013 22:40:04 -0800
-Subject: [PATCH 15/15] Input: ALPS - Add "Dolphin V1" touchpad support
-
-These touchpads use a different protocol; they have been seen on Dell
-N5110, Dell 17R SE, and others.
-
-The official ALPS driver identifies them by looking for an exact match
-on the E7 report: 73 03 50.  Dolphin V1 returns an EC report of
-73 01 xx (02 and 0d have been seen); Dolphin V2 returns an EC report of
-73 02 xx (02 has been seen).
-
-Dolphin V2 probably needs a different initialization sequence and/or
-report parser, so it is left for a future commit.
-
-Signed-off-by: Dave Turvene <dturvene@dahetral.com>
-Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
----
- drivers/input/mouse/alps.c | 67 ++++++++++++++++++++++++++++++++++++++++++++--
- drivers/input/mouse/alps.h |  1 +
- 2 files changed, 66 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
-index 9c97531..0238e0e 100644
---- a/drivers/input/mouse/alps.c
-+++ b/drivers/input/mouse/alps.c
-@@ -490,6 +490,29 @@ static void alps_decode_rushmore(struct alps_fields *f, unsigned char *p)
- 	f->y_map |= (p[5] & 0x20) << 6;
- }
- 
-+static void alps_decode_dolphin(struct alps_fields *f, unsigned char *p)
-+{
-+	f->first_mp = !!(p[0] & 0x02);
-+	f->is_mp = !!(p[0] & 0x20);
-+
-+	f->fingers = ((p[0] & 0x6) >> 1 |
-+		     (p[0] & 0x10) >> 2);
-+	f->x_map = ((p[2] & 0x60) >> 5) |
-+		   ((p[4] & 0x7f) << 2) |
-+		   ((p[5] & 0x7f) << 9) |
-+		   ((p[3] & 0x07) << 16) |
-+		   ((p[3] & 0x70) << 15) |
-+		   ((p[0] & 0x01) << 22);
-+	f->y_map = (p[1] & 0x7f) |
-+		   ((p[2] & 0x1f) << 7);
-+
-+	f->x = ((p[1] & 0x7f) | ((p[4] & 0x0f) << 7));
-+	f->y = ((p[2] & 0x7f) | ((p[4] & 0xf0) << 3));
-+	f->z = (p[0] & 4) ? 0 : p[5] & 0x7f;
-+
-+	alps_decode_buttons_v3(f, p);
-+}
-+
- static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)
- {
- 	struct alps_data *priv = psmouse->private;
-@@ -874,7 +897,8 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)
- 	}
- 
- 	/* Bytes 2 - pktsize should have 0 in the highest bit */
--	if (psmouse->pktcnt >= 2 && psmouse->pktcnt <= psmouse->pktsize &&
-+	if (priv->proto_version != ALPS_PROTO_V5 &&
-+	    psmouse->pktcnt >= 2 && psmouse->pktcnt <= psmouse->pktsize &&
- 	    (psmouse->packet[psmouse->pktcnt - 1] & 0x80)) {
- 		psmouse_dbg(psmouse, "refusing packet[%i] = %x\n",
- 			    psmouse->pktcnt - 1,
-@@ -1003,7 +1027,8 @@ static int alps_enter_command_mode(struct psmouse *psmouse)
- 		return -1;
- 	}
- 
--	if (param[0] != 0x88 || (param[1] != 0x07 && param[1] != 0x08)) {
-+	if ((param[0] != 0x88 || (param[1] != 0x07 && param[1] != 0x08)) &&
-+	    param[0] != 0x73) {
- 		psmouse_dbg(psmouse,
- 			    "unknown response while entering command mode\n");
- 		return -1;
-@@ -1495,6 +1520,23 @@ error:
- 	return -1;
- }
- 
-+static int alps_hw_init_dolphin_v1(struct psmouse *psmouse)
-+{
-+	struct ps2dev *ps2dev = &psmouse->ps2dev;
-+	unsigned char param[2];
-+
-+	/* This is dolphin "v1" as empirically defined by florin9doi */
-+	param[0] = 0x64;
-+	param[1] = 0x28;
-+
-+	if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSTREAM) ||
-+	    ps2_command(ps2dev, &param[0], PSMOUSE_CMD_SETRATE) ||
-+	    ps2_command(ps2dev, &param[1], PSMOUSE_CMD_SETRATE))
-+		return -1;
-+
-+	return 0;
-+}
-+
- static void alps_set_defaults(struct alps_data *priv)
- {
- 	priv->byte0 = 0x8f;
-@@ -1528,6 +1570,21 @@ static void alps_set_defaults(struct alps_data *priv)
- 		priv->nibble_commands = alps_v4_nibble_commands;
- 		priv->addr_command = PSMOUSE_CMD_DISABLE;
- 		break;
-+	case ALPS_PROTO_V5:
-+		priv->hw_init = alps_hw_init_dolphin_v1;
-+		priv->process_packet = alps_process_packet_v3;
-+		priv->decode_fields = alps_decode_dolphin;
-+		priv->set_abs_params = alps_set_abs_params_mt;
-+		priv->nibble_commands = alps_v3_nibble_commands;
-+		priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
-+		priv->byte0 = 0xc8;
-+		priv->mask0 = 0xc8;
-+		priv->flags = 0;
-+		priv->x_max = 1360;
-+		priv->y_max = 660;
-+		priv->x_bits = 23;
-+		priv->y_bits = 12;
-+		break;
- 	}
- }
- 
-@@ -1588,6 +1645,12 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv)
- 
- 	if (alps_match_table(psmouse, priv, e7, ec) == 0) {
- 		return 0;
-+	} else if (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0x50 &&
-+		   ec[0] == 0x73 && ec[1] == 0x01) {
-+		priv->proto_version = ALPS_PROTO_V5;
-+		alps_set_defaults(priv);
-+
-+		return 0;
- 	} else if (ec[0] == 0x88 && ec[1] == 0x08) {
- 		priv->proto_version = ALPS_PROTO_V3;
- 		alps_set_defaults(priv);
-diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
-index 9704805..eee5985 100644
---- a/drivers/input/mouse/alps.h
-+++ b/drivers/input/mouse/alps.h
-@@ -16,6 +16,7 @@
- #define ALPS_PROTO_V2	2
- #define ALPS_PROTO_V3	3
- #define ALPS_PROTO_V4	4
-+#define ALPS_PROTO_V5	5
- 
- /**
-  * struct alps_model_info - touchpad ID table
--- 
-1.8.1.2
-

arm-export-read_current_timer.patch

@@ -1,10 +0,0 @@
---- linux-3.7.0-0.rc2.git1.2.fc19.x86_64/arch/arm/kernel/armksyms.c.orig	2012-10-01 00:47:46.000000000 +0100
-+++ linux-3.7.0-0.rc2.git1.2.fc19.x86_64/arch/arm/kernel/armksyms.c	2012-10-24 09:06:46.570452677 +0100
-@@ -50,6 +50,7 @@
- 
- 	/* platform dependent support */
- EXPORT_SYMBOL(arm_delay_ops);
-+EXPORT_SYMBOL(read_current_timer);
- 
- 	/* networking */
- EXPORT_SYMBOL(csum_partial);

arm-imx6-utilite.patch

@@ -0,0 +1,158 @@
+commit 682d055e6ac5c3855f51649de6d68e9bb29c26a6
+Author: Valentin Raevsky <valentin@compulab.co.il>
+Date:   Tue Oct 29 14:11:43 2013 +0200
+
+    ARM: dts: Add initial support for cm-fx6.
+    
+    Add initial support for cm-fx6 module.
+    
+    cm-fx6 is a module based on mx6q SoC with the following features:
+    - Up to 4GB of DDR3
+    - 1 LCD/DVI output port
+    - 1 HDMI output port
+    - 2 LVDS LCD ports
+    - Gigabit Ethernet
+    - Analog Audio
+    - CAN
+    - SATA
+    - NAND
+    - PCIE
+    
+    This patch allows to boot up the module, configures the serial console,
+    the Ethernet adapter and the heartbeat led.
+    
+    cm-fx6 is embedded inside the Utilite computer.
+    
+    Signed-off-by: Valentin Raevsky <valentin@compulab.co.il>
+    Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
+    Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 8081479..5672e91 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -162,6 +162,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
+ 	imx6dl-sabresd.dtb \
+ 	imx6dl-wandboard.dtb \
+ 	imx6q-arm2.dtb \
++	imx6q-cm-fx6.dtb \
+ 	imx6q-cubox-i.dtb \
+ 	imx6q-phytec-pbab01.dtb \
+ 	imx6q-sabreauto.dtb \
+diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
+new file mode 100644
+index 0000000..99b46f8
+--- /dev/null
++++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
+@@ -0,0 +1,107 @@
++/*
++ * Copyright 2013 CompuLab Ltd.
++ *
++ * Author: Valentin Raevsky <valentin@compulab.co.il>
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/dts-v1/;
++#include "imx6q.dtsi"
++
++/ {
++	model = "CompuLab CM-FX6";
++	compatible = "compulab,cm-fx6", "fsl,imx6q";
++
++	memory {
++		reg = <0x10000000 0x80000000>;
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		heartbeat-led {
++			label = "Heartbeat";
++			gpios = <&gpio2 31 0>;
++			linux,default-trigger = "heartbeat";
++		};
++	};
++};
++
++&fec {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_enet>;
++	phy-mode = "rgmii";
++	status = "okay";
++};
++
++&gpmi {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_gpmi_nand>;
++	status = "okay";
++};
++
++&iomuxc {
++	imx6q-cm-fx6 {
++		pinctrl_enet: enetgrp {
++			fsl,pins = <
++				MX6QDL_PAD_RGMII_RXC__RGMII_RXC		0x1b0b0
++				MX6QDL_PAD_RGMII_RD0__RGMII_RD0		0x1b0b0
++				MX6QDL_PAD_RGMII_RD1__RGMII_RD1		0x1b0b0
++				MX6QDL_PAD_RGMII_RD2__RGMII_RD2		0x1b0b0
++				MX6QDL_PAD_RGMII_RD3__RGMII_RD3		0x1b0b0
++				MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL	0x1b0b0
++				MX6QDL_PAD_RGMII_TXC__RGMII_TXC		0x1b0b0
++				MX6QDL_PAD_RGMII_TD0__RGMII_TD0		0x1b0b0
++				MX6QDL_PAD_RGMII_TD1__RGMII_TD1		0x1b0b0
++				MX6QDL_PAD_RGMII_TD2__RGMII_TD2		0x1b0b0
++				MX6QDL_PAD_RGMII_TD3__RGMII_TD3		0x1b0b0
++				MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL	0x1b0b0
++				MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK	0x1b0b0
++				MX6QDL_PAD_ENET_MDIO__ENET_MDIO		0x1b0b0
++				MX6QDL_PAD_ENET_MDC__ENET_MDC		0x1b0b0
++				MX6QDL_PAD_GPIO_16__ENET_REF_CLK	0x4001b0a8
++			>;
++		};
++
++		pinctrl_gpmi_nand: gpminandgrp {
++			fsl,pins = <
++				MX6QDL_PAD_NANDF_CLE__NAND_CLE		0xb0b1
++				MX6QDL_PAD_NANDF_ALE__NAND_ALE		0xb0b1
++				MX6QDL_PAD_NANDF_WP_B__NAND_WP_B	0xb0b1
++				MX6QDL_PAD_NANDF_RB0__NAND_READY_B	0xb000
++				MX6QDL_PAD_NANDF_CS0__NAND_CE0_B	0xb0b1
++				MX6QDL_PAD_NANDF_CS1__NAND_CE1_B	0xb0b1
++				MX6QDL_PAD_SD4_CMD__NAND_RE_B		0xb0b1
++				MX6QDL_PAD_SD4_CLK__NAND_WE_B		0xb0b1
++				MX6QDL_PAD_NANDF_D0__NAND_DATA00	0xb0b1
++				MX6QDL_PAD_NANDF_D1__NAND_DATA01	0xb0b1
++				MX6QDL_PAD_NANDF_D2__NAND_DATA02	0xb0b1
++				MX6QDL_PAD_NANDF_D3__NAND_DATA03	0xb0b1
++				MX6QDL_PAD_NANDF_D4__NAND_DATA04	0xb0b1
++				MX6QDL_PAD_NANDF_D5__NAND_DATA05	0xb0b1
++				MX6QDL_PAD_NANDF_D6__NAND_DATA06	0xb0b1
++				MX6QDL_PAD_NANDF_D7__NAND_DATA07	0xb0b1
++				MX6QDL_PAD_SD4_DAT0__NAND_DQS		0x00b1
++			>;
++		};
++
++		pinctrl_uart4: uart4grp {
++			fsl,pins = <
++				MX6QDL_PAD_KEY_COL0__UART4_TX_DATA	0x1b0b1
++				MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA	0x1b0b1
++			>;
++		};
++	};
++};
++
++&uart4 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_uart4>;
++	status = "okay";
++};
++
++&sata {
++       status = "okay";
++};

arm-lpae-ax88796.patch

@@ -0,0 +1,21 @@
+X-Git-Url: http://git.linaro.org/gitweb?p=people%2Fahs3%2Farndale-acpi.git;a=blobdiff_plain;f=drivers%2Fnet%2Fethernet%2F8390%2Fax88796.c;fp=drivers%2Fnet%2Fethernet%2F8390%2Fax88796.c;h=763e575c82bc5d24e1927ad685dfbdd7a0eaa19e;hp=70dba5d01ad3cc8178318f9976a5922894a86859;hb=fe8e7c500d3d25234759351096d457b6e557ebd9;hpb=af28003b46fa7b2c5d7b52e0d4bc8f725a6305f1
+
+diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
+index 70dba5d..763e575 100644
+--- a/drivers/net/ethernet/8390/ax88796.c
++++ b/drivers/net/ethernet/8390/ax88796.c
+@@ -828,7 +828,14 @@ static int ax_probe(struct platform_device *pdev)
+ 	struct ei_device *ei_local;
+ 	struct ax_device *ax;
+ 	struct resource *irq, *mem, *mem2;
++#ifndef CONFIG_ARM_LPAE
++	/* LPAE breaks this code as __aeabi_uldivmod for 64-bit
++	 * is not supported in lib1funcs.s yet
++	 */
+ 	unsigned long mem_size, mem2_size = 0;
++#else
++	u32 mem_size, mem2_size = 0;
++#endif
+ 	int ret = 0;
+ 
+ 	dev = ax__alloc_ei_netdev(sizeof(struct ax_device));

arm-omap-load-tfp410.patch

@@ -0,0 +1,14 @@
+diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
+index 60d3958..0e304ce 100644
+--- a/drivers/video/omap2/dss/core.c
++++ b/drivers/video/omap2/dss/core.c
+@@ -298,6 +298,9 @@ static int __init omap_dss_init(void)
+ 	int r;
+ 	int i;
+ 
++	/* hack to load encoder-tfp410 driver */
++	request_module("encoder-tfp410");
++
+ 	r = platform_driver_probe(&omap_dss_driver, omap_dss_probe);
+ 	if (r)
+ 		return r;

arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch

@@ -0,0 +1,13 @@
+diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
+index 21b7926..19e6662 100644
+--- a/sound/soc/samsung/dma.c
++++ b/sound/soc/samsung/dma.c
+@@ -76,7 +76,7 @@ static void dma_enqueue(struct snd_pcm_substream *substream)
+ 
+ 	pr_debug("Entered %s\n", __func__);
+ 
+-	limit = (prtd->dma_end - prtd->dma_start) / prtd->dma_period;
++	limit = (u32)(prtd->dma_end - prtd->dma_start) / prtd->dma_period;
+ 
+ 	pr_debug("%s: loaded %d, limit %d\n",
+ 				__func__, prtd->dma_loaded, limit);

arm-tegra-nvec-kconfig.patch

@@ -1,10 +0,0 @@
---- linux-3.8.0-0.rc2.git1.1.fc19.x86_64/drivers/staging/nvec/Kconfig.orig	2013-01-07 11:04:43.493510550 +0000
-+++ linux-3.8.0-0.rc2.git1.1.fc19.x86_64/drivers/staging/nvec/Kconfig	2013-01-07 11:14:18.186033211 +0000
-@@ -1,6 +1,6 @@
- config MFD_NVEC
- 	bool "NV Tegra Embedded Controller SMBus Interface"
--	depends on I2C && GPIOLIB && ARCH_TEGRA
-+	depends on I2C && GPIOLIB && ARCH_TEGRA && MFD_CORE
- 	select MFD_CORE
- 	help
- 	    Say Y here to enable support for a nVidia compliant embedded

arm-tegra-paz00-panel-dts.patch

@@ -0,0 +1,99 @@
+From fb4a8356eb67514b10618d1e9e4059ced14c05f2 Mon Sep 17 00:00:00 2001
+From: Marc Dietrich <marvin24@gmx.de>
+Date: Sat, 21 Dec 2013 21:38:13 +0100
+Subject: [PATCH] ARM: tegra: paz00: Add LVDS support to device tree
+
+Add backlight and panel nodes for the PAZ00 TFT LCD panel.
+
+Signed-off-by: Marc Dietrich <marvin24@gmx.de>
+---
+ arch/arm/boot/dts/tegra20-paz00.dts |   46 ++++++++++++++++++++++++++++++++++-
+ 1 files changed, 45 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
+index c7cd8e6..9a39a80 100644
+--- a/arch/arm/boot/dts/tegra20-paz00.dts
++++ b/arch/arm/boot/dts/tegra20-paz00.dts
+@@ -17,6 +17,14 @@
+ 	};
+ 
+ 	host1x@50000000 {
++		dc@54200000 {
++			rgb {
++				status = "okay";
++
++				nvidia,panel = <&panel>;
++			};
++		};
++
+ 		hdmi@54280000 {
+ 			status = "okay";
+ 
+@@ -257,7 +265,11 @@
+ 		status = "okay";
+ 	};
+ 
+-	i2c@7000c000 {
++	pwm: pwm@7000a000 {
++		status = "okay";
++	};
++
++	lvds_ddc: i2c@7000c000 {
+ 		status = "okay";
+ 		clock-frequency = <400000>;
+ 
+@@ -475,6 +487,18 @@
+ 		non-removable;
+ 	};
+ 
++	backlight: backlight {
++		compatible = "pwm-backlight";
++
++		enable-gpios = <&gpio TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>;
++		pwms = <&pwm 0 5000000>;
++
++		brightness-levels = <0 16 32 48 64 80 96 112 128 144 160 176 192 208 224 240 255>;
++		default-brightness-level = <10>;
++
++		backlight-boot-off;
++	};
++
+ 	clocks {
+ 		compatible = "simple-bus";
+ 		#address-cells = <1>;
+@@ -509,6 +533,16 @@
+ 		};
+ 	};
+ 
++	panel: panel {
++		compatible = "samsung,ltn101nt05", "simple-panel";
++
++		ddc-i2c-bus = <&lvds_ddc>;
++		power-supply = <&vdd_pnl_reg>;
++		enable-gpios = <&gpio TEGRA_GPIO(M, 6) GPIO_ACTIVE_HIGH>;
++
++		backlight = <&backlight>;
++	};
++
+ 	regulators {
+ 		compatible = "simple-bus";
+ 		#address-cells = <1>;
+@@ -522,6 +556,16 @@
+ 			regulator-max-microvolt = <5000000>;
+ 			regulator-always-on;
+ 		};
++
++		vdd_pnl_reg: regulator@1 {
++			compatible = "regulator-fixed";
++			reg = <1>;
++			regulator-name = "+3VS,vdd_pnl";
++			regulator-min-microvolt = <3300000>;
++			regulator-max-microvolt = <3300000>;
++			gpio = <&gpio TEGRA_GPIO(A, 4) GPIO_ACTIVE_HIGH>;
++			enable-active-high;
++		};
+ 	};
+ 
+ 	sound {
+-- 
+1.7.1

arm-tegra-sdhci-module-fix.patch

@@ -1,11 +0,0 @@
---- linux-3.5.0-0.rc0.git3.1.fc18.armv7hl/drivers/mmc/host/sdhci-tegra.c.orig	2012-05-23 06:59:19.797302757 -0500
-+++ linux-3.5.0-0.rc0.git3.1.fc18.armv7hl/drivers/mmc/host/sdhci-tegra.c	2012-05-22 15:26:07.154823359 -0500
-@@ -190,7 +190,7 @@
- #endif
- 	{}
- };
--MODULE_DEVICE_TABLE(of, sdhci_dt_ids);
-+MODULE_DEVICE_TABLE(of, sdhci_tegra_dt_match);
- 
- static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata(
- 						struct platform_device *pdev)

br-fix-use-of-rx_handler_data-in-code-executed-on-no.patch

@@ -0,0 +1,83 @@
+Bugzilla: 1025770
+Upstream-status: 3.13 (commit 859828c0ea476b42f3a)
+
+From 1a62121ead27a218d4b02b7130a6f5f6ca9c247e Mon Sep 17 00:00:00 2001
+From: Jiri Pirko <jiri@resnulli.us>
+Date: Thu, 5 Dec 2013 16:27:37 +0100
+Subject: [PATCH] br: fix use of ->rx_handler_data in code executed on
+ non-rx_handler path
+
+br_stp_rcv() is reached by non-rx_handler path. That means there is no
+guarantee that dev is bridge port and therefore simple NULL check of
+->rx_handler_data is not enough. There is need to check if dev is really
+bridge port and since only rcu read lock is held here, do it by checking
+->rx_handler pointer.
+
+Note that synchronize_net() in netdev_rx_handler_unregister() ensures
+this approach as valid.
+
+Introduced originally by:
+commit f350a0a87374418635689471606454abc7beaa3a
+  "bridge: use rx_handler_data pointer to store net_bridge_port pointer"
+
+Fixed but not in the best way by:
+commit b5ed54e94d324f17c97852296d61a143f01b227a
+  "bridge: fix RCU races with bridge port"
+
+Reintroduced by:
+commit 716ec052d2280d511e10e90ad54a86f5b5d4dcc2
+  "bridge: fix NULL pointer deref of br_port_get_rcu"
+
+Please apply to stable trees as well. Thanks.
+
+RH bugzilla reference: https://bugzilla.redhat.com/show_bug.cgi?id=1025770
+
+Reported-by: Laine Stump <laine@redhat.com>
+Debugged-by: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Jiri Pirko <jiri@resnulli.us>
+Acked-by: Michael S. Tsirkin <mst@redhat.com>
+Acked-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/bridge/br_private.h  | 10 ++++++++++
+ net/bridge/br_stp_bpdu.c |  2 +-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
+index e14c33b..9a63c42 100644
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -442,6 +442,16 @@ extern netdev_features_t br_features_recompute(struct net_bridge *br,
+ extern int br_handle_frame_finish(struct sk_buff *skb);
+ extern rx_handler_result_t br_handle_frame(struct sk_buff **pskb);
+ 
++static inline bool br_rx_handler_check_rcu(const struct net_device *dev)
++{
++	return rcu_dereference(dev->rx_handler) == br_handle_frame;
++}
++
++static inline struct net_bridge_port *br_port_get_check_rcu(const struct net_device *dev)
++{
++	return br_rx_handler_check_rcu(dev) ? br_port_get_rcu(dev) : NULL;
++}
++
+ /* br_ioctl.c */
+ extern int br_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
+ extern int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd, void __user *arg);
+diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c
+index 8660ea3..bdb459d 100644
+--- a/net/bridge/br_stp_bpdu.c
++++ b/net/bridge/br_stp_bpdu.c
+@@ -153,7 +153,7 @@ void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb,
+ 	if (buf[0] != 0 || buf[1] != 0 || buf[2] != 0)
+ 		goto err;
+ 
+-	p = br_port_get_rcu(dev);
++	p = br_port_get_check_rcu(dev);
+ 	if (!p)
+ 		goto err;
+ 
+-- 
+1.8.3.1
+

config-arm-generic

@@ -1,526 +1,212 @@
-# Generic ARM config. This is common config options that should be
-# enabled on all ARM kernels and hence should be added here
-#
-# FIXME - we need to add debug/nodebug generic build options
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-
-# Generic ARM processor options
-CONFIG_ARM=y
-
-CONFIG_ARM_THUMB=y
-CONFIG_AEABI=y
-CONFIG_VFP=y
-CONFIG_ARM_UNWIND=y
-# CONFIG_ARCH_MULTI_V7 is not set
-# CONFIG_OABI_COMPAT is not set
-
-CONFIG_SMP=y
-CONFIG_NR_CPUS=4
-CONFIG_SMP_ON_UP=y
-
-CONFIG_HAVE_ARM_ARCH_TIMER=y
-
-CONFIG_CMDLINE=""
-
-# CONFIG_ARM_LPAE is not set
-# CONFIG_FPE_NWFPE is not set
-CONFIG_FPE_FASTFPE=y
-CONFIG_HIGHPTE=y
+CONFIG_KUSER_HELPERS=y
+# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+CONFIG_COMMON_CLK=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_FB_SSD1307=m
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_UACCESS_WITH_MEMCPY=y
-# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
+CONFIG_MMC=y
+CONFIG_NFS_FS=y
 
-# Generic ARM Errata
-CONFIG_ARM_ERRATA_720789=y
-CONFIG_ARM_ERRATA_751472=y
-CONFIG_ARM_ERRATA_742230=y
-CONFIG_ARM_ERRATA_742231=y
-CONFIG_ARM_ERRATA_754327=y
-CONFIG_ARM_ERRATA_764369=y
-CONFIG_ARM_ERRATA_775420=y
-CONFIG_PL310_ERRATA_753970=y
-
-# Generic ARM config options
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_LOCAL_TIMERS=y
-
-CONFIG_ATAGS=y
-CONFIG_ATAGS_PROC=y
-
-CONFIG_PL330_DMA=y
-CONFIG_AMBA_PL08X=y
-CONFIG_PL330_DMA=y
-# CONFIG_XIP_KERNEL is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
 
-# Generic options we want for ARM that aren't defualt
-CONFIG_EARLY_PRINTK=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+# CONFIG_BIG_LITTLE is not set
 
-CONFIG_HIGHMEM=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
 
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_GPIO=y
 
-CONFIG_RCU_FANOUT=32
-
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
-# CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_CPU_IDLE_GOV_MENU=y
-
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-
-CONFIG_PM=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_SUSPEND=y
-CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARM_CPU_TOPOLOGY=y
-
-CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
-CONFIG_LSM_MMAP_MIN_ADDR=32768
-
-# CONFIG_XEN is not set
-
-CONFIG_PINCTRL=y
-CONFIG_PINCONF=y
-
-CONFIG_COMMON_CLK=y
-
-CONFIG_THERMAL=y
-
-CONFIG_ETHERNET=y
-
-CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
-
-CONFIG_CC_STACKPROTECTOR=y
-
-CONFIG_SECCOMP=y
-CONFIG_STRICT_DEVMEM=y
-
-CONFIG_SPARSE_IRQ=y
-
-# Generic HW for all ARM platforms
-CONFIG_LEDS_GPIO=m
-
-CONFIG_LBDAF=y
-
-CONFIG_GPIOLIB=y
-CONFIG_RFKILL_GPIO=m
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_PINCTRL_SINGLE=m
-CONFIG_POWER_RESET_GPIO=y
-CONFIG_POWER_RESET_RESTART=y
-
-CONFIG_USB_ULPI=y
-
-CONFIG_SND_ARM=y
-CONFIG_SND_ARMAACI=m
-CONFIG_SND_SOC=m
-CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_SIMPLE_CARD=m
-# CONFIG_SND_SOC_CACHE_LZO is not set
-CONFIG_SND_SOC_ALL_CODECS=m
-CONFIG_SND_SPI=y
-
-CONFIG_AX88796=m
-CONFIG_AX88796_93CX6=y
-CONFIG_SMC91X=m
-CONFIG_DM9000=m
-CONFIG_DM9000_DEBUGLEVEL=4
-# CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set
-CONFIG_SMC911X=m
-CONFIG_SMSC911X=m
-
-CONFIG_SERIO_AMBAKMI=m
-CONFIG_I2C_NOMADIK=m
-CONFIG_ARM_SP805_WATCHDOG=m
-CONFIG_FB_ARMCLCD=m
-CONFIG_FB_SSD1307=m
-CONFIG_MPCORE_WATCHDOG=m
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RTC_DRV_SNVS is not set
+# CONFIG_RTC_DRV_HYM8563 is not set
 CONFIG_BACKLIGHT_PWM=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_ARM_SP805_WATCHDOG=m
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+# CONFIG_ARM_DT_BL_CPUFREQ is not set
+CONFIG_NR_CPUS=8
 
-CONFIG_MMC_ARMMMCI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_SDHCI_OF=m
-CONFIG_MMC_SPI=m
-CONFIG_MMC_DW=m
-CONFIG_MMC_DW_PLTFM=m
-CONFIG_MMC_DW_PCI=m
-# CONFIG_MMC_DW_EXYNOS is not set
-# CONFIG_MMC_DW_IDMAC is not set
-CONFIG_MMC_SDHCI_PXAV3=m
-CONFIG_MMC_SDHCI_PXAV2=m
+CONFIG_SWIOTLB=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_FB_SIMPLE=y
 
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 
-CONFIG_SPI=y
-# Generic GPIO options
-CONFIG_GENERIC_GPIO=y
+# ARM AMBA generic HW
+CONFIG_ARM_AMBA=y
+CONFIG_ARM_CCI=y
+CONFIG_ARM_DMA_USE_IOMMU=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_GLOBAL_TIMER=y
+CONFIG_ARM_SMMU=y
+CONFIG_MMC_ARMMMCI=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIO_AMBAKMI=y
+CONFIG_OC_ETM=y
+CONFIG_FB_ARMCLCD=y
 
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_OF_PARTS=y
-CONFIG_MTD_PHYSMAP_OF=y
-# CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_MTD_AR7_PARTS is not set
-CONFIG_MTD_CFI=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_DOC2000=m
-CONFIG_MTD_DOC2001=m
-CONFIG_MTD_DOC2001PLUS=m
-# CONFIG_MTD_DOCPROBE_ADVANCED is not set
-CONFIG_MTD_ALAUDA=m
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=y
-CONFIG_MTD_IMPA7=m
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_MTD_M25P80=m
-CONFIG_M25PXX_USE_FAST_READ=y
-CONFIG_MTD_NAND=m
-CONFIG_MTD_NAND_ECC=m
-CONFIG_MTD_NAND_IDS=m
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_DENALI is not set
-# CONFIG_MTD_NAND_DOCG4 is not set
-CONFIG_MTD_NAND_GPIO=m
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-CONFIG_MTD_NAND_ORION=m
-# CONFIG_MTD_NAND_RICOH is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_OTP is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_DATAFLASH=m
-CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
-CONFIG_MTD_DATAFLASH_OTP=y
-CONFIG_MTD_SST25L=m
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
-CONFIG_MG_DISK=m
-CONFIG_MG_DISK_RES=0
-
-# CONFIG_SM_FTL is not set
-
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-
-CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
-
-# HW crypto and rng
-CONFIG_CRYPTO_SHA1_ARM=m
-CONFIG_CRYPTO_AES_ARM=m
-CONFIG_HW_RANDOM_ATMEL=m
-CONFIG_HW_RANDOM_EXYNOS=m
+# ARM VExpress
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_VEXPRESS_CONFIG=y
+CONFIG_COMMON_CLK_VERSATILE=y
+CONFIG_I2C_VERSATILE=m
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_REGULATOR_VEXPRESS=m
+CONFIG_SENSORS_VEXPRESS=m
 
 # Device tree
 CONFIG_DTC=y
-CONFIG_OF=y
-CONFIG_USE_OF=y
-CONFIG_OF_DEVICE=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_GPIO=y
-CONFIG_ARM_ATAG_DTB_COMPAT=y
-CONFIG_ARM_APPENDED_DTB=y
+CONFIG_DMA_OF=y
 CONFIG_PROC_DEVICETREE=y
-# CONFIG_OF_SELFTEST is not set
-
-CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_OF=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_DYNAMIC=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_FLATTREE=y
 CONFIG_OF_GPIO=y
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
-CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_OF_I2C=m
+CONFIG_OF_IOMMU=y
+CONFIG_OF_IRQ=y
 CONFIG_OF_MDIO=m
-CONFIG_MDIO_BUS_MUX_GPIO=m
-CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_OF_MTD=y
+CONFIG_OF_NET=y
+CONFIG_OF_PCI_IRQ=m
+CONFIG_OF_PCI=m
+CONFIG_OF_RESERVED_MEM=y
+CONFIG_PATA_OF_PLATFORM=m
+# CONFIG_OF_SELFTEST is not set
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_THERMAL_OF=y
 
-CONFIG_BPF_JIT=y
-
-CONFIG_RCU_FANOUT_LEAF=16
-CONFIG_EDAC=y
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_LEGACY_SYSFS=y
-
-CONFIG_RTC_DRV_88PM80X=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_MC13XXX=m
-CONFIG_RTC_DRV_PCF2123=m
-CONFIG_RTC_DRV_PL030=m
-CONFIG_RTC_DRV_PL031=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_RX4581=m
-CONFIG_RTC_DRV_SNVS=m
-
-CONFIG_RFKILL_REGULATOR=m
-CONFIG_INPUT_88PM80X_ONKEY=y
-CONFIG_INPUT_GP2A=m
-CONFIG_INPUT_GPIO_TILT_POLLED=m
-CONFIG_INPUT_PWM_BEEPER=m
-CONFIG_INPUT_ARIZONA_HAPTICS=m
-CONFIG_INPUT_MC13783_PWRBUTTON=m
-
-CONFIG_SERIAL_AMBA_PL010=m
-CONFIG_SERIAL_AMBA_PL011=m
-CONFIG_SERIAL_MAX3100=m
-CONFIG_SERIAL_MAX310X=y
-CONFIG_SERIAL_IFX6X60=m
-
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADNP=m
-CONFIG_GPIO_ARIZONA=m
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_PL061=y
-
-CONFIG_SPI_ALTERA=m
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_DW_MMIO=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-CONFIG_SPI_OC_TINY=m
-CONFIG_SPI_PL022=m
-CONFIG_SPI_SC18IS602=m
-CONFIG_SPI_XCOMM=m
-CONFIG_SPI_XILINX=m
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
-CONFIG_BMP085_SPI=m
-CONFIG_BMP085_SPI=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_93XX46=m
-CONFIG_KS8851=m
-CONFIG_MICREL_KS8995MA=m
-CONFIG_LIBERTAS_SPI=m
-CONFIG_P54_SPI=m
-CONFIG_P54_SPI_DEFAULT_EEPROM=y
-
-CONFIG_MFD_CORE=m
-CONFIG_MFD_88PM800=m
-CONFIG_MFD_88PM805=m
-CONFIG_MFD_ARIZONA_SPI=m
-CONFIG_MFD_MC13XXX_SPI=m
-CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_WM5102 is not set
-# CONFIG_MFD_WM5110 is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_TPS80031 is not set
-# CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_SMSC is not set
-# CONFIG_MFD_DA9055 is not set
-# CONFIG_MFD_MAX8907 is not set
-
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
-CONFIG_REGULATOR_USERSPACE_CONSUMER=m
-# CONFIG_REGULATOR_DUMMY is not set
-CONFIG_REGULATOR_GPIO=m
-CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_ANATOP=m
-CONFIG_REGULATOR_ARIZONA=m
-CONFIG_REGULATOR_FAN53555=m
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_LP8755=m
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_MAX8973=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_TPS51632=m
-CONFIG_REGULATOR_TPS62360=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6524X=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_CHARGER_MANAGER=y
+# External Connectors
+CONFIG_EXTCON=m
+CONFIG_OF_EXTCON=m
 CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_ADC_JACK=m
 
-CONFIG_SENSORS_AD7314=m
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MC13783_ADC=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_LIS3_SPI=m
+# MTD
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_CFI=m
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_OF_PARTS=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_PHYSMAP_OF=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
 
-CONFIG_IEEE802154_AT86RF230=m
-CONFIG_IEEE802154_MRF24J40=m
+# GPIO
+CONFIG_GPIO_DEVRES=y
+CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_WATCHDOG=m
+CONFIG_GPIOLIB=y
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_MDIO_GPIO=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_RESTART=y
 
-# CONFIG_ARM_VIRT_EXT is not set
-# CONFIG_PINCTRL_EXYNOS4 is not set
-# CONFIG_PINCTRL_EXYNOS5440 is not set
+#i2c
+CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_MUX=m
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_I2C_MUX_PCA9541=m
 
-# CONFIG_AUTO_ZRELADDR is not set
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+# Sensors
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_IIO_SYSFS_TRIGGER=m
 
-# CONFIG_VFIO is not set
+# PHY framework
+CONFIG_GENERIC_PHY=y
 
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_APM_EMULATION is not set
-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+# MFD
+CONFIG_MFD_CORE=m
 
-# CONFIG_SERIAL_8250_EM is not set
-# CONFIG_GPIO_EM is not set
-# CONFIG_HVC_DCC is not set
-# CONFIG_LEDS_RENESAS_TPU is not set
-# CONFIG_LEDS_PWM is not set
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_MC13783=m
+CONFIG_SMC91X=m
+CONFIG_SMC911X=m
 
-# CONFIG_VIRTIO_CONSOLE is not set
+CONFIG_CPU_THERMAL=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
 
-#  Possibly part of Snowball
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC6387XB is not set
+# Contiguous Memory Allocator
+CONFIG_CMA=y
+CONFIG_DMA_CMA=y
+# CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
 
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_XEN is not set
+# CONFIG_DRM_RCAR_DU is not set
+# CONFIG_I2C_RCAR is not set
+# CONFIG_DRM_SHMOBILE is not set
+# CONFIG_I2C_SH_MOBILE is not set
+# CONFIG_MMC_DW_SOCFPGA is not set
+# CONFIG_I2C_NOMADIK is not set
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
-# CONFIG_COMMON_CLK_DEBUG is not set
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_ARM_KPROBES_TEST is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_LEDS_RENESAS_TPU is not set
+# CONFIG_LOCK_STAT is not set
 
-# CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_DRM_ARMADA is not set
+# CONFIG_DRM_TEGRA is not set
+# CONFIG_SHMOBILE_IOMMU is not set
 
-# HW Disabled because it causes issues on ARM platforms
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_QCOM is not set
 
-# disable TPM on arm at least on the trimslices it causes havoc
-# CONFIG_TCG_TPM is not set
+# CONFIG_ARM_PTDUMP is not set
 
-# CONFIG_IMA is not set
+# CONFIG_PATA_PLATFORM is not set
 
-# ERROR: "__bswapsi2" [drivers/staging/crystalhd/crystalhd.ko] undefined!
-# CONFIG_CRYSTALHD is not set
+### turn off things which make no sense on embedded SoC
 
-# these modules all fail with missing __bad_udelay
-# http://www.spinics.net/lists/arm/msg15615.html provides some background
-# CONFIG_SUNGEM is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_ATM_HE is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SFC is not set
+# core
 
-# these all currently fail due to missing symbols __bad_udelay or
-# error: implicit declaration of function ‘iowrite32be’
-# CONFIG_SND_ALI5451 is not set
-# CONFIG_MLX4_EN is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_ISDN is not set
 
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_TSC2005=m
-CONFIG_TOUCHSCREEN_MC13783=m
+# netdrv
 
-# drivers/input/touchscreen/eeti_ts.c:65:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration]
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_EGALAX is not set 
-# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_EXAR is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
 
-# CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set
-# CONFIG_PANEL_ACX565AKM is not set
-# CONFIG_PANEL_N8X0 is not set
+# scsi
 
-# CONFIG_LCD_L4F00242T03 is not set
-# CONFIG_LCD_LMS283GF05 is not set
-# CONFIG_LCD_LTV350QV 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_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+# CONFIG_SCSI_BFA_FC is not set
 
-# CONFIG_FB_MX3 is not set
-# CONFIG_MX3_IPU is not set
-# CONFIG_MX3_IPU_IRQS is not set
-# CONFIG_SND_ATMEL_SOC is not set
+# serial
+# CONFIG_SERIAL_SH_SCI is not set
 
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_CS89x0 is not set
-# CONFIG_DVB_USB_PCTV452E is not set
-# CONFIG_PINCTRL_EXYNOS is not set
-# CONFIG_VIRTUALIZATION is not set
+CONFIG_CRASH=m
 
-CONFIG_XZ_DEC_ARM=y
-
-# CONFIG_EZX_PCAP is not set
-
-# CONFIG_EXTCON_ARIZONA is not set
-
-# CONFIG_VIRTUALIZATION is not set
-# CONFIG_VIRTIO_PCI is not set
-# VIRTIO_MMIO is not set
-# REMOTEPROC is not set
-# RPMSG is not set
-
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_DRM_TILCDC is not set
-CONFIG_OF_DISPLAY_TIMING=y
-CONFIG_OF_VIDEOMODE=y
+# CONFIG_DEBUG_SET_MODULE_RONX is not set

config-arm-omap

@@ -1,401 +0,0 @@
-CONFIG_ARCH_OMAP=y
-CONFIG_ARCH_OMAP_OTG=y
-# CONFIG_ARCH_OMAP1 is not set
-# CONFIG_ARCH_MULTI_V4 is not set
-# CONFIG_ARCH_MULTI_V4T is not set
-# CONFIG_ARCH_MULTI_V6 is not set
-CONFIG_ARCH_MULTI_V6_V7=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_OMAP2PLUS=y
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_BCM is not set
-# CONFIG_ARCH_HIGHBANK is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_ARCH_SUNXI is not set
-# CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set
-# CONFIG_ARCH_VEXPRESS_CA9X4 is not set
-# CONFIG_ARCH_VIRT is not set
-# CONFIG_ARCH_WM8850 is not set
-# CONFIG_ARCH_ZYNQ is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_WM8505 is not set
-# CONFIG_ARM_CHARLCD is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_I2C_VERSATILE is not set
-# CONFIG_SENSORS_VEXPRESS is not set
-# CONFIG_REGULATOR_VEXPRESS is not set
-# CONFIG_RTC_DRV_LP8788 is not set
-
-#
-# OMAP Feature Selections
-#
-CONFIG_OMAP_RESET_CLOCKS=y
-CONFIG_OMAP_MUX=y
-# CONFIG_OMAP_MUX_DEBUG is not set
-CONFIG_OMAP_MUX_WARNINGS=y
-CONFIG_OMAP_MCBSP=y
-CONFIG_OMAP_MBOX_FWK=m
-CONFIG_OMAP_MBOX_KFIFO_SIZE=256
-CONFIG_OMAP_32K_TIMER=y
-# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
-CONFIG_OMAP_32K_TIMER_HZ=128
-CONFIG_OMAP_DM_TIMER=y
-# CONFIG_OMAP_PM_NONE is not set
-CONFIG_OMAP_PM_NOOP=y
-CONFIG_OMAP_IOMMU=y
-# CONFIG_OMAP_IOMMU_DEBUG is not set
-CONFIG_OMAP3_EMU=y
-CONFIG_HWSPINLOCK_OMAP=m
-CONFIG_DMA_OMAP=y
-# CONFIG_DMADEVICES_VDEBUG is not set
-
-#
-# TI OMAP2/3/4 Specific Features
-#
-CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
-# CONFIG_ARCH_OMAP2 is not set
-CONFIG_ARCH_OMAP3=y
-CONFIG_ARCH_OMAP4=y
-CONFIG_SOC_OMAP3430=y
-CONFIG_SOC_TI81XX=y
-CONFIG_SOC_AM33XX=y
-CONFIG_SOC_OMAPTI816X=y
-# CONFIG_SOC_OMAP5 is not set
-CONFIG_OMAP_PACKAGE_CBB=y
-CONFIG_OMAP_PACKAGE_CBL=y
-CONFIG_OMAP_PACKAGE_CBS=y
-# CONFIG_OMAP4_ERRATA_I688 is not set
-
-#
-# OMAP Board Type
-#
-CONFIG_MACH_CM_T35=y
-CONFIG_MACH_CM_T3517=y
-CONFIG_MACH_CRANEBOARD=y
-CONFIG_MACH_DEVKIT8000=y
-CONFIG_MACH_IGEP0020=y
-CONFIG_MACH_IGEP0030=y
-CONFIG_MACH_OMAP_GENERIC=y
-CONFIG_MACH_OMAP_LDP=y
-CONFIG_MACH_OMAP_ZOOM2=y
-CONFIG_MACH_OMAP_ZOOM3=y
-CONFIG_MACH_OMAP_3430SDP=y
-CONFIG_MACH_OMAP_3630SDP=y
-CONFIG_MACH_OMAP_4430SDP=y
-CONFIG_MACH_OMAP3_BEAGLE=y
-CONFIG_MACH_OMAP3_PANDORA=y
-CONFIG_MACH_OMAP3_TOUCHBOOK=y
-CONFIG_MACH_OMAP3_TORPEDO=y
-CONFIG_MACH_OMAP3_WESTBRIDGE_AST_PNAND_HAL=y
-CONFIG_MACH_OMAP3EVM=y
-CONFIG_MACH_OMAP3517EVM=y
-CONFIG_MACH_OMAP3530_LV_SOM=y
-CONFIG_MACH_OMAP4_PANDA=y
-CONFIG_MACH_OVERO=y
-CONFIG_MACH_SBC3530=y
-CONFIG_MACH_TI8148EVM=y
-CONFIG_MACH_TI8168EVM=y
-CONFIG_MACH_TOUCHBOOK=y
-# CONFIG_MACH_NOKIA_RM680 is not set
-# CONFIG_MACH_NOKIA_RX51 is not set
-
-
-# CONFIG_OMAP3_SDRC_AC_TIMING is not set
-
-
-# System MMU
-CONFIG_CPU_32v6K=y
-CONFIG_CPU_V7=y
-CONFIG_CPU_32v7=y
-CONFIG_CPU_ABRT_EV7=y
-CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_CACHE_V7=y
-CONFIG_CPU_CACHE_VIPT=y
-CONFIG_CPU_COPY_V6=y
-CONFIG_CPU_TLB_V7=y
-CONFIG_CPU_HAS_ASID=y
-CONFIG_ARM_THUMBEE=y
-CONFIG_SWP_EMULATE=y
-# CONFIG_CPU_BPREDICT_DISABLE is not set
-CONFIG_OUTER_CACHE=y
-CONFIG_OUTER_CACHE_SYNC=y
-CONFIG_CACHE_L2X0=y
-CONFIG_CACHE_PL310=y
-CONFIG_ARM_DMA_MEM_BUFFERABLE=y
-CONFIG_ARM_ERRATA_430973=y
-# CONFIG_ARM_ERRATA_458693 is not set
-# CONFIG_ARM_ERRATA_460075 is not set
-# CONFIG_ARM_ERRATA_742230 is not set
-# CONFIG_ARM_ERRATA_742231 is not set
-CONFIG_PL310_ERRATA_588369=y
-CONFIG_PL310_ERRATA_769419=y
-CONFIG_ARM_ERRATA_720789=y
-# CONFIG_ARM_ERRATA_743622 is not set
-# CONFIG_ARM_ERRATA_751472 is not set
-# CONFIG_ARM_ERRATA_753970 is not set
-# CONFIG_ARM_ERRATA_754322 is not set
-# CONFIG_ARM_ERRATA_754327 is not set
-# CONFIG_ARM_ERRATA_764369 is not set
-CONFIG_ARM_GIC=y
-CONFIG_HAVE_ARM_SCU=y
-CONFIG_HAVE_ARM_TWD=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_HZ=128
-# CONFIG_THUMB2_KERNEL is not set
-CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_KSM is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=""
-# CONFIG_AUTO_ZRELADDR is not set
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_BINFMT_MISC=m
-CONFIG_PM_DEBUG=y
-# CONFIG_PM_ADVANCED_DEBUG is not set
-# CONFIG_PM_VERBOSE is not set
-CONFIG_CAN_PM_TRACE=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_ARCH_HAS_OPP=y
-CONFIG_PM_OPP=y
-
-# OMAP thermal temp. Can likely be built as module but doesn't autoload so build in to ensure performance on PandaES
-CONFIG_OMAP_BANDGAP=y
-CONFIG_OMAP4_THERMAL=y
-CONFIG_OMAP5_THERMAL=y
-
-# OMAP3 thermal/power
-CONFIG_POWER_AVS=y
-CONFIG_POWER_AVS_OMAP=y
-CONFIG_POWER_AVS_OMAP_CLASS3=y
-
-CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
-
-#
-# OMAP Hardware
-#
-CONFIG_WL_TI=y
-CONFIG_WLCORE_SDIO=m
-CONFIG_WLCORE_SPI=m
-CONFIG_TI_ST=m
-CONFIG_TI_DAC7512=m
-# CONFIG_TI_CPSW is not set
-CONFIG_MTD_NAND_OMAP2=y
-CONFIG_MTD_NAND_OMAP_PREFETCH=y
-CONFIG_MTD_NAND_OMAP_PREFETCH_DMA=y
-CONFIG_WL1251_SPI=m
-CONFIG_WL12XX_SPI=m
-CONFIG_WL12XX_SDIO_TEST=m
-CONFIG_WL18XX=m
-CONFIG_SPI_DAVINCI=m
-CONFIG_SPI_OMAP24XX=y
-CONFIG_MFD_TI_SSP=m
-CONFIG_SPI_TI_SSP=m
-CONFIG_NFC_WILINK=m
-CONFIG_INPUT_TWL4030_PWRBUTTON=m
-CONFIG_INPUT_TWL4030_VIBRA=m
-CONFIG_INPUT_TWL6040_VIBRA=m
-CONFIG_KEYBOARD_OMAP4=m
-CONFIG_KEYBOARD_TWL4030=m
-CONFIG_TOUCHSCREEN_TI_TSCADC=m
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
-CONFIG_OMAP_WATCHDOG=y
-CONFIG_CLK_TWL6040=m
-CONFIG_TWL4030_CORE=y
-CONFIG_TWL4030_MADC=m
-CONFIG_TWL4030_POWER=y
-CONFIG_TWL4030_CODEC=y
-CONFIG_TWL4030_WATCHDOG=m
-CONFIG_GPIO_TWL4030=m
-CONFIG_GPIO_TWL6040=m
-CONFIG_CHARGER_TWL4030=m
-CONFIG_TWL6030_PWM=m
-CONFIG_TWL6040_CORE=y
-CONFIG_SENSORS_TWL4030_MADC=m
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_TI_DAVINCI_EMAC=m
-CONFIG_TI_DAVINCI_MDIO=m
-CONFIG_TI_DAVINCI_CPDMA=m
-
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_LP8788=m
-CONFIG_MTD_ONENAND_OMAP2=y
-CONFIG_HDQ_MASTER_OMAP=m
-CONFIG_I2C_OMAP=m
-CONFIG_MFD_OMAP_USB_HOST=y
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_LP8788=y
-CONFIG_MFD_TPS65910=y
-CONFIG_GPIO_TPS65910=y
-CONFIG_REGULATOR_TWL4030=y
-CONFIG_REGULATOR_LP8788=y
-CONFIG_REGULATOR_TPS65217=y
-CONFIG_REGULATOR_TPS65910=y
-# Enable V4L2 drivers for OMAP2+
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_OMAP2_VOUT=m
-CONFIG_VIDEO_OMAP3=m
-CONFIG_VIDEO_VPFE_CAPTURE=m
-# The ones below are for TI Davinci
-# CONFIG_VIDEO_VPSS_SYSTEM is not set
-# CONFIG_VIDEO_DM6446_CCDC is not set
-# CONFIG_VIDEO_DM644X_VPBE is not set
-# CONFIG_VIDEO_DM355_CCDC is not set
-# CONFIG_VIDEO_ISIF is not set
-# Also enable vivi driver - useful for testing a full kernelspace V4L2 driver
-CONFIG_V4L_TEST_DRIVERS=y
-CONFIG_VIDEO_VIVI=m
-
-CONFIG_DRM=m
-CONFIG_DRM_OMAP=m
-CONFIG_DRM_OMAP_NUM_CRTCS=2
-# CONFIG_DRM_EXYNOS is not set
-# CONFIG_DRM_IMX is not set
-# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
-# CONFIG_FB_OMAP_LCD_VGA is not set
-CONFIG_OMAP2_VRAM=y
-CONFIG_OMAP2_VRAM_SIZE=0
-CONFIG_OMAP2_VRFB=y
-# CONFIG_FB_OMAP2 is not set
-
-CONFIG_OMAP2_DSS=m
-CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
-# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set
-CONFIG_OMAP2_DSS_DPI=y
-CONFIG_OMAP2_DSS_RFBI=y
-CONFIG_OMAP2_DSS_VENC=y
-CONFIG_OMAP4_DSS_HDMI=y
-CONFIG_OMAP2_DSS_SDI=y
-CONFIG_OMAP2_DSS_DSI=y
-# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set
-CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
-CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET=y
-CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
-
-CONFIG_FB_DA8XX=m
-CONFIG_FB_DA8XX_CONSISTENT_DMA_SIZE=5
-
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_PANEL_GENERIC_DPI=m
-CONFIG_PANEL_TFP410=m
-CONFIG_PANEL_TAAL=m
-CONFIG_PANEL_PICODLP=m
-CONFIG_PANEL_SHARP_LS037V7DW01=m
-CONFIG_PANEL_NEC_NL8048HL11_01B=m
-CONFIG_PANEL_TPO_TD043MTEA1=m
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_LP8788=m
-CONFIG_BACKLIGHT_PWM=m
-CONFIG_BACKLIGHT_PANDORA=m
-
-
-CONFIG_SND_OMAP_SOC=y
-CONFIG_SND_OMAP_SOC_DMIC=m
-CONFIG_SND_OMAP_SOC_MCBSP=m
-CONFIG_SND_OMAP_SOC_MCPDM=m
-CONFIG_SND_OMAP_SOC_OVERO=m
-CONFIG_SND_OMAP_SOC_OMAP3EVM=m
-CONFIG_SND_OMAP_SOC_AM3517EVM=m
-CONFIG_SND_OMAP_SOC_SDP3430=m
-CONFIG_SND_OMAP_SOC_SDP4430=m
-CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
-CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
-CONFIG_SND_OMAP_SOC_ZOOM2=m
-CONFIG_SND_OMAP_SOC_IGEP0020=m
-CONFIG_SND_OMAP_SOC_OMAP_HDMI=m
-CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
-CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
-CONFIG_SND_SOC_I2C_AND_SPI=y
-# CONFIG_SND_OMAP_SOC_RX51 is not set
-# CONFIG_SND_SOC_ALL_CODECS is not set
-CONFIG_SND_SOC_TLV320AIC23=m
-CONFIG_SND_SOC_TLV320AIC3X=m
-CONFIG_SND_SOC_TWL4030=m
-CONFIG_SND_SOC_TWL6040=m
-CONFIG_RADIO_WL128X=m
-
-CONFIG_USB_OTG=y
-CONFIG_USB_EHCI_HCD_OMAP=y
-CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_USB_MUSB_HDRC=y
-CONFIG_USB_OHCI_HCD_OMAP3=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_MUSB_PIO_ONLY is not set
-# CONFIG_USB_MUSB_DEBUG is not set
-#
-
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_ISP1301_OMAP is not set
-
-# This block is temporary until we work out why the MMC modules don't work as modules
-CONFIG_MMC=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_OF=y
-CONFIG_MMC_SPI=y
-
-CONFIG_MMC_OMAP=y
-CONFIG_MMC_OMAP_HS=y
-CONFIG_TWL4030_USB=y
-CONFIG_TWL6030_USB=y
-CONFIG_RTC_DRV_OMAP=m
-CONFIG_RTC_DRV_TWL4030=y
-CONFIG_RTC_DRV_TPS65910=m
-
-CONFIG_PWM_TIECAP=m
-CONFIG_PWM_TIEHRPWM=m
-CONFIG_PWM_TWL=m
-CONFIG_PWM_TWL_LED=m
-
-# CONFIG_IR_RX51 is not set
-# CONFIG_BATTERY_RX51 is not set
-
-# 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_OMAP_REMOTEPROC is not set
-# CONFIG_OMAP_IOVMM is not set
-
-# CONFIG_CRYPTO_DEV_OMAP_SHAM is not set
-# CONFIG_CRYPTO_DEV_OMAP_AES is not set
-
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_MTD_NAND_OMAP_BCH is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_MFD_DA9052_I2C is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_SEC_CORE is not set
-# CONFIG_MFD_TPS65090 is not set
-# CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_RC5T583 is not set
-# CONFIG_MFD_PALMAS is not set
-# CONFIG_REGULATOR_LP3972 is not set
-# CONFIG_REGULATOR_LP872X is not set
-
-# CONFIG_OMAP2_DSS_DEBUG is not set
-# CONFIG_OMAP2_DSS_DEBUGFS is not set
-# CONFIG_ARM_PSCI is not set
-# CONFIG_WILINK_PLATFORM_DATA is not set
-
-# VIRTIO_PCI is not set
-# VIRTIO_MMIO is not set
-# REMOTEPROC is not set
-# RPMSG is not set

config-arm-tegra

@@ -1,121 +0,0 @@
-CONFIG_ARCH_TEGRA=y
-
-CONFIG_ARCH_TEGRA_2x_SOC=y
-# CONFIG_ARCH_TEGRA_3x_SOC is not set
-# CONFIG_ARCH_TEGRA_114_SOC is not set
-# CONFIG_ARM_LPAE is not set
-
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-
-# CONFIG_MACH_HARMONY is not set
-CONFIG_MACH_KAEN=y
-CONFIG_MACH_PAZ00=y
-CONFIG_MACH_SEABOARD=y
-CONFIG_MACH_TEGRA_DT=y
-CONFIG_MACH_TRIMSLICE=y
-CONFIG_MACH_WARIO=y
-CONFIG_MACH_VENTANA=y
-
-CONFIG_TEGRA_DEBUG_UARTD=y
-CONFIG_ARM_CPU_TOPOLOGY=y
-
-CONFIG_TEGRA_PCI=y
-CONFIG_TEGRA_IOMMU_GART=y
-CONFIG_TEGRA_IOMMU_SMMU=y
-
-CONFIG_I2C_TEGRA=m
-
-# This block is temporary until we work out why the MMC modules don't work as modules
-CONFIG_MMC=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_OF=y
-CONFIG_MMC_SPI=y
-
-CONFIG_MMC_SDHCI_TEGRA=y
-
-# CONFIG_RCU_BOOST is not set
-CONFIG_TEGRA_SYSTEM_DMA=y
-CONFIG_TEGRA_EMC_SCALING_ENABLE=y
-CONFIG_TEGRA_AHB=y
-CONFIG_TEGRA20_APB_DMA=y
-CONFIG_SPI_TEGRA20_SFLASH=m
-CONFIG_SPI_TEGRA20_SLINK=m
-CONFIG_ARM_THUMBEE=y
-CONFIG_SWP_EMULATE=y
-# CONFIG_CPU_BPREDICT_DISABLE is not set
-CONFIG_CACHE_L2X0=y
-CONFIG_ARM_ERRATA_430973=y
-# CONFIG_ARM_ERRATA_458693 is not set
-# CONFIG_ARM_ERRATA_460075 is not set
-CONFIG_ARM_ERRATA_742230=y
-# CONFIG_ARM_ERRATA_742231 is not set
-CONFIG_PL310_ERRATA_588369=y
-CONFIG_PL310_ERRATA_769419=y
-CONFIG_ARM_ERRATA_720789=y
-# CONFIG_PL310_ERRATA_727915 is not set
-# CONFIG_ARM_ERRATA_743622 is not set
-# CONFIG_ARM_ERRATA_751472 is not set
-# CONFIG_ARM_ERRATA_753970 is not set
-# CONFIG_ARM_ERRATA_754322 is not set
-# CONFIG_ARM_ERRATA_754327 is not set
-# CONFIG_ARM_ERRATA_764369 is not set
-# CONFIG_THUMB2_KERNEL is not set
-# CONFIG_NEON is not set
-CONFIG_GPIO_GENERIC_PLATFORM=y
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_KEYBOARD_TEGRA is not set
-CONFIG_PINCTRL_TEGRA=y
-CONFIG_PINCTRL_TEGRA20=y
-CONFIG_USB_EHCI_TEGRA=y
-CONFIG_RTC_DRV_TEGRA=y
-
-CONFIG_SND_SOC_TEGRA=m
-CONFIG_SND_SOC_TEGRA_ALC5632=m
-CONFIG_SND_SOC_TEGRA_WM8753=m
-CONFIG_SND_SOC_TEGRA_WM8903=m
-CONFIG_SND_SOC_TEGRA_WM9712=m
-CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
-CONFIG_SND_SOC_TEGRA30_AHUB=m
-CONFIG_SND_SOC_TEGRA30_I2S=m
-
-# AC100 (PAZ00)
-# CONFIG_MFD_NVEC is not set
-CONFIG_MFD_TPS80031=y
-CONFIG_KEYBOARD_NVEC=y
-CONFIG_SERIO_NVEC_PS2=y
-CONFIG_NVEC_POWER=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_NVEC_LEDS=y
-CONFIG_NVEC_PAZ00=y
-
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_RTC_DRV_TPS6586X is not set
-
-CONFIG_PWM_TEGRA=m
-
-CONFIG_DRM_TEGRA=m
-
-CONFIG_CPU_PM=y
-CONFIG_ARM_CPU_SUSPEND=y
-
-CONFIG_CRYPTO_DEV_TEGRA_AES=m
-
-CONFIG_PL310_ERRATA_753970=y
-CONFIG_LEDS_RENESAS_TPU=y
-
-CONFIG_OF=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_TEGRA=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
-
-# CONFIG_DRM_TEGRA_DEBUG is not set
-# CONFIG_ARM_PSCI is not set
-# CONFIG_TI_DAC7512 is not set
-# CONFIG_SPI_TOPCLIFF_PCH is not set
-# CONFIG_SPI_DW_PCI is not set
-# CONFIG_SPI_PXA2XX is not set

config-armv7-generic

@@ -0,0 +1,621 @@
+# arm configs for sharing between armv7 and armv7-lpae
+# Generic ARM config options
+CONFIG_ARM=y
+
+# CONFIG_ARCH_MULTI_V4 is not set
+# CONFIG_ARCH_MULTI_V4T is not set
+# CONFIG_ARCH_MULTI_V6 is not set
+CONFIG_ARCH_MULTI_V7=y
+
+CONFIG_CMDLINE=""
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
+CONFIG_HAVE_ARM_TWD=y
+CONFIG_AEABI=y
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
+CONFIG_KERNEL_MODE_NEON=y
+
+CONFIG_ARM_UNWIND=y
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_THUMBEE=y
+CONFIG_ARM_ASM_UNIFIED=y
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+CONFIG_SWP_EMULATE=y
+CONFIG_CACHE_L2X0=y
+CONFIG_CACHE_PL310=y
+CONFIG_HIGHPTE=y
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_ATAGS=y
+CONFIG_ATAGS_PROC=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y
+
+# CONFIG_MCPM is not set
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_APM_EMULATION is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+# CONFIG_DMA_CACHE_RWFO is not set
+# CONFIG_THUMB2_KERNEL is not set
+# CONFIG_HVC_DCC is not set
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_ARM_VIRT_EXT is not set
+
+# Platforms enabled/disabled globally on ARMv7
+CONFIG_ARCH_HIGHBANK=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_VEXPRESS_CA9X4=y
+CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
+# CONFIG_ARCH_VEXPRESS_SPC is not set
+# CONFIG_ARCH_BCM is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_STI is not set
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_WM8850 is not set
+# CONFIG_ARCH_SHMOBILE_MULTI is not set
+# CONFIG_ARCH_BERLIN is not set
+# CONFIG_ARCH_HI3xxx is not set
+# CONFIG_ARCH_MSM_DT is not set
+
+# errata
+# v5/v6
+# CONFIG_ARM_ERRATA_326103 is not set
+# CONFIG_ARM_ERRATA_411920 is not set
+# Cortex-A8
+CONFIG_ARM_ERRATA_430973=y
+# The following two don't work with MP
+# CONFIG_ARM_ERRATA_458693 is not set
+# CONFIG_ARM_ERRATA_460075 is not set
+# Cortex-A9
+CONFIG_ARM_ERRATA_643719=y
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_ERRATA_742230=y
+CONFIG_ARM_ERRATA_742231=y
+CONFIG_ARM_ERRATA_743622=y
+CONFIG_ARM_ERRATA_751472=y
+CONFIG_ARM_ERRATA_754322=y
+CONFIG_ARM_ERRATA_754327=y
+CONFIG_ARM_ERRATA_764369=y
+CONFIG_ARM_ERRATA_775420=y
+# Disabled due to causing highbank to crash
+# CONFIG_PL310_ERRATA_588369 is not set
+# CONFIG_PL310_ERRATA_727915 is not set
+CONFIG_PL310_ERRATA_753970=y
+CONFIG_PL310_ERRATA_769419=y
+CONFIG_PJ4B_ERRATA_4742=y
+# Cortex-A15
+# CONFIG_ARM_ERRATA_798181 is not set
+# CONFIG_ARM_ERRATA_773022 is not set
+
+# generic that deviates from or should be merged into config-generic
+CONFIG_SMP_ON_UP=y
+CONFIG_HIGHMEM=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+
+CONFIG_RCU_FANOUT=32
+
+CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_GOV_LADDER is not set
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
+
+# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
+
+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+CONFIG_LSM_MMAP_MIN_ADDR=32768
+
+CONFIG_XZ_DEC_ARM=y
+
+CONFIG_LOCAL_TIMERS=y
+CONFIG_UACCESS_WITH_MEMCPY=y
+CONFIG_CC_STACKPROTECTOR=y
+
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+
+# Root as NFS, different from mainline
+CONFIG_ROOT_NFS=y
+
+CONFIG_LBDAF=y
+
+# Device tree
+CONFIG_USE_OF=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_ARM_APPENDED_DTB=y
+
+# General vexpress ARM drivers
+CONFIG_ARM_TIMER_SP804=y
+
+CONFIG_SERIO_AMBAKMI=m
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_MRST_MAX3110=m
+
+CONFIG_RTC_DRV_PL030=y
+CONFIG_RTC_DRV_PL031=y
+
+CONFIG_PL330_DMA=m
+CONFIG_AMBA_PL08X=y
+CONFIG_GPIO_PL061=y
+CONFIG_PL320_MBOX=y
+
+# highbank
+CONFIG_EDAC_HIGHBANK_MC=m
+CONFIG_EDAC_HIGHBANK_L2=m
+CONFIG_SATA_HIGHBANK=m
+CONFIG_ARM_HIGHBANK_CPUFREQ=m
+# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
+
+# Allwinner a1x
+CONFIG_PINCTRL_SUNXI=y
+CONFIG_SUNXI_WATCHDOG=m
+CONFIG_MDIO_SUN4I=m
+CONFIG_NET_VENDOR_ALLWINNER=y
+CONFIG_SUN4I_EMAC=m
+CONFIG_STMMAC_PLATFORM=y
+CONFIG_DWMAC_SUNXI=y
+CONFIG_EEPROM_SUNXI_SID=m
+CONFIG_RTC_DRV_SUNXI=m
+
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_SPI=m
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_MMIO=m
+CONFIG_REGMAP_IRQ=y
+
+# Power management
+CONFIG_PM_OPP=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_GENERIC_CPUFREQ_CPU0=m
+
+# usb
+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
+# CONFIG_USB_EHCI_HCD_ORION is not set
+
+# usb gadget 
+CONFIG_USB_GADGET=m
+CONFIG_USB_GADGET_MUSB_HDRC=m
+CONFIG_USB_GADGET_VBUS_DRAW=100
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+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_PRINTK=y
+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
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+# CONFIG_USB_CONFIGFS_RNDIS is not set
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_STORAGE=y
+# CONFIG_USB_CONFIGFS_F_LB_SS is not set
+# CONFIG_USB_CONFIGFS_F_FS is not set
+
+# CONFIG_MUSB_PIO_ONLY is not set
+# CONFIG_USB_MUSB_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_RENESAS_USBHS is not set
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# CONFIG_USB_ZERO_HNPTEST is not set
+
+# Multifunction Devices
+CONFIG_MFD_TPS65090=y
+CONFIG_MFD_TPS65217=y
+CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
+CONFIG_MFD_TPS65912_SPI=y
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+
+# Pin stuff
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_PINCTRL_SAMSUNG is not set
+# CONFIG_PINCTRL_EXYNOS4 is not set
+# CONFIG_PINCTRL_CAPRI is not set
+# CONFIG_PINCTRL_MSM8X74 is not set
+
+# GPIO
+# CONFIG_GPIO_EM is not set
+CONFIG_GPIO_74X164=m
+CONFIG_GPIO_ADNP=m
+CONFIG_GPIO_MCP23S08=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_TPS65910=y
+CONFIG_GPIO_TPS65912=m
+CONFIG_LEDS_GPIO=m
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_INPUT_GPIO=m
+CONFIG_INPUT_GPIO_BEEPER=m
+CONFIG_INPUT_GPIO_TILT_POLLED=m
+CONFIG_INPUT_MATRIXKMAP=m
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_MATRIX=m
+# CONFIG_GPIO_RCAR is not set
+CONFIG_W1_MASTER_GPIO=m
+
+# SPI
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_PL022=m
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_ALTERA=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_S3C64XX=m
+CONFIG_SPI_SC18IS602=m
+CONFIG_SPI_XCOMM=m
+CONFIG_SPI_XILINX=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_TLE62X0=m
+# CONFIG_SPI_FSL_SPI is not set
+
+CONFIG_NFC_NCI_SPI=y
+
+# i2c
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_MV64XXX=m
+
+# HW crypto and rng
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_AES_ARM=m
+# CONFIG_CRYPTO_AES_ARM_BS is not set
+
+# DMA
+CONFIG_TI_PRIV_EDMA=y
+CONFIG_TI_EDMA=y
+
+# EDAC
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_LEGACY_SYSFS=y
+
+# Watchdog
+CONFIG_MPCORE_WATCHDOG=m
+
+# Thermal / powersaving
+CONFIG_THERMAL=y
+CONFIG_ARM_PSCI=y
+
+# Mailbox
+CONFIG_MAILBOX=y
+
+# MTD
+# CONFIG_MG_DISK is not set
+CONFIG_MTD_DATAFLASH=m
+CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
+CONFIG_MTD_DATAFLASH_OTP=y
+CONFIG_MTD_M25P80=m
+CONFIG_MTD_NAND=m
+CONFIG_MTD_NAND_CAFE=m
+# CONFIG_MTD_NAND_DENALI is not set
+CONFIG_MTD_NAND_DOCG4=m
+CONFIG_MTD_NAND_ECC_SMC=y
+CONFIG_MTD_NAND_FSMC=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_MXC=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_ORION=m
+CONFIG_MTD_NAND_PLATFORM=m
+CONFIG_MTD_NAND_PXA3xx=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_TMIO=m
+CONFIG_MTD_SPINAND_MT29F=m
+CONFIG_MTD_SPINAND_ONDIEECC=y
+CONFIG_MTD_SST25L=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_93XX46=m
+
+# MMC/SD
+CONFIG_MMC_SPI=m
+
+# Designware (used by numerous devices)
+CONFIG_MMC_DW=m
+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_EXYNOS is not set
+# CONFIG_MMC_DW_IDMAC is not set
+# CONFIG_MMC_DW_K3 is not set
+CONFIG_USB_DWC2=m
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_OMAP=m
+CONFIG_USB_DWC3_EXYNOS=m
+CONFIG_USB_DWC3_PCI=m
+# CONFIG_USB_DWC3_DEBUG is not set
+# CONFIG_USB_DWC3_KEYSTONE is not set
+CONFIG_DW_WATCHDOG=m
+CONFIG_PCIE_DW=y
+CONFIG_PCI_EXYNOS=y
+
+# Sound
+CONFIG_SND_SOC=m
+CONFIG_SND_SPI=y
+CONFIG_SND_ARM=y
+CONFIG_SND_ARMAACI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_DESIGNWARE_I2S=m
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_SOC_ALL_CODECS=m
+CONFIG_SND_SOC_CACHE_LZO=y
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+# CONFIG_SND_ATMEL_SOC is not set
+
+# Displays
+CONFIG_BACKLIGHT_TPS65217=m
+
+# RTC
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_DS3234=m
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_TPS65910=m
+CONFIG_RTC_DRV_TPS80031=m
+
+# Regulators
+CONFIG_REGULATOR=y
+CONFIG_RFKILL_REGULATOR=m
+CONFIG_REGULATOR_DUMMY=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_GPIO=m
+# CONFIG_REGULATOR_ACT8865 is not set
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_DA9210=m
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX8973=m
+CONFIG_REGULATOR_PFUZE100=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65090=m
+CONFIG_REGULATOR_TPS65217=m
+CONFIG_REGULATOR_TPS6524X=m
+CONFIG_REGULATOR_TPS6586X=m
+CONFIG_REGULATOR_TPS65910=m
+CONFIG_REGULATOR_TPS65912=m
+CONFIG_REGULATOR_TPS80031=m
+
+CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_CHARGER_TPS65090=m
+CONFIG_PDA_POWER=m
+CONFIG_GENERIC_ADC_BATTERY=m
+
+# Sensors
+CONFIG_TMP006=m
+CONFIG_BMP085=y
+CONFIG_BMP085_I2C=m
+CONFIG_BMP085_SPI=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_HTU21=m
+CONFIG_SENSORS_LIS3_SPI=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_MAX1111=m
+
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI922X=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_S6E63M0=m
+CONFIG_LCD_LD9040=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+
+# Input
+CONFIG_INPUT_GP2A=m
+CONFIG_INPUT_ARIZONA_HAPTICS=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_TSC2005=m
+
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_BMP085_SPI=m
+
+CONFIG_SRAM=y
+
+# Ethernet
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_ENC28J60=m
+CONFIG_LIBERTAS_SPI=m
+CONFIG_P54_SPI=m
+CONFIG_P54_SPI_DEFAULT_EEPROM=n
+CONFIG_MICREL_KS8995MA=m
+CONFIG_IEEE802154_AT86RF230=m
+CONFIG_IEEE802154_MRF24J40=m
+
+CONFIG_ARM_KPROBES_TEST=m
+
+# jffs2
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS2_RUBIN=y
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_ZLIB=y
+
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+
+# Sensors
+CONFIG_SENSORS_HTU21=m
+
+# Chromebook
+CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_I2C=m
+CONFIG_MFD_CROS_EC_SPI=m
+CONFIG_KEYBOARD_CROS_EC=m
+
+# Should be in generic
+CONFIG_BPF_JIT=y
+
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_DRM_EXYNOS is not set
+# CONFIG_DRM_TILCDC is not set
+# CONFIG_DRM_IMX is not set
+# CONFIG_AHCI_IMX is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_DM9000 is not set
+# CONFIG_HW_RANDOM_ATMEL is not set
+# CONFIG_HW_RANDOM_EXYNOS is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_EZX_PCAP is not set
+
+# Needs work/investigation
+# CONFIG_ARM_CHARLCD is not set
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_M25PXX_USE_FAST_READ is not set
+# CONFIG_SERIAL_8250_EM is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_FSL_DSPI is not set
+# CONFIG_FB_XILINX is not set
+# CONFIG_USB_S3C_HSOTG is not set
+
+# these modules all fail with missing __bad_udelay
+# http://www.spinics.net/lists/arm/msg15615.html provides some background
+# CONFIG_SUNGEM is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_DRM_RADEON is not set
+# CONFIG_ATM_HE is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SFC is not set
+
+# these all currently fail due to missing symbols __bad_udelay or
+# error: implicit declaration of function ‘iowrite32be’
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_DRM_NOUVEAU is not set
+# CONFIG_MLX4_EN is not set
+
+# Debug options. We need to deal with them at some point like x86
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_LL is not set
+# CONFIG_DEBUG_PINCTRL is not set
+# CONFIG_DMADEVICES_VDEBUG is not set
+# CONFIG_DMADEVICES_DEBUG is not set

config-armv7-lpae

@@ -0,0 +1,135 @@
+# ARM A15 lpae unified arch kernel
+CONFIG_ARCH_KEYSTONE=y
+CONFIG_ARCH_VIRT=y
+
+# CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_OMAP3 is not set
+# 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_ARM_LPAE=y
+CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
+
+# Cortex-A15
+CONFIG_ARM_ERRATA_798181=y
+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
+CONFIG_XEN_FBDEV_FRONTEND=y
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_GNTDEV=y
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+CONFIG_XEN_WDT=m
+# CONFIG_XEN_BALLOON is not set
+
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+# CONFIG_SAMSUNG_PM_DEBUG is not set
+# CONFIG_SAMSUNG_PM_CHECK is not set
+CONFIG_SOC_EXYNOS5250=y
+CONFIG_SOC_EXYNOS5420=y
+CONFIG_SOC_EXYNOS5440=y
+# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
+# CONFIG_ARM_EXYNOS5440_CPUFREQ is not set
+# CONFIG_ARM_EXYNOS_CPUFREQ is not set
+CONFIG_EXYNOS_THERMAL=m
+CONFIG_PCI_EXYNOS=y
+
+CONFIG_TCG_TIS_I2C_INFINEON=m
+
+# CONFIG_EXYNOS_ATAGS is not set
+CONFIG_PINCTRL_EXYNOS=y
+CONFIG_PINCTRL_EXYNOS5440=y
+CONFIG_EXYNOS_IOMMU=y
+CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
+CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
+CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
+CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+CONFIG_EXYNOS_VIDEO=y
+CONFIG_EXYNOS_MIPI_DSI=y
+CONFIG_EXYNOS_DP=y
+# CONFIG_EXYNOS_LCD_S6E8AX0 is not set
+CONFIG_DRM_EXYNOS=m
+CONFIG_DRM_EXYNOS_IOMMU=y
+CONFIG_DRM_EXYNOS_DMABUF=y
+CONFIG_DRM_EXYNOS_FIMD=y
+CONFIG_DRM_EXYNOS_HDMI=y
+CONFIG_DRM_EXYNOS_VIDI=y
+CONFIG_DRM_EXYNOS_G2D=y
+CONFIG_DRM_EXYNOS_IPP=y
+CONFIG_DRM_EXYNOS_FIMC=y
+CONFIG_DRM_EXYNOS_ROTATOR=y
+CONFIG_DRM_EXYNOS_GSC=y
+# CONFIG_FB_S3C is not set
+CONFIG_SND_SOC_SAMSUNG=m
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_S5P=m
+CONFIG_USB_OHCI_EXYNOS=y
+CONFIG_PWM_SAMSUNG=m
+CONFIG_SAMSUNG_GPIO_EXTRA=8
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
+CONFIG_USB_EHCI_S5P=y
+CONFIG_SAMSUNG_USBPHY=m
+CONFIG_SAMSUNG_USB2PHY=m
+CONFIG_SAMSUNG_USB3PHY=m
+CONFIG_MMC_DW_EXYNOS=m
+CONFIG_RTC_DRV_S3C=m
+
+# TI Keystone
+CONFIG_KEYSTONE_USB_PHY=m
+CONFIG_USB_DWC3_KEYSTONE=m
+CONFIG_GPIO_DAVINCI=y
+CONFIG_I2C_DAVINCI=m
+# CONFIG_DAVINCI_WATCHDOG is not set
+# CONFIG_SPI_DAVINCI is not set
+# CONFIG_SND_DAVINCI_SOC is not set
+# CONFIG_TI_SOC_THERMAL is not set
+
+# Arndale/Origen
+CONFIG_MFD_MAX8997=y
+CONFIG_MFD_SEC_CORE=y
+CONFIG_REGULATOR_MAX8997=m
+CONFIG_REGULATOR_S5M8767=m
+CONFIG_COMMON_CLK_MAX77686=m
+
+CONFIG_S3C_LOWLEVEL_UART_PORT=1
+# CONFIG_EXYNOS4_SDHCI_CH0_8BIT is not set
+# CONFIG_EXYNOS4_SDHCI_CH2_8BIT is not set
+
+# CONFIG_S3C_BOOT_ERROR_RESET is not set
+# CONFIG_S3C_BOOT_UART_FORCE_FIFO is not set
+# CONFIG_I2C_S3C2410 is not set
+# CONFIG_S3C2410_WATCHDOG is not set
+# CONFIG_MMC_SDHCI_S3C is not set
+# CONFIG_TEGRA_HOST1X is not set

config-debug

@@ -5,6 +5,7 @@ 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_PROVE_LOCKING=y
@@ -25,8 +26,6 @@ CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 CONFIG_FAIL_IO_TIMEOUT=y
 CONFIG_FAIL_MMC_REQUEST=y
 
-CONFIG_SLUB_DEBUG_ON=y
-
 CONFIG_LOCK_STAT=y
 
 CONFIG_DEBUG_STACK_USAGE=y
@@ -64,6 +63,8 @@ CONFIG_DEBUG_CREDENTIALS=y
 
 CONFIG_EXT4_DEBUG=y
 
+CONFIG_XFS_WARN=y
+
 CONFIG_DEBUG_PERF_USE_VMALLOC=y
 
 # off in both production debug and nodebug builds,
@@ -82,6 +83,8 @@ CONFIG_ATH_DEBUG=y
 CONFIG_CARL9170_DEBUGFS=y
 CONFIG_IWLWIFI_DEVICE_TRACING=y
 
+CONFIG_RTLWIFI_DEBUG=y
+
 CONFIG_DEBUG_OBJECTS_WORK=y
 
 CONFIG_DMADEVICES_DEBUG=y
@@ -99,7 +102,9 @@ CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 
 CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
+CONFIG_PERCPU_TEST=m
 CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_STRING_HELPERS=m
 
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
@@ -115,3 +120,7 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 CONFIG_MAC80211_MESSAGE_TRACING=y
 
 CONFIG_EDAC_DEBUG=y
+
+CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
+CONFIG_LATENCYTOP=y
+CONFIG_SCHEDSTATS=y

config-nodebug

@@ -5,6 +5,7 @@ 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_PROVE_LOCKING is not set
@@ -25,8 +26,6 @@ CONFIG_CPUMASK_OFFSTACK=y
 # CONFIG_FAIL_IO_TIMEOUT is not set
 # CONFIG_FAIL_MMC_REQUEST is not set
 
-# CONFIG_SLUB_DEBUG_ON is not set
-
 # CONFIG_LOCK_STAT is not set
 
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -68,6 +67,8 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 
 # CONFIG_EXT4_DEBUG is not set
 
+# CONFIG_XFS_WARN is not set
+
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 
 # CONFIG_JBD2_DEBUG is not set
@@ -82,6 +83,8 @@ CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 # CONFIG_CARL9170_DEBUGFS is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
 
+# CONFIG_RTLWIFI_DEBUG is not set
+
 # CONFIG_DEBUG_OBJECTS_WORK is not set
 
 # CONFIG_DMADEVICES_DEBUG is not set
@@ -99,7 +102,9 @@ CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 
 # CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set
+# CONFIG_PERCPU_TEST is not set
 # CONFIG_TEST_LIST_SORT is not set
+# CONFIG_TEST_STRING_HELPERS is not set
 
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
@@ -117,3 +122,9 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 # CONFIG_EDAC_DEBUG is not set
 
 # CONFIG_SPI_DEBUG is not set
+
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
+
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_LATENCYTOP is not set
+

config-powerpc-generic

@@ -1,5 +1,4 @@
 # Most PowerPC kernels we build are SMP
-CONFIG_SMP=y
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_PPC=y
 CONFIG_WATCHDOG_RTAS=m
@@ -11,14 +10,6 @@ CONFIG_TAU=y
 # CONFIG_TAU_INT is not set
 CONFIG_TAU_AVERAGE=y
 
-CONFIG_SECCOMP=y
-
-CONFIG_PM=y
-
-CONFIG_PM_STD_PARTITION=""
-
-CONFIG_SUSPEND=y
-CONFIG_HIBERNATION=y
 # CONFIG_RTC is not set
 # CONFIG_GEN_RTC is not set
 # CONFIG_GEN_RTC_X is not set
@@ -39,6 +30,7 @@ CONFIG_FB_OF=y
 # CONFIG_FB_CONTROL is not set
 CONFIG_FB_IBM_GXT4500=y
 CONFIG_FB_MATROX=y
+CONFIG_FB_MATROX_G=y
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y
@@ -99,9 +91,6 @@ CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_GPIO=m
 
-# FIXME: Should depend on IA64/x86
-# CONFIG_SGI_IOC4 is not set
-
 CONFIG_PPC_EFIKA=y
 CONFIG_PPC_MEDIA5200=y
 
@@ -332,6 +321,7 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 
 # CONFIG_PPC_MPC512x is not set
 # CONFIG_RTC_DRV_MPC5121 is not set
+# CONFIG_RTC_DRV_HYM8563 is not set
 
 # CONFIG_MPC512X_DMA is not set
 
@@ -342,12 +332,9 @@ CONFIG_I2C_MPC=m
 # CONFIG_IMA is not set
 # CONFIG_TCG_TPM is not set
 
-CONFIG_RFKILL_GPIO=m
-
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
 # CONFIG_CRYPTO_SHA1_PPC is not set
 
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_MCP23S08 is not set
 
 # CONFIG_CAN_FLEXCAN is not set
@@ -362,7 +349,6 @@ CONFIG_RFKILL_GPIO=m
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_INPUT_GP2A is not set
 # CONFIG_INPUT_GPIO_TILT_POLLED is not set
-CONFIG_STRICT_DEVMEM=y
 
 CONFIG_RCU_FANOUT_LEAF=16
 
@@ -370,11 +356,12 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_MPIC_MSGR is not set
 # CONFIG_FA_DUMP is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 
 # CONFIG_FAIL_IOMMU is not set
+# CONFIG_SPAPR_TCE_IOMMU is not set
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
 
-# CONFIG_PPC_DENORMALISATION is not set
+CONFIG_PPC_DENORMALISATION=y
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_GPIO_ADNP is not set
 # CONFIG_MFD_SYSCON is not set
@@ -384,6 +371,9 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_OF_DISPLAY_TIMING is not set
 # CONFIG_OF_VIDEOMODE is not set
 
+# CONFIG_POWERNV_MSI is not set
+# CONFIG_CPU_LITTLE_ENDIAN is not set
+
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_FB_SSD1307=m
 CONFIG_INPUT_PWM_BEEPER=m
@@ -391,3 +381,5 @@ CONFIG_BACKLIGHT_PWM=m
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=n
 
 CONFIG_XZ_DEC_POWERPC=y
+
+CONFIG_CRASH=m

config-powerpc32-generic

@@ -95,8 +95,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_DEBUG_STACKOVERFLOW=y
 
 # CONFIG_EMBEDDED6xx is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 
 # CONFIG_BLK_DEV_PLATFORM is not set
 # CONFIG_BLK_DEV_4DRIVES is not set
@@ -175,10 +173,6 @@ CONFIG_CRYPTO_DEV_TALITOS=m
 
 CONFIG_RCU_FANOUT=32
 
-CONFIG_PERF_COUNTERS=y
-CONFIG_PERF_EVENTS=y
-CONFIG_EVENT_PROFILE=y
-
 CONFIG_KVM_BOOK3S_32=m
 
 # CONFIG_SCSI_QLA_ISCSI is not set

config-powerpc32-smp

@@ -1,4 +1,3 @@
-CONFIG_SMP=y
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_NR_CPUS=4
 # CONFIG_BATTERY_PMU is not set

config-powerpc64

@@ -12,7 +12,10 @@ CONFIG_PPC_MAPLE=y
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_PMAC=y
 CONFIG_PPC_POWERNV=y
+CONFIG_POWERNV_MSI=y
 CONFIG_PPC_POWERNV_RTAS=y
+CONFIG_HW_RANDOM_POWERNV=m
+CONFIG_SCOM_DEBUGFS=y
 # CONFIG_PPC_PASEMI is not set
 # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
 # CONFIG_PPC_PS3 is not set
@@ -86,6 +89,8 @@ CONFIG_NR_CPUS=1024
 CONFIG_RTAS_PROC=y
 CONFIG_IOMMU_VMERGE=y
 CONFIG_NUMA=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_PPC_64K_PAGES=y
 CONFIG_PPC_SUBPAGE_PROT=y
 CONFIG_SCHED_SMT=y
@@ -96,6 +101,10 @@ CONFIG_HZ_100=y
 
 CONFIG_MEMORY_HOTREMOVE=y
 
+CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
+
+CONFIG_CGROUP_HUGETLB=y
+
 # CONFIG_MV643XX_ETH is not set
 CONFIG_IRQSTACKS=y
 CONFIG_DEBUG_STACKOVERFLOW=y
@@ -110,11 +119,7 @@ CONFIG_XMON_DISASSEMBLY=y
 
 CONFIG_SCSI_IBMVSCSIS=m
 
-CONFIG_SECCOMP=y
-
 # CONFIG_TUNE_CELL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_BLK_DEV_PLATFORM is not set
 
 # CONFIG_VIRQ_DEBUG is not set
@@ -137,13 +142,13 @@ CONFIG_RELOCATABLE=y
 
 CONFIG_RCU_FANOUT=64
 
-CONFIG_PERF_COUNTERS=y
-CONFIG_PERF_EVENTS=y
-CONFIG_EVENT_PROFILE=y
-
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
 CONFIG_KVM_BOOK3S_64=m
-CONFIG_KVM_BOOK3S_64_HV=y
+CONFIG_KVM_BOOK3S_64_HV=m
+CONFIG_KVM_BOOK3S_64_PR=m
 # CONFIG_KVM_EXIT_TIMING is not set
+CONFIG_KVM_XICS=y
 
 #-- bz#607175
 #-- active memory sharing
@@ -158,7 +163,8 @@ CONFIG_PSERIES_ENERGY=m
 
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_PSERIES_IDLE=y
+CONFIG_PSERIES_CPUIDLE=y
+CONFIG_POWERNV_CPUIDLE=y
 
 CONFIG_PPC_ICSWX=y
 CONFIG_IO_EVENT_IRQ=y
@@ -176,6 +182,7 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_BPF_JIT=y
 # CONFIG_PPC_ICSWX_PID is not set
 # CONFIG_PPC_ICSWX_USE_SIGILL is not set
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PPC_TRANSACTIONAL_MEM is not set
+# CONFIG_SND_HDA_INTEL is not set
+CONFIG_BLK_DEV_RSXX=m

config-powerpc64p7

@@ -8,7 +8,10 @@ CONFIG_POWER7_CPU=y
 CONFIG_PPC_PSERIES=y
 # CONFIG_PPC_PMAC is not set
 CONFIG_PPC_POWERNV=y
+CONFIG_POWERNV_MSI=y
 CONFIG_PPC_POWERNV_RTAS=y
+CONFIG_HW_RANDOM_POWERNV=m
+CONFIG_SCOM_DEBUGFS=y
 # CONFIG_PPC_PASEMI is not set
 # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set
 # CONFIG_PPC_PS3 is not set
@@ -77,6 +80,8 @@ CONFIG_NR_CPUS=1024
 CONFIG_RTAS_PROC=y
 CONFIG_IOMMU_VMERGE=y
 CONFIG_NUMA=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_PPC_64K_PAGES=y
 CONFIG_PPC_SUBPAGE_PROT=y
 CONFIG_SCHED_SMT=y
@@ -87,6 +92,10 @@ CONFIG_HZ_100=y
 
 CONFIG_MEMORY_HOTREMOVE=y
 
+CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
+
+CONFIG_CGROUP_HUGETLB=y
+
 # CONFIG_MV643XX_ETH is not set
 CONFIG_IRQSTACKS=y
 CONFIG_DEBUG_STACKOVERFLOW=y
@@ -101,11 +110,7 @@ CONFIG_XMON_DISASSEMBLY=y
 
 CONFIG_SCSI_IBMVSCSIS=m
 
-CONFIG_SECCOMP=y
-
 # CONFIG_TUNE_CELL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_BLK_DEV_PLATFORM is not set
 
 # CONFIG_VIRQ_DEBUG is not set
@@ -128,13 +133,13 @@ CONFIG_RELOCATABLE=y
 
 CONFIG_RCU_FANOUT=64
 
-CONFIG_PERF_COUNTERS=y
-CONFIG_PERF_EVENTS=y
-CONFIG_EVENT_PROFILE=y
-
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
 CONFIG_KVM_BOOK3S_64=m
-CONFIG_KVM_BOOK3S_64_HV=y
+CONFIG_KVM_BOOK3S_64_HV=m
+CONFIG_KVM_BOOK3S_64_PR=m
 # CONFIG_KVM_EXIT_TIMING is not set
+CONFIG_KVM_XICS=y
 
 #-- bz#607175
 #-- active memory sharing
@@ -149,7 +154,8 @@ CONFIG_PSERIES_ENERGY=m
 
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_PSERIES_IDLE=y
+CONFIG_PSERIES_CPUIDLE=y
+CONFIG_POWERNV_CPUIDLE=y
 
 CONFIG_PPC_ICSWX=y
 CONFIG_IO_EVENT_IRQ=y
@@ -167,6 +173,6 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_BPF_JIT=y
 # CONFIG_PPC_ICSWX_PID is not set
 # CONFIG_PPC_ICSWX_USE_SIGILL is not set
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 # CONFIG_PCIEPORTBUS is not set
-
+# CONFIG_SND_HDA_INTEL is not set
+CONFIG_BLK_DEV_RSXX=m

config-s390x

@@ -13,13 +13,9 @@ CONFIG_HZ_100=y
 # See bug 496605
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 
-CONFIG_MMU=y
-
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_NO_IDLE_HZ=y
 
-CONFIG_SMP=y
-
 #
 # I/O subsystem configuration
 #
@@ -38,6 +34,7 @@ CONFIG_CMM=m
 CONFIG_CMM_PROC=y
 # CONFIG_NETIUCV is not set
 CONFIG_SMSGIUCV=m
+CONFIG_CRASH_DUMP=y
 
 #
 # SCSI low-level drivers
@@ -189,8 +186,6 @@ CONFIG_S390_VMUR=m
 
 # CONFIG_THERMAL is not set
 
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_CTCM=m
 CONFIG_QETH_L2=m
 CONFIG_QETH_L3=m
@@ -199,6 +194,7 @@ CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 # CONFIG_KVM_S390_UCONTROL is not set
 CONFIG_S390_GUEST=y
+CONFIG_VIRTIO_CONSOLE=y
 
 
 CONFIG_MEMORY_HOTPLUG=y
@@ -213,15 +209,7 @@ CONFIG_HVC_IUCV=y
 CONFIG_RCU_FANOUT=64
 CONFIG_RCU_FANOUT_LEAF=16
 
-CONFIG_SECCOMP=y
-
-CONFIG_PM=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION="/dev/jokes"
-
-CONFIG_PERF_COUNTERS=y
-CONFIG_PERF_EVENTS=y
-CONFIG_EVENT_PROFILE=y
+# CONFIG_SUSPEND is not set
 
 CONFIG_SMSGIUCV_EVENT=m
 
@@ -234,13 +222,9 @@ CONFIG_ZFCP_DIF=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_BOOK=y
 
-CONFIG_STRICT_DEVMEM=y
-
 # CONFIG_WARN_DYNAMIC_STACK is not set
 
 CONFIG_CRYPTO_GHASH_S390=m
-CONFIG_NET_CORE=y
-CONFIG_ETHERNET=y
 
 CONFIG_BPF_JIT=y
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
@@ -250,16 +234,51 @@ 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_NR_FUNCTIONS=64
-CONFIG_HOTPLUG_PCI=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-# CONFIG_HOTPLUG_PCI_SHPC is not set
-CONFIG_HOTPLUG_PCI_S390=m
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
-# CONFIG_SGI_IOC4 is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_MCP23S08 is not set
-
 # CONFIG_PCI is not set
+
+# CONFIG_NEW_LEDS is not set
+# CONFIG_HID is not set
+
+# CONFIG_INPUT is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+# CONFIG_SERIO is not set
+
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_STAGING is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_MEDIA_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_DRM is not set
+# CONFIG_SOUND is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_I2C is not set
+# CONFIG_I2C_SMBUS is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_HELPER_AUTO is not set
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_PTP_1588_CLOCK is not set
+# CONFIG_PPS is not set
+
+# CONFIG_PHYLIB is not set
+# CONFIG_ATM_DRIVERS is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_INTEL is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_PTP_1588_CLOCK_PCH is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_SH_ETH is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_IEEE802154_DRIVERS is not set
+
+# CONFIG_FMC is not set
+
+CONFIG_CRASH=m

config-x86-32-generic

@@ -1,6 +1,6 @@
 # CONFIG_64BIT is not set
 
-CONFIG_X86_32_NON_STANDARD=y
+# CONFIG_X86_32_NON_STANDARD is not set
 
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_GOLDFISH is not set
@@ -73,8 +73,6 @@ CONFIG_APM_CPU_IDLE=y
 # CONFIG_APM_DISPLAY_BLANK is not set
 # CONFIG_APM_ALLOW_INTS is not set
 
-CONFIG_ACPI_BLACKLIST_YEAR=1999
-
 
 # CONFIG_X86_POWERNOW_K6 is not set
 CONFIG_X86_POWERNOW_K7=y
@@ -122,8 +120,6 @@ CONFIG_SND_ES18XX=m
 
 CONFIG_HW_RANDOM_GEODE=m
 
-# CONFIG_SGI_IOC4 is not set
-
 CONFIG_TC1100_WMI=m
 
 CONFIG_IB700_WDT=m
@@ -228,5 +224,13 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_GPIO_ADNP is not set
 # CONFIG_BACKLIGHT_OT200 is not set
 # CONFIG_RTC_DRV_SNVS is not set
+# CONFIG_RTC_DRV_HYM8563 is not set
 # CONFIG_OF_DISPLAY_TIMING is not set
 # CONFIG_OF_VIDEOMODE is not set
+
+# CONFIG_MLX5_INFINIBAND is not set
+# CONFIG_PINCTRL_SINGLE is not set
+# CONFIG_PINCTRL_CAPRI is not set
+# CONFIG_PINCTRL_MSM8X74 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_QCOM is not set

config-x86-generic

@@ -2,8 +2,6 @@ CONFIG_UID16=y
 
 CONFIG_X86_EXTENDED_PLATFORM=y
 
-CONFIG_SMP=y
-
 CONFIG_X86_GENERIC=y
 
 CONFIG_HPET=y
@@ -29,7 +27,7 @@ CONFIG_PNP=y
 
 CONFIG_MTRR=y
 CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_X86_PM_TIMER=y
@@ -37,8 +35,15 @@ CONFIG_X86_PM_TIMER=y
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_VARS=y
+CONFIG_EFIVAR_FS=y
+CONFIG_EFI_VARS_PSTORE=y
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 CONFIG_EFI_PCDP=y
 CONFIG_FB_EFI=y
+CONFIG_EARLY_PRINTK_EFI=y
+CONFIG_EFI_RUNTIME_MAP=y
+# needs FB_SIMPLE to work correctly
+# CONFIG_X86_SYSFB is not set
 
 # FIXME: 32bit only?
 # CONFIG_FB_N411 is not set
@@ -49,8 +54,6 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_SCSI_ADVANSYS=m
 
-CONFIG_SECCOMP=y
-
 CONFIG_CAPI_EICON=y
 
 #
@@ -94,13 +97,15 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_CUSTOM_METHOD=m
 CONFIG_ACPI_BGRT=y
+# CONFIG_ACPI_EXTLOG is not set
 
 CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_ACPI_CPUFREQ=y
-CONFIG_X86_PCC_CPUFREQ=y
+CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ_CPB=y
-CONFIG_X86_POWERNOW_K8=y
-CONFIG_X86_P4_CLOCKMOD=y
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+CONFIG_X86_P4_CLOCKMOD=m
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 
 #
@@ -110,13 +115,12 @@ CONFIG_NVRAM=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 
 CONFIG_GENERIC_ISA_DMA=y
 
-CONFIG_SUSPEND=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_IOAPIC=y
@@ -127,8 +131,6 @@ CONFIG_HOTPLUG_PCI_COMPAQ=m
 CONFIG_HOTPLUG_PCI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 
-CONFIG_PM=y
-
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
@@ -151,8 +153,11 @@ CONFIG_I2C_PIIX4=m
 CONFIG_I2C_SIS96X=m
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
 
-CONFIG_DELL_RBU=m
+#rhbz 997149
+# CONFIG_DELL_RBU is not set
 CONFIG_DCDBAS=m
 
 CONFIG_EDAC=y
@@ -197,7 +202,9 @@ CONFIG_AMILO_RFKILL=m
 CONFIG_ASUS_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
+CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
 CONFIG_EEEPC_LAPTOP=m
 CONFIG_FUJITSU_TABLET=m
 CONFIG_FUJITSU_LAPTOP=m
@@ -209,12 +216,12 @@ CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 CONFIG_TOPSTAR_LAPTOP=m
 
-
 CONFIG_ACPI_WMI=m
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
 CONFIG_ASUS_WMI=m
 CONFIG_ASUS_NB_WMI=m
+CONFIG_HP_WIRELESS=m
 CONFIG_HP_WMI=m
 # CONFIG_INTEL_SCU_IPC is not set
 CONFIG_DELL_WMI=m
@@ -224,6 +231,9 @@ CONFIG_INTEL_OAKTRAIL=m
 CONFIG_SAMSUNG_Q10=m
 CONFIG_APPLE_GMUX=m
 CONFIG_XO15_EBOOK=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=y
+CONFIG_PVPANIC=m
 
 # CONFIG_TOUCHSCREEN_INTEL_MID is not set
 
@@ -240,10 +250,11 @@ CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
 CONFIG_LGUEST=m
 CONFIG_LGUEST_GUEST=y
 
-CONFIG_PARAVIRT_GUEST=y
+CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 # CONFIG_PARAVIRT_DEBUG is not set
@@ -254,6 +265,7 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
 CONFIG_KVM_MMU_AUDIT=y # default $x would be nice...
+# CONFIG_KVM_DEBUG_FS is not set
 
 CONFIG_XEN=y
 # CONFIG_XEN_DEBUG is not set
@@ -284,8 +296,6 @@ CONFIG_XEN_ACPI_PROCESSOR=m
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
 
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
@@ -320,8 +330,6 @@ CONFIG_HP_WATCHDOG=m
 CONFIG_NV_TCO=m
 CONFIG_SP5100_TCO=m
 
-CONFIG_STRICT_DEVMEM=y
-
 # CONFIG_NO_BOOTMEM is not set
 
 # CONFIG_MEMTEST is not set
@@ -344,13 +352,10 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 
 # CONFIG_IOMMU_STRESS is not set
 
-CONFIG_PERF_COUNTERS=y
-CONFIG_PERF_EVENTS=y
-
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
-# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_MCE_INJECT=m
 
 CONFIG_SFI=y
 
@@ -369,6 +374,9 @@ CONFIG_LPC_ICH=m
 
 CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_LYNXPOINT is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_F7188X is not set
+
 
 CONFIG_PCI_CNB20LE_QUIRK=y
 
@@ -383,6 +391,7 @@ CONFIG_F71808E_WDT=m
 CONFIG_HPWDT_NMI_DECODING=y
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_INTEL_MID_DMAC is not set
+# CONFIG_GPIO_INTEL_MID is not set
 CONFIG_PCH_DMA=m
 CONFIG_INTEL_IPS=m
 # CONFIG_IBM_RTL is not set
@@ -405,11 +414,9 @@ CONFIG_HP_ACCEL=m
 
 # CONFIG_RAPIDIO is not set
 
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_MCP23S08 is not set
-
 CONFIG_SCHED_SMT=y
 CONFIG_CC_STACKPROTECTOR=y
+CONFIG_CC_STACKPROTECTOR_STRONG=y
 CONFIG_RELOCATABLE=y
 
 CONFIG_HYPERV=m
@@ -418,6 +425,8 @@ CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HYPERV_NET=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_HYPERV_BALLOON=m
+CONFIG_FB_HYPERV=m
+CONFIG_HYPERV_KEYBOARD=m
 
 # Depends on HOTPLUG_PCI_PCIE
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -429,14 +438,22 @@ CONFIG_DRM_GMA3600=y
 CONFIG_RCU_FANOUT_LEAF=16
 
 CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=y
+CONFIG_INTEL_MEI_ME=m
+
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_MICROREAD_MEI=m
 
 # Maybe enable in debug kernels?
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 
-# CONFIG_X86_INTEL_LPSS is not set
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_BAYTRAIL=y
 
 # CONFIG_INTEL_POWERCLAMP is not set
+CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_ACPI_INT3403_THERMAL=m
 
 CONFIG_VMWARE_VMCI=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
@@ -444,16 +461,19 @@ CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_XZ_DEC_X86=y
 
 CONFIG_MPILIB=y
-CONFIG_PKCS7_MESSAGE_PARSER=y
-CONFIG_PE_FILE_PARSER=y
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_MODULE_SIG=y
 CONFIG_MODULE_SIG_ALL=y
 # CONFIG_MODULE_SIG_SHA1 is not set
 CONFIG_MODULE_SIG_SHA256=y
 # CONFIG_MODULE_SIG_FORCE is not set
-CONFIG_SYSTEM_BLACKLIST_KEYRING=y
+CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE=y
+CONFIG_EFI_SIGNATURE_LIST_PARSER=y
 
 CONFIG_MODULE_SIG_UEFI=y
 
 CONFIG_VMXNET3=m
 CONFIG_VFIO_PCI_VGA=y
+
+# CONFIG_NTB is not set

config-x86_64-generic

@@ -6,7 +6,8 @@ CONFIG_64BIT=y
 CONFIG_GENERIC_CPU=y
 
 # CONFIG_X86_VSMP is not set
-# CONFIG_X86_UV is not set
+CONFIG_X86_UV=y
+CONFIG_UV_MMTIMER=m
 CONFIG_NUMA=y
 CONFIG_K8_NUMA=y
 CONFIG_AMD_NUMA=y
@@ -16,8 +17,13 @@ CONFIG_X86_64_ACPI_NUMA=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_NUMA_BALANCING=y
 
-CONFIG_NR_CPUS=128
+# https://lists.fedoraproject.org/pipermail/kernel/2013-November/004601.html
+CONFIG_NR_CPUS=1024
 CONFIG_PHYSICAL_START=0x1000000
+CONFIG_PHYSICAL_ALIGN=0x1000000
+
+# https://lists.fedoraproject.org/pipermail/kernel/2013-December/004753.html
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
@@ -28,16 +34,22 @@ CONFIG_AMD_IOMMU_V2=m
 # CONFIG_IOMMU_DEBUG is not set
 CONFIG_SWIOTLB=y
 # CONFIG_CALGARY_IOMMU is not set
+# CONFIG_GART_IOMMU is not set
 
 CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_MEM_SOFT_DIRTY=y
 
 CONFIG_KEXEC_JUMP=y
 
-CONFIG_ACPI_BLACKLIST_YEAR=0
-CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_HOTPLUG_MEMORY=y
 
 # CONFIG_INTEL_SCU_IPC is not set
 
+CONFIG_INTEL_MIC_HOST=m
+CONFIG_INTEL_MIC_CARD=m
+
 # SHPC has half-arsed PCI probing, which makes it load on too many systems
 CONFIG_HOTPLUG_PCI_SHPC=m
 
@@ -47,14 +59,21 @@ CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_BLOWFISH_AVX2_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
 CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
 CONFIG_CRYPTO_CAST5_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
 CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_TWOFISH_AVX2_X86_64=m
 
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
@@ -75,7 +94,8 @@ CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 # CONFIG_MOVABLE_NODE is not set
-# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_MEMORY_HOTPLUG=y
+# CONFIG_ARCH_MEMORY_PROBE is not set
 # CONFIG_MEMORY_HOTREMOVE is not set
 
 # CONFIG_BLK_DEV_CMD640 is not set
@@ -98,6 +118,7 @@ CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_SYS_HYPERVISOR=y
 # CONFIG_XEN_MCE_LOG is not set
 # CONFIG_XEN_STUB is not set
+# CONFIG_XEN_PVH is not set
 
 CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
 
@@ -136,3 +157,19 @@ CONFIG_CHECKPOINT_RESTORE=y
 
 CONFIG_NTB=m
 CONFIG_NTB_NETDEV=m
+
+# 10GigE
+#
+CONFIG_IP1000=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+# CONFIG_MLX4_DEBUG is not set
+CONFIG_SFC=m
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_PTP=y
+CONFIG_SFC_MTD=y
+# Override MTD stuff because SFC_MTD needs it
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLOCK=m
+

crash-driver.patch

@@ -1,24 +1,58 @@
-From f72d640713d01b3b704c6e84ab49b62f19fc9c22 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle@phobos.i.jkkm.org>
-Date: Tue, 30 Mar 2010 00:16:25 -0400
-Subject: [PATCH] dev-crash-driver.patch
+From 1786bc697d34af944e29437ce44337b0eb8b6799 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle@dreadnought.bos.jkkm.org>
+Date: Tue, 26 Nov 2013 12:42:46 -0500
+Subject: [PATCH] crash-driver
 
 ---
- arch/ia64/include/asm/crash.h |   90 +++++++++++++++++++++++++++++
- arch/ia64/kernel/ia64_ksyms.c |    3 +
- arch/x86/include/asm/crash.h  |   75 ++++++++++++++++++++++++
- arch/x86/mm/ioremap.c         |    2 +
- drivers/char/Kconfig          |    3 +
- drivers/char/Makefile         |    2 +
- drivers/char/crash.c          |  128 +++++++++++++++++++++++++++++++++++++++++
- 7 files changed, 303 insertions(+), 0 deletions(-)
+ 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 ++++++++++++++++++++++
+ 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 drivers/char/crash.c
+ create mode 100644 include/asm-generic/crash.h
 
+diff --git a/arch/arm/include/asm/crash.h b/arch/arm/include/asm/crash.h
+new file mode 100644
+index 0000000..1d2e537
+--- /dev/null
++++ b/arch/arm/include/asm/crash.h
+@@ -0,0 +1,6 @@
++#ifndef _ARM_CRASH_H
++#define _ARM_CRASH_H
++
++#include <asm-generic/crash.h>
++
++#endif /* _ARM_CRASH_H */
+diff --git a/arch/arm64/include/asm/crash.h b/arch/arm64/include/asm/crash.h
+new file mode 100644
+index 0000000..a7fcc28
+--- /dev/null
++++ b/arch/arm64/include/asm/crash.h
+@@ -0,0 +1,6 @@
++#ifndef _ARM64_CRASH_H
++#define _ARM64_CRASH_H
++
++#include <asm-generic/crash.h>
++
++#endif /* _ARM64_CRASH_H */
 diff --git a/arch/ia64/include/asm/crash.h b/arch/ia64/include/asm/crash.h
 new file mode 100644
-index 0000000..541af84
+index 0000000..28bd955
 --- /dev/null
 +++ b/arch/ia64/include/asm/crash.h
 @@ -0,0 +1,90 @@
@@ -68,7 +102,7 @@ index 0000000..541af84
 +			return NULL;
 +	}
 +
-+	switch (type = efi_mem_type(offset)) 
++	switch (type = efi_mem_type(offset))
 +	{
 +	case EFI_LOADER_CODE:
 +	case EFI_LOADER_DATA:
@@ -79,7 +113,7 @@ index 0000000..541af84
 +
 +	default:
 +		printk(KERN_INFO
-+		    "crash memory driver: invalid memory type for %lx: %d\n", 
++		    "crash memory driver: invalid memory type for %lx: %d\n",
 +			offset, type);
 +		return NULL;
 +	}
@@ -96,7 +130,7 @@ index 0000000..541af84
 +
 +	if (!page->virtual) {
 +		printk(KERN_INFO
-+		    "crash memory driver: offset: %lx page: %lx page->virtual: NULL\n", 
++		    "crash memory driver: offset: %lx page: %lx page->virtual: NULL\n",
 +			offset, (unsigned long)page);
 +		return NULL;
 +	}
@@ -104,8 +138,8 @@ index 0000000..541af84
 +	return (page->virtual + (offset & (PAGE_SIZE-1)));
 +}
 +
-+static inline void unmap_virtual(struct page *page) 
-+{ 
++static inline void unmap_virtual(struct page *page)
++{
 +	return;
 +}
 +
@@ -113,7 +147,7 @@ index 0000000..541af84
 +
 +#endif /* _ASM_IA64_CRASH_H */
 diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
-index 7f4a0ed..552fe24 100644
+index 5b7791d..aee4b87 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);
@@ -126,52 +160,47 @@ index 7f4a0ed..552fe24 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/x86/include/asm/crash.h b/arch/x86/include/asm/crash.h
+diff --git a/arch/powerpc/include/asm/crash.h b/arch/powerpc/include/asm/crash.h
 new file mode 100644
-index 0000000..dfcc006
+index 0000000..daa8c4d
 --- /dev/null
-+++ b/arch/x86/include/asm/crash.h
-@@ -0,0 +1,75 @@
-+#ifndef _ASM_I386_CRASH_H
-+#define _ASM_I386_CRASH_H
++++ b/arch/powerpc/include/asm/crash.h
+@@ -0,0 +1,6 @@
++#ifndef _PPC64_CRASH_H
++#define _PPC64_CRASH_H
 +
-+/*
-+ * linux/include/asm-i386/crash.h
-+ *
-+ * Copyright (c) 2004 Red Hat, Inc. 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 as published by
-+ * the Free Software Foundation; either version 2, 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
++#include <asm-generic/crash.h>
++
++#endif /* _PPC64_CRASH_H */
+diff --git a/arch/s390/include/asm/crash.h b/arch/s390/include/asm/crash.h
+new file mode 100644
+index 0000000..552be5e
+--- /dev/null
++++ b/arch/s390/include/asm/crash.h
+@@ -0,0 +1,60 @@
++#ifndef _S390_CRASH_H
++#define _S390_CRASH_H
 +
 +#ifdef __KERNEL__
 +
 +#include <linux/mm.h>
 +#include <linux/highmem.h>
-+#include <asm/mmzone.h>
 +
-+extern int page_is_ram(unsigned long);
-+
-+static inline void *
-+map_virtual(u64 offset, struct page **pp)
++/*
++ * For swapped prefix pages get bounce buffer using xlate_dev_mem_ptr()
++ */
++static inline void *map_virtual(u64 offset, struct page **pp)
 +{
 +	struct page *page;
 +	unsigned long pfn;
 +	void *vaddr;
 +
-+	pfn = (unsigned long)(offset >> PAGE_SHIFT);
++	vaddr = xlate_dev_mem_ptr(offset);
++	pfn = ((unsigned long) vaddr) >> PAGE_SHIFT;
++	if ((unsigned long) vaddr != offset)
++		page = pfn_to_page(pfn);
++	else
++		page = NULL;
 +
 +	if (!page_is_ram(pfn)) {
 +		printk(KERN_INFO
@@ -185,43 +214,61 @@ index 0000000..dfcc006
 +		return NULL;
 +	}
 +
-+	page = pfn_to_page(pfn);
-+
-+	vaddr = kmap(page);
-+	if (!vaddr) {
-+		printk(KERN_INFO
-+		    "crash memory driver: pfn: %lx kmap(page: %lx) failed\n", 
-+			pfn, (unsigned long)page);
-+		return NULL;
-+	}
-+
 +	*pp = page;
-+	return (vaddr + (offset & (PAGE_SIZE-1)));
++	return vaddr;
 +}
 +
-+static inline void unmap_virtual(struct page *page) 
-+{ 
-+	kunmap(page);
++/*
++ * Free bounce buffer if necessary
++ */
++static inline void unmap_virtual(struct page *page)
++{
++	void *vaddr;
++
++	if (page) {
++		/*
++		 * Because for bounce buffers vaddr will never be 0
++		 * unxlate_dev_mem_ptr() will always free the bounce buffer.
++		 */
++		vaddr = (void *)(page_to_pfn(page) << PAGE_SHIFT);
++		unxlate_dev_mem_ptr(0, vaddr);
++	}
 +}
 +
 +#endif /* __KERNEL__ */
 +
-+#endif /* _ASM_I386_CRASH_H */
-diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
-index be1ef57..ac659f7 100644
---- a/arch/x86/mm/ioremap.c
-+++ b/arch/x86/mm/ioremap.c
-@@ -24,6 +24,8 @@
++#endif /* _S390_CRASH_H */
+diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
+index d1e0e0c..a2be459 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)
+ 	put_online_cpus();
+ 	return bounce;
+ }
++EXPORT_SYMBOL_GPL(xlate_dev_mem_ptr);
  
- #include "physaddr.h"
- 
-+EXPORT_SYMBOL_GPL(page_is_ram);
-+
  /*
-  * Fix up the linear direct mapping of the kernel to avoid cache attribute
-  * conflicts.
+  * Free converted buffer for /dev/mem access (if necessary)
+@@ -228,3 +229,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
+new file mode 100644
+index 0000000..27a4156
+--- /dev/null
++++ b/arch/x86/include/asm/crash.h
+@@ -0,0 +1,6 @@
++#ifndef _X86_CRASH_H
++#define _X86_CRASH_H
++
++#include <asm-generic/crash.h>
++
++#endif /* _X86_CRASH_H */
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 423fd56..e04a561 100644
+index fa3243d..83643e5b 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
 @@ -4,6 +4,9 @@
@@ -235,10 +282,10 @@ index 423fd56..e04a561 100644
  
  config DEVKMEM
 diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index 32762ba..3d5d525 100644
+index 7ff1d0d..3ed67af 100644
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
-@@ -65,3 +65,5 @@ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
+@@ -62,3 +62,5 @@ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
  js-rtc-y = rtc.o
  
  obj-$(CONFIG_TILE_SROM)		+= tile-srom.o
@@ -246,7 +293,7 @@ index 32762ba..3d5d525 100644
 +obj-$(CONFIG_CRASH)            += crash.o
 diff --git a/drivers/char/crash.c b/drivers/char/crash.c
 new file mode 100644
-index 0000000..e5437de
+index 0000000..a142bb3
 --- /dev/null
 +++ b/drivers/char/crash.c
 @@ -0,0 +1,128 @@
@@ -291,7 +338,7 @@ index 0000000..e5437de
 + *  access to physical memory.
 + */
 +
-+static loff_t 
++static loff_t
 +crash_llseek(struct file * file, loff_t offset, int orig)
 +{
 +	switch (orig) {
@@ -307,7 +354,7 @@ index 0000000..e5437de
 +}
 +
 +/*
-+ *  Determine the page address for an address offset value, 
++ *  Determine the page address for an address offset value,
 + *  get a virtual address for it, and copy it out.
 + *  Accesses must fit within a page.
 + */
@@ -320,7 +367,7 @@ index 0000000..e5437de
 +	ssize_t read;
 +
 +	offset = *poff;
-+	if (offset >> PAGE_SHIFT != (offset+count-1) >> PAGE_SHIFT) 
++	if (offset >> PAGE_SHIFT != (offset+count-1) >> PAGE_SHIFT)
 +		return -EINVAL;
 +
 +	vaddr = map_virtual(offset, &page);
@@ -357,11 +404,11 @@ index 0000000..e5437de
 +
 +	ret = misc_register(&crash_dev);
 +	if (ret) {
-+		printk(KERN_ERR 
++		printk(KERN_ERR
 +		    "crash memory driver: cannot misc_register (MISC_DYNAMIC_MINOR)\n");
 +		goto out;
 +	}
-+	
++
 +	ret = 0;
 +	printk(KERN_INFO "crash memory driver: version %s\n", CRASH_VERSION);
 +out:
@@ -378,6 +425,84 @@ index 0000000..e5437de
 +module_exit(crash_cleanup_module);
 +
 +MODULE_LICENSE("GPL");
+diff --git a/include/asm-generic/crash.h b/include/asm-generic/crash.h
+new file mode 100644
+index 0000000..8a0a69a
+--- /dev/null
++++ b/include/asm-generic/crash.h
+@@ -0,0 +1,72 @@
++#ifndef __CRASH_H__
++#define __CRASH_H__
++
++/*
++ * include/linux/crash.h
++ *
++ * Copyright (c) 2013 Red Hat, Inc. 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 as published by
++ * the Free Software Foundation; either version 2, 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., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++
++#ifdef __KERNEL__
++
++#include <linux/mm.h>
++#include <linux/highmem.h>
++
++static inline void *
++map_virtual(u64 offset, struct page **pp)
++{
++	struct page *page;
++	unsigned long pfn;
++	void *vaddr;
++
++	pfn = (unsigned long)(offset >> PAGE_SHIFT);
++
++	if (!page_is_ram(pfn)) {
++		printk(KERN_INFO
++		    "crash memory driver: !page_is_ram(pfn: %lx)\n", pfn);
++		return NULL;
++	}
++
++	if (!pfn_valid(pfn)) {
++		printk(KERN_INFO
++		    "crash memory driver: invalid pfn: %lx )\n", pfn);
++		return NULL;
++	}
++
++	page = pfn_to_page(pfn);
++
++	vaddr = kmap(page);
++	if (!vaddr) {
++		printk(KERN_INFO
++		    "crash memory driver: pfn: %lx kmap(page: %lx) failed\n",
++			pfn, (unsigned long)page);
++		return NULL;
++	}
++
++	*pp = page;
++	return (vaddr + (offset & (PAGE_SIZE-1)));
++}
++
++static inline void unmap_virtual(struct page *page)
++{
++	kunmap(page);
++}
++
++#endif /* __KERNEL__ */
++
++#endif /* __CRASH_H__ */
 -- 
-1.7.6
+1.8.3.1
 

drm-fix-qxl-mode-flags-backport.patch

@@ -0,0 +1,119 @@
+Bugzilla: 1060327
+Upstream-status: Queued for 3.16
+
+diff -up linux-3.14.2-200.fc20.i686/drivers/gpu/drm/drm_crtc_helper.c.dma linux-3.14.2-200.fc20.i686/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-3.14.2-200.fc20.i686/drivers/gpu/drm/drm_crtc_helper.c.dma	2014-03-31 13:40:15.000000000 +1000
++++ linux-3.14.2-200.fc20.i686/drivers/gpu/drm/drm_crtc_helper.c	2014-05-01 10:27:07.410210002 +1000
+@@ -120,8 +120,8 @@ static void drm_mode_validate_flag(struc
+  * RETURNS:
+  * Number of modes found on @connector.
+  */
+-int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
+-					    uint32_t maxX, uint32_t maxY)
++static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connector *connector,
++					    uint32_t maxX, uint32_t maxY, bool merge_type_bits)
+ {
+ 	struct drm_device *dev = connector->dev;
+ 	struct drm_display_mode *mode;
+@@ -173,7 +173,7 @@ int drm_helper_probe_single_connector_mo
+ 	if (count == 0)
+ 		goto prune;
+ 
+-	drm_mode_connector_list_update(connector);
++	drm_mode_connector_list_update(connector, merge_type_bits);
+ 
+ 	if (maxX && maxY)
+ 		drm_mode_validate_size(dev, &connector->modes, maxX,
+@@ -213,8 +213,21 @@ prune:
+ 
+ 	return count;
+ }
++
++int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
++					    uint32_t maxX, uint32_t maxY)
++{
++	return drm_helper_probe_single_connector_modes_merge_bits(connector, maxX, maxY, true);
++}
+ EXPORT_SYMBOL(drm_helper_probe_single_connector_modes);
+ 
++int drm_helper_probe_single_connector_modes_nomerge(struct drm_connector *connector,
++						    uint32_t maxX, uint32_t maxY)
++{
++	return drm_helper_probe_single_connector_modes_merge_bits(connector, maxX, maxY, false);
++}
++EXPORT_SYMBOL(drm_helper_probe_single_connector_modes_nomerge);
++
+ /**
+  * drm_helper_encoder_in_use - check if a given encoder is in use
+  * @encoder: encoder to check
+diff -up linux-3.14.2-200.fc20.i686/drivers/gpu/drm/drm_modes.c.dma linux-3.14.2-200.fc20.i686/drivers/gpu/drm/drm_modes.c
+--- linux-3.14.2-200.fc20.i686/drivers/gpu/drm/drm_modes.c.dma	2014-03-31 13:40:15.000000000 +1000
++++ linux-3.14.2-200.fc20.i686/drivers/gpu/drm/drm_modes.c	2014-05-01 10:27:59.015207267 +1000
+@@ -1025,7 +1025,7 @@ EXPORT_SYMBOL(drm_mode_sort);
+  * list and only adds different modes. All modes unverified after this point
+  * will be removed by the prune invalid modes.
+  */
+-void drm_mode_connector_list_update(struct drm_connector *connector)
++void drm_mode_connector_list_update(struct drm_connector *connector, bool merge_type_bits)
+ {
+ 	struct drm_display_mode *mode;
+ 	struct drm_display_mode *pmode, *pt;
+@@ -1041,7 +1041,10 @@ void drm_mode_connector_list_update(stru
+ 				/* if equal delete the probed mode */
+ 				mode->status = pmode->status;
+ 				/* Merge type bits together */
+-				mode->type |= pmode->type;
++				if (merge_type_bits)
++					mode->type |= pmode->type;
++				else
++					mode->type = pmode->type;
+ 				list_del(&pmode->head);
+ 				drm_mode_destroy(connector->dev, pmode);
+ 				break;
+diff -up linux-3.14.2-200.fc20.i686/drivers/gpu/drm/qxl/qxl_display.c.dma linux-3.14.2-200.fc20.i686/drivers/gpu/drm/qxl/qxl_display.c
+--- linux-3.14.2-200.fc20.i686/drivers/gpu/drm/qxl/qxl_display.c.dma	2014-03-31 13:40:15.000000000 +1000
++++ linux-3.14.2-200.fc20.i686/drivers/gpu/drm/qxl/qxl_display.c	2014-05-01 10:27:07.411210001 +1000
+@@ -841,7 +841,7 @@ static const struct drm_connector_funcs
+ 	.save = qxl_conn_save,
+ 	.restore = qxl_conn_restore,
+ 	.detect = qxl_conn_detect,
+-	.fill_modes = drm_helper_probe_single_connector_modes,
++	.fill_modes = drm_helper_probe_single_connector_modes_nomerge,
+ 	.set_property = qxl_conn_set_property,
+ 	.destroy = qxl_conn_destroy,
+ };
+diff -up linux-3.14.2-200.fc20.i686/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c.dma linux-3.14.2-200.fc20.i686/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+--- linux-3.14.2-200.fc20.i686/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c.dma	2014-03-31 13:40:15.000000000 +1000
++++ linux-3.14.2-200.fc20.i686/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c	2014-05-01 10:27:07.411210001 +1000
+@@ -2003,7 +2003,7 @@ int vmw_du_connector_fill_modes(struct d
+ 	if (du->pref_mode)
+ 		list_move(&du->pref_mode->head, &connector->probed_modes);
+ 
+-	drm_mode_connector_list_update(connector);
++	drm_mode_connector_list_update(connector, true);
+ 
+ 	return 1;
+ }
+diff -up linux-3.14.2-200.fc20.i686/include/drm/drm_crtc.h.dma linux-3.14.2-200.fc20.i686/include/drm/drm_crtc.h
+--- linux-3.14.2-200.fc20.i686/include/drm/drm_crtc.h.dma	2014-03-31 13:40:15.000000000 +1000
++++ linux-3.14.2-200.fc20.i686/include/drm/drm_crtc.h	2014-05-01 10:27:07.412210001 +1000
+@@ -1033,7 +1033,7 @@ extern int drm_mode_hsync(const struct d
+ extern int drm_mode_vrefresh(const struct drm_display_mode *mode);
+ extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
+ 				  int adjust_flags);
+-extern void drm_mode_connector_list_update(struct drm_connector *connector);
++extern void drm_mode_connector_list_update(struct drm_connector *connector, bool merge_type_bits);
+ extern int drm_mode_connector_update_edid_property(struct drm_connector *connector,
+ 						struct edid *edid);
+ extern int drm_object_property_set_value(struct drm_mode_object *obj,
+diff -up linux-3.14.2-200.fc20.i686/include/drm/drm_crtc_helper.h.dma linux-3.14.2-200.fc20.i686/include/drm/drm_crtc_helper.h
+--- linux-3.14.2-200.fc20.i686/include/drm/drm_crtc_helper.h.dma	2014-03-31 13:40:15.000000000 +1000
++++ linux-3.14.2-200.fc20.i686/include/drm/drm_crtc_helper.h	2014-05-01 10:27:07.412210001 +1000
+@@ -126,6 +126,7 @@ struct drm_connector_helper_funcs {
+ };
+ 
+ extern int drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY);
++extern int drm_helper_probe_single_connector_modes_nomerge(struct drm_connector *connector, uint32_t maxX, uint32_t maxY);
+ extern void drm_helper_disable_unused_functions(struct drm_device *dev);
+ extern int drm_crtc_helper_set_config(struct drm_mode_set *set);
+ extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,

drm-i915-dp-stfu.patch

@@ -1,53 +0,0 @@
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index f61cb79..64a24c0 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -315,7 +315,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)
- 	if (!is_edp(intel_dp))
- 		return;
- 	if (!ironlake_edp_have_panel_power(intel_dp) && !ironlake_edp_have_panel_vdd(intel_dp)) {
--		WARN(1, "eDP powered off while attempting aux channel communication.\n");
-+		DRM_ERROR("eDP powered off while attempting aux channel communication.\n");
- 		DRM_DEBUG_KMS("Status 0x%08x Control 0x%08x\n",
- 			      I915_READ(PCH_PP_STATUS),
- 			      I915_READ(PCH_PP_CONTROL));
-@@ -446,7 +446,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
- 	}
- 
- 	if (try == 3) {
--		WARN(1, "dp_aux_ch not started status 0x%08x\n",
-+		DRM_ERROR("dp_aux_ch not started status 0x%08x\n",
- 		     I915_READ(ch_ctl));
- 		ret = -EBUSY;
- 		goto out;
-@@ -1083,8 +1083,8 @@ void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
- 		return;
- 	DRM_DEBUG_KMS("Turn eDP VDD on\n");
- 
--	WARN(intel_dp->want_panel_vdd,
--	     "eDP VDD already requested on\n");
-+	if (intel_dp->want_panel_vdd)
-+		DRM_ERROR("eDP VDD already requested on\n");
- 
- 	intel_dp->want_panel_vdd = true;
- 
-@@ -1151,7 +1151,8 @@ void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
- 		return;
- 
- 	DRM_DEBUG_KMS("Turn eDP VDD off %d\n", intel_dp->want_panel_vdd);
--	WARN(!intel_dp->want_panel_vdd, "eDP VDD not forced on");
-+	if (!intel_dp->want_panel_vdd)
-+		DRM_ERROR("eDP VDD not forced on");
- 
- 	intel_dp->want_panel_vdd = false;
- 
-@@ -1221,7 +1222,8 @@ void ironlake_edp_panel_off(struct intel_dp *intel_dp)
- 
- 	DRM_DEBUG_KMS("Turn eDP power off\n");
- 
--	WARN(!intel_dp->want_panel_vdd, "Need VDD to turn off panel\n");
-+	if (!intel_dp->want_panel_vdd)
-+		DRM_ERROR("Need VDD to turn off panel\n");
- 
- 	pp = ironlake_get_pp_control(dev_priv);
- 	/* We need to switch off panel power _and_ force vdd, for otherwise some

drm-i915-hush-check-crtc-state.patch

@@ -0,0 +1,20 @@
+Bugzilla: 1027037 1028785
+Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/035948.html
+
+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)
+ 
+ 		if (active &&
+ 		    !intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) {
+-			WARN(1, "pipe state doesn't match!\n");
++			DRM_DEBUG_KMS("pipe state doesn't match!\n");
+ 			intel_dump_pipe_config(crtc, &pipe_config,
+ 					       "[hw state]");
+ 			intel_dump_pipe_config(crtc, &crtc->config,

drm-ttm-exports-for-qxl.patch

@@ -1,86 +0,0 @@
-From b538d2921b8aaaa1d7abf1bf0ba3ab9330b0b0c8 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Tue, 22 Jan 2013 13:56:04 +1000
-Subject: [PATCH 1/2] ttm: export functions to allow qxl do its own iomapping
-
-qxl wants to use io mapping like i915 gem does, for now
-just export the symbols so the driver can implement atomic
-page maps using io mapping.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
- drivers/gpu/drm/ttm/ttm_bo_util.c | 13 +++++++++----
- include/drm/ttm/ttm_bo_driver.h   |  4 ++++
- 2 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
-index 44420fc..aaf6f47 100644
---- a/drivers/gpu/drm/ttm/ttm_bo_util.c
-+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
-@@ -86,6 +86,7 @@ int ttm_mem_io_lock(struct ttm_mem_type_manager *man, bool interruptible)
- 	mutex_lock(&man->io_reserve_mutex);
- 	return 0;
- }
-+EXPORT_SYMBOL(ttm_mem_io_lock);
- 
- void ttm_mem_io_unlock(struct ttm_mem_type_manager *man)
- {
-@@ -94,6 +95,7 @@ void ttm_mem_io_unlock(struct ttm_mem_type_manager *man)
- 
- 	mutex_unlock(&man->io_reserve_mutex);
- }
-+EXPORT_SYMBOL(ttm_mem_io_unlock);
- 
- static int ttm_mem_io_evict(struct ttm_mem_type_manager *man)
- {
-@@ -111,8 +113,9 @@ static int ttm_mem_io_evict(struct ttm_mem_type_manager *man)
- 	return 0;
- }
- 
--static int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
--			      struct ttm_mem_reg *mem)
-+
-+int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
-+		       struct ttm_mem_reg *mem)
- {
- 	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
- 	int ret = 0;
-@@ -134,9 +137,10 @@ retry:
- 	}
- 	return ret;
- }
-+EXPORT_SYMBOL(ttm_mem_io_reserve);
- 
--static void ttm_mem_io_free(struct ttm_bo_device *bdev,
--			    struct ttm_mem_reg *mem)
-+void ttm_mem_io_free(struct ttm_bo_device *bdev,
-+		     struct ttm_mem_reg *mem)
- {
- 	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
- 
-@@ -149,6 +153,7 @@ static void ttm_mem_io_free(struct ttm_bo_device *bdev,
- 		bdev->driver->io_mem_free(bdev, mem);
- 
- }
-+EXPORT_SYMBOL(ttm_mem_io_free);
- 
- int ttm_mem_io_reserve_vm(struct ttm_buffer_object *bo)
- {
-diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
-index 0fbd046..9c8dca7 100644
---- a/include/drm/ttm/ttm_bo_driver.h
-+++ b/include/drm/ttm/ttm_bo_driver.h
-@@ -902,6 +902,10 @@ extern void ttm_bo_unreserve_locked(struct ttm_buffer_object *bo);
-  * ttm_bo_util.c
-  */
- 
-+int ttm_mem_io_reserve(struct ttm_bo_device *bdev,
-+		       struct ttm_mem_reg *mem);
-+void ttm_mem_io_free(struct ttm_bo_device *bdev,
-+		     struct ttm_mem_reg *mem);
- /**
-  * ttm_bo_move_ttm
-  *
--- 
-1.8.1.4
-

e1000e-Failure-to-write-SHRA-turns-on-PROMISC-mode.patch

@@ -0,0 +1,287 @@
+Bugzilla: 1064516
+Upstream-status: Sent for 3.16
+
+From b3e5bf1ff32cbc58c56675498565020460c683cd Mon Sep 17 00:00:00 2001
+From: David Ertman <davidx.m.ertman@intel.com>
+Date: Tue, 6 May 2014 03:50:17 +0000
+Subject: e1000e: Failure to write SHRA turns on PROMISC mode
+
+Previously, the check to turn on promiscuous mode only took into account
+the total number of SHared Receive Address (SHRA) registers and if the
+request was for a register within that range.  It is possible that the
+Management Engine might have locked a number of SHRA and not allowed a
+new address to be written to the requested register.
+
+Add a function to determine the number of unlocked SHRA registers.  Then
+determine if the number of registers available is sufficient for our needs,
+if not then return -ENOMEM so that UNICAST PROMISC mode is activated.
+
+Since the method by which ME claims SHRA registers is non-deterministic,
+also add a return value to the function attempting to write an address
+to a SHRA, and return a -E1000_ERR_CONFIG if the write fails.  The error
+will be passed up the function chain and allow the driver to also set
+UNICAST PROMISC when this happens.
+
+Cc: Vlad Yasevich <vyasevic@redhat.com>
+Signed-off-by: Dave Ertman <davidx.m.ertman@intel.com>
+Tested-by: Aaron Brown <aaron.f.brown@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+
+diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
+index a5f6b11..08f22f3 100644
+--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
++++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
+@@ -1365,6 +1365,7 @@ static const struct e1000_mac_operations es2_mac_ops = {
+ 	.setup_led		= e1000e_setup_led_generic,
+ 	.config_collision_dist	= e1000e_config_collision_dist_generic,
+ 	.rar_set		= e1000e_rar_set_generic,
++	.rar_get_count		= e1000e_rar_get_count_generic,
+ };
+ 
+ static const struct e1000_phy_operations es2_phy_ops = {
+diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
+index e0aa7f1..218481e 100644
+--- a/drivers/net/ethernet/intel/e1000e/82571.c
++++ b/drivers/net/ethernet/intel/e1000e/82571.c
+@@ -1896,6 +1896,7 @@ static const struct e1000_mac_operations e82571_mac_ops = {
+ 	.config_collision_dist	= e1000e_config_collision_dist_generic,
+ 	.read_mac_addr		= e1000_read_mac_addr_82571,
+ 	.rar_set		= e1000e_rar_set_generic,
++	.rar_get_count		= e1000e_rar_get_count_generic,
+ };
+ 
+ static const struct e1000_phy_operations e82_phy_ops_igp = {
+diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
+index 6b3de5f..72f5475 100644
+--- a/drivers/net/ethernet/intel/e1000e/hw.h
++++ b/drivers/net/ethernet/intel/e1000e/hw.h
+@@ -469,8 +469,9 @@ struct e1000_mac_operations {
+ 	s32  (*setup_led)(struct e1000_hw *);
+ 	void (*write_vfta)(struct e1000_hw *, u32, u32);
+ 	void (*config_collision_dist)(struct e1000_hw *);
+-	void (*rar_set)(struct e1000_hw *, u8 *, u32);
++	int  (*rar_set)(struct e1000_hw *, u8 *, u32);
+ 	s32  (*read_mac_addr)(struct e1000_hw *);
++	u32  (*rar_get_count)(struct e1000_hw *);
+ };
+ 
+ /* When to use various PHY register access functions:
+diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
+index 5f55395..b75862d 100644
+--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
++++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
+@@ -139,8 +139,9 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link);
+ static s32 e1000_set_mdio_slow_mode_hv(struct e1000_hw *hw);
+ static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw);
+ static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw);
+-static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index);
+-static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index);
++static int e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index);
++static int e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index);
++static u32 e1000_rar_get_count_pch_lpt(struct e1000_hw *hw);
+ static s32 e1000_k1_workaround_lv(struct e1000_hw *hw);
+ static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate);
+ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force);
+@@ -704,6 +705,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
+ 		mac->ops.rar_set = e1000_rar_set_pch_lpt;
+ 		mac->ops.setup_physical_interface =
+ 		    e1000_setup_copper_link_pch_lpt;
++		mac->ops.rar_get_count = e1000_rar_get_count_pch_lpt;
+ 	}
+ 
+ 	/* Enable PCS Lock-loss workaround for ICH8 */
+@@ -1668,7 +1670,7 @@ static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw)
+  *  contain the MAC address but RAR[1-6] are reserved for manageability (ME).
+  *  Use SHRA[0-3] in place of those reserved for ME.
+  **/
+-static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
++static int e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
+ {
+ 	u32 rar_low, rar_high;
+ 
+@@ -1690,7 +1692,7 @@ static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
+ 		e1e_flush();
+ 		ew32(RAH(index), rar_high);
+ 		e1e_flush();
+-		return;
++		return 0;
+ 	}
+ 
+ 	/* RAR[1-6] are owned by manageability.  Skip those and program the
+@@ -1713,7 +1715,7 @@ static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
+ 		/* verify the register updates */
+ 		if ((er32(SHRAL(index - 1)) == rar_low) &&
+ 		    (er32(SHRAH(index - 1)) == rar_high))
+-			return;
++			return 0;
+ 
+ 		e_dbg("SHRA[%d] might be locked by ME - FWSM=0x%8.8x\n",
+ 		      (index - 1), er32(FWSM));
+@@ -1721,6 +1723,43 @@ static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
+ 
+ out:
+ 	e_dbg("Failed to write receive address at index %d\n", index);
++	return -E1000_ERR_CONFIG;
++}
++
++/**
++ *  e1000_rar_get_count_pch_lpt - Get the number of available SHRA
++ *  @hw: pointer to the HW structure
++ *
++ *  Get the number of available receive registers that the Host can
++ *  program. SHRA[0-10] are the shared receive address registers
++ *  that are shared between the Host and manageability engine (ME).
++ *  ME can reserve any number of addresses and the host needs to be
++ *  able to tell how many available registers it has access to.
++ **/
++static u32 e1000_rar_get_count_pch_lpt(struct e1000_hw *hw)
++{
++	u32 wlock_mac;
++	u32 num_entries;
++
++	wlock_mac = er32(FWSM) & E1000_FWSM_WLOCK_MAC_MASK;
++	wlock_mac >>= E1000_FWSM_WLOCK_MAC_SHIFT;
++
++	switch (wlock_mac) {
++	case 0:
++		/* All SHRA[0..10] and RAR[0] available */
++		num_entries = hw->mac.rar_entry_count;
++		break;
++	case 1:
++		/* Only RAR[0] available */
++		num_entries = 1;
++		break;
++	default:
++		/* SHRA[0..(wlock_mac - 1)] available + RAR[0] */
++		num_entries = wlock_mac + 1;
++		break;
++	}
++
++	return num_entries;
+ }
+ 
+ /**
+@@ -1734,7 +1773,7 @@ out:
+  *  contain the MAC address. SHRA[0-10] are the shared receive address
+  *  registers that are shared between the Host and manageability engine (ME).
+  **/
+-static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index)
++static int e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index)
+ {
+ 	u32 rar_low, rar_high;
+ 	u32 wlock_mac;
+@@ -1756,7 +1795,7 @@ static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index)
+ 		e1e_flush();
+ 		ew32(RAH(index), rar_high);
+ 		e1e_flush();
+-		return;
++		return 0;
+ 	}
+ 
+ 	/* The manageability engine (ME) can lock certain SHRAR registers that
+@@ -1788,12 +1827,13 @@ static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index)
+ 			/* verify the register updates */
+ 			if ((er32(SHRAL_PCH_LPT(index - 1)) == rar_low) &&
+ 			    (er32(SHRAH_PCH_LPT(index - 1)) == rar_high))
+-				return;
++				return 0;
+ 		}
+ 	}
+ 
+ out:
+ 	e_dbg("Failed to write receive address at index %d\n", index);
++	return -E1000_ERR_CONFIG;
+ }
+ 
+ /**
+@@ -4977,6 +5017,7 @@ static const struct e1000_mac_operations ich8_mac_ops = {
+ 	/* id_led_init dependent on mac type */
+ 	.config_collision_dist	= e1000e_config_collision_dist_generic,
+ 	.rar_set		= e1000e_rar_set_generic,
++	.rar_get_count		= e1000e_rar_get_count_generic,
+ };
+ 
+ static const struct e1000_phy_operations ich8_phy_ops = {
+diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
+index baa0a46..8c386f3a 100644
+--- a/drivers/net/ethernet/intel/e1000e/mac.c
++++ b/drivers/net/ethernet/intel/e1000e/mac.c
+@@ -211,6 +211,11 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw)
+ 	return 0;
+ }
+ 
++u32 e1000e_rar_get_count_generic(struct e1000_hw *hw)
++{
++	return hw->mac.rar_entry_count;
++}
++
+ /**
+  *  e1000e_rar_set_generic - Set receive address register
+  *  @hw: pointer to the HW structure
+@@ -220,7 +225,7 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw)
+  *  Sets the receive address array register at index to the address passed
+  *  in by addr.
+  **/
+-void e1000e_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index)
++int e1000e_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index)
+ {
+ 	u32 rar_low, rar_high;
+ 
+@@ -244,6 +249,8 @@ void e1000e_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index)
+ 	e1e_flush();
+ 	ew32(RAH(index), rar_high);
+ 	e1e_flush();
++
++	return 0;
+ }
+ 
+ /**
+diff --git a/drivers/net/ethernet/intel/e1000e/mac.h b/drivers/net/ethernet/intel/e1000e/mac.h
+index 4e81c28..0513d90 100644
+--- a/drivers/net/ethernet/intel/e1000e/mac.h
++++ b/drivers/net/ethernet/intel/e1000e/mac.h
+@@ -61,7 +61,8 @@ void e1000e_update_adaptive(struct e1000_hw *hw);
+ void e1000_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value);
+ 
+ void e1000_set_lan_id_multi_port_pcie(struct e1000_hw *hw);
+-void e1000e_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index);
++u32 e1000e_rar_get_count_generic(struct e1000_hw *hw);
++int e1000e_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index);
+ void e1000e_config_collision_dist_generic(struct e1000_hw *hw);
+ 
+ #endif
+diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
+index e4207ef..6084e6b 100644
+--- a/drivers/net/ethernet/intel/e1000e/netdev.c
++++ b/drivers/net/ethernet/intel/e1000e/netdev.c
+@@ -3311,9 +3311,11 @@ static int e1000e_write_uc_addr_list(struct net_device *netdev)
+ {
+ 	struct e1000_adapter *adapter = netdev_priv(netdev);
+ 	struct e1000_hw *hw = &adapter->hw;
+-	unsigned int rar_entries = hw->mac.rar_entry_count;
++	unsigned int rar_entries;
+ 	int count = 0;
+ 
++	rar_entries = hw->mac.ops.rar_get_count(hw);
++
+ 	/* save a rar entry for our hardware address */
+ 	rar_entries--;
+ 
+@@ -3332,9 +3334,13 @@ static int e1000e_write_uc_addr_list(struct net_device *netdev)
+ 		 * combining
+ 		 */
+ 		netdev_for_each_uc_addr(ha, netdev) {
++			int rval;
++
+ 			if (!rar_entries)
+ 				break;
+-			hw->mac.ops.rar_set(hw, ha->addr, rar_entries--);
++			rval = hw->mac.ops.rar_set(hw, ha->addr, rar_entries--);
++			if (rval < 0)
++				return -ENOMEM;
+ 			count++;
+ 		}
+ 	}
+-- 
+cgit v0.10.1
+

efi-dont-map-boot-services-on-32bit.patch

@@ -1,22 +0,0 @@
-diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
-index 3ae4128..ff7dc70 100644
---- a/arch/x86/platform/efi/efi.c
-+++ b/arch/x86/platform/efi/efi.c
-@@ -659,10 +659,13 @@ void __init efi_enter_virtual_mode(void)
- 
- 	for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
- 		md = p;
--		if (!(md->attribute & EFI_MEMORY_RUNTIME) &&
--		    md->type != EFI_BOOT_SERVICES_CODE &&
--		    md->type != EFI_BOOT_SERVICES_DATA)
--			continue;
-+		if (!(md->attribute & EFI_MEMORY_RUNTIME)) {
-+#ifdef CONFIG_X86_64
-+			if (md->type != EFI_BOOT_SERVICES_CODE &&
-+			    md->type != EFI_BOOT_SERVICES_DATA)
-+#endif
-+				continue;
-+		}
- 
- 		size = md->num_pages << EFI_PAGE_SHIFT;
- 		end = md->phys_addr + size;

fanotify-fix-EOVERFLOW-on-64-bit.patch

@@ -0,0 +1,32 @@
+Bugzilla: 696821
+Upstream-status: Sent http://marc.info/?l=linux-kernel&m=139835974112096&w=2
+
+On 64-bit systems, O_LARGEFILE is automatically added to flags inside
+the open() syscall (also openat(), blkdev_open(), etc).
+Userspace therefore defines O_LARGEFILE to be 0 - you can use it,
+but it's a no-op. Everything should be O_LARGEFILE by default.
+
+But: when fanotify does create_fd() it uses dentry_open(), which skips
+all that. And userspace can't set O_LARGEFILE in fanotify_init() because
+it's defined to 0. So if fanotify gets an event regarding a large file,
+the read() will just fail with -EOVERFLOW.
+
+This patch adds O_LARGEFILE to fanotify_init()'s event_f_flags on 64-bit
+systems, using the same test as open()/openat()/etc.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=696821
+
+Acked-by: Eric Paris <eparis@redhat.com>
+Signed-off-by: Will Woods <wwoods@redhat.com>
+
+--- linux-3.14.1-200.fc20.x86_64/fs/notify/fanotify/fanotify_user.c.orig	2014-04-23 18:15:29.347644932 -0400
++++ linux-3.14.1-200.fc20.x86_64/fs/notify/fanotify/fanotify_user.c	2014-04-23 18:17:44.249438484 -0400
+@@ -742,6 +742,8 @@
+ 	oevent->path.mnt = NULL;
+ 	oevent->path.dentry = NULL;
+ 
++	if (force_o_largefile())
++		event_f_flags |= O_LARGEFILE;
+ 	group->fanotify_data.f_flags = event_f_flags;
+ #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
+ 	oevent->response = 0;

floppy-don-t-write-kernel-only-members-to-fdrawcmd-ioctl-output.patch

@@ -0,0 +1,38 @@
+Bugzilla: 1096195
+Upstream-status: 3.15 and queued for stable
+
+From 2145e15e0557a01b9195d1c7199a1b92cb9be81f Mon Sep 17 00:00:00 2001
+From: Matthew Daley <mattd@bugfuzz.com>
+Date: Mon, 28 Apr 2014 19:05:21 +1200
+Subject: floppy: don't write kernel-only members to FDRAWCMD ioctl output
+
+From: Matthew Daley <mattd@bugfuzz.com>
+
+commit 2145e15e0557a01b9195d1c7199a1b92cb9be81f upstream.
+
+Do not leak kernel-only floppy_raw_cmd structure members to userspace.
+This includes the linked-list pointer and the pointer to the allocated
+DMA space.
+
+Signed-off-by: Matthew Daley <mattd@bugfuzz.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/block/floppy.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/drivers/block/floppy.c
++++ b/drivers/block/floppy.c
+@@ -3053,7 +3053,10 @@ static int raw_cmd_copyout(int cmd, void
+ 	int ret;
+ 
+ 	while (ptr) {
+-		ret = copy_to_user(param, ptr, sizeof(*ptr));
++		struct floppy_raw_cmd cmd = *ptr;
++		cmd.next = NULL;
++		cmd.kernel_data = NULL;
++		ret = copy_to_user(param, &cmd, sizeof(cmd));
+ 		if (ret)
+ 			return -EFAULT;
+ 		param += sizeof(struct floppy_raw_cmd);

floppy-ignore-kernel-only-members-in-fdrawcmd-ioctl-input.patch

@@ -0,0 +1,48 @@
+Bugzilla: 1096195
+Upstream-status: 3.15 and queued for stable
+
+From ef87dbe7614341c2e7bfe8d32fcb7028cc97442c Mon Sep 17 00:00:00 2001
+From: Matthew Daley <mattd@bugfuzz.com>
+Date: Mon, 28 Apr 2014 19:05:20 +1200
+Subject: floppy: ignore kernel-only members in FDRAWCMD ioctl input
+
+From: Matthew Daley <mattd@bugfuzz.com>
+
+commit ef87dbe7614341c2e7bfe8d32fcb7028cc97442c upstream.
+
+Always clear out these floppy_raw_cmd struct members after copying the
+entire structure from userspace so that the in-kernel version is always
+valid and never left in an interdeterminate state.
+
+Signed-off-by: Matthew Daley <mattd@bugfuzz.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/block/floppy.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/block/floppy.c
++++ b/drivers/block/floppy.c
+@@ -3107,10 +3107,11 @@ loop:
+ 		return -ENOMEM;
+ 	*rcmd = ptr;
+ 	ret = copy_from_user(ptr, param, sizeof(*ptr));
+-	if (ret)
+-		return -EFAULT;
+ 	ptr->next = NULL;
+ 	ptr->buffer_length = 0;
++	ptr->kernel_data = NULL;
++	if (ret)
++		return -EFAULT;
+ 	param += sizeof(struct floppy_raw_cmd);
+ 	if (ptr->cmd_count > 33)
+ 			/* the command may now also take up the space
+@@ -3126,7 +3127,6 @@ loop:
+ 	for (i = 0; i < 16; i++)
+ 		ptr->reply[i] = 0;
+ 	ptr->resultcode = 0;
+-	ptr->kernel_data = NULL;
+ 
+ 	if (ptr->flags & (FD_RAW_READ | FD_RAW_WRITE)) {
+ 		if (ptr->length <= 0)

fs-proc-devtree-remove_proc_entry.patch

@@ -1,12 +0,0 @@
-diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
-index 927cbd1..f060f28 100644
---- a/fs/proc/proc_devtree.c
-+++ b/fs/proc/proc_devtree.c
-@@ -233,6 +233,7 @@ void __init proc_device_tree_init(void)
- 		return;
- 	root = of_find_node_by_path("/");
- 	if (root == NULL) {
-+		remove_proc_entry("device-tree", NULL);
- 		pr_debug("/proc/device-tree: can't find root\n");
- 		return;
- 	}

hamradio-yam-fix-info-leak-in-ioctl.patch

@@ -0,0 +1,36 @@
+Bugzilla: 1053647
+Upstream-status: 3.13 and 3.12.8
+
+From foo@baz Mon Jan 13 09:44:41 PST 2014
+From: =?UTF-8?q?Salva=20Peir=C3=B3?= <speiro@ai2.upv.es>
+Date: Tue, 17 Dec 2013 10:06:30 +0100
+Subject: hamradio/yam: fix info leak in ioctl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Salva Peiró <speiro@ai2.upv.es>
+
+[ Upstream commit 8e3fbf870481eb53b2d3a322d1fc395ad8b367ed ]
+
+The yam_ioctl() code fails to initialise the cmd field
+of the struct yamdrv_ioctl_cfg. Add an explicit memset(0)
+before filling the structure to avoid the 4-byte info leak.
+
+Signed-off-by: Salva Peiró <speiro@ai2.upv.es>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/hamradio/yam.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/hamradio/yam.c
++++ b/drivers/net/hamradio/yam.c
+@@ -1057,6 +1057,7 @@ static int yam_ioctl(struct net_device *
+ 		break;
+ 
+ 	case SIOCYAMGCFG:
++		memset(&yi, 0, sizeof(yi));
+ 		yi.cfg.mask = 0xffffffff;
+ 		yi.cfg.iobase = yp->iobase;
+ 		yi.cfg.irq = yp->irq;

ipv6-route-cache-expiration.patch

@@ -0,0 +1,35 @@
+commit 24f5b855e17df7e355eacd6c4a12cc4d6a6c9ff0
+Author: Li RongQing <roy.qing.li@gmail.com>
+Date:   Thu Dec 19 12:40:26 2013 +0800
+
+    ipv6: always set the new created dst's from in ip6_rt_copy
+    
+    ip6_rt_copy only sets dst.from if ort has flag RTF_ADDRCONF and RTF_DEFAULT.
+    but the prefix routes which did get installed by hand locally can have an
+    expiration, and no any flag combination which can ensure a potential from
+    does never expire, so we should always set the new created dst's from.
+    
+    This also fixes the new created dst is always expired since the ort, which
+    is created by RA, maybe has RTF_EXPIRES and RTF_ADDRCONF, but no RTF_DEFAULT.
+    
+    Suggested-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
+    CC: Gao feng <gaofeng@cn.fujitsu.com>
+    Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
+    Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
+    Signed-off-by: David S. Miller <davem@davemloft.net>
+
+diff --git a/net/ipv6/route.c b/net/ipv6/route.c
+index a0a48ac..4b4944c 100644
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -1905,9 +1905,7 @@ static struct rt6_info *ip6_rt_copy(struct rt6_info *ort,
+ 		else
+ 			rt->rt6i_gateway = *dest;
+ 		rt->rt6i_flags = ort->rt6i_flags;
+-		if ((ort->rt6i_flags & (RTF_DEFAULT | RTF_ADDRCONF)) ==
+-		    (RTF_DEFAULT | RTF_ADDRCONF))
+-			rt6_set_from(rt, ort);
++		rt6_set_from(rt, ort);
+ 		rt->rt6i_metric = 0;
+ 
+ #ifdef CONFIG_IPV6_SUBTREES

iwlwifi-dvm-take-mutex-when-sending-SYNC-BT-config-command.patch

@@ -0,0 +1,48 @@
+Bugzilla: 1046495
+Upstream-status: Sent for 3.14 http://marc.info/?l=linux-wireless&m=139453882510796&w=2
+
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+
+There is a flow in which we send the host command in SYNC
+mode, but we don't take priv->mutex.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1046495
+
+Cc: <stable@vger.kernel.org>
+Reviewed-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+---
+ drivers/net/wireless/iwlwifi/dvm/main.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
+index ba1b1ea..ea7e70c 100644
+--- a/drivers/net/wireless/iwlwifi/dvm/main.c
++++ b/drivers/net/wireless/iwlwifi/dvm/main.c
+@@ -252,13 +252,17 @@ static void iwl_bg_bt_runtime_config(struct work_struct *work)
+ 	struct iwl_priv *priv =
+ 		container_of(work, struct iwl_priv, bt_runtime_config);
+ 
++	mutex_lock(&priv->mutex);
+ 	if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+-		return;
++		goto out;
+ 
+ 	/* dont send host command if rf-kill is on */
+ 	if (!iwl_is_ready_rf(priv))
+-		return;
++		goto out;
++
+ 	iwlagn_send_advance_bt_config(priv);
++out:
++	mutex_unlock(&priv->mutex);
+ }
+ 
+ static void iwl_bg_bt_full_concurrency(struct work_struct *work)
+-- 
+1.8.3.2
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html

jme-fix-dma-unmap-error.patch

@@ -0,0 +1,124 @@
+diff -up ./drivers/net/ethernet/jme.c.orig ./drivers/net/ethernet/jme.c
+--- ./drivers/net/ethernet/jme.c.orig	2014-03-30 23:40:15.000000000 -0400
++++ ./drivers/net/ethernet/jme.c	2014-05-08 12:16:52.701746091 -0400
+@@ -1988,7 +1988,7 @@ jme_alloc_txdesc(struct jme_adapter *jme
+ 	return idx;
+ }
+ 
+-static void
++static int
+ jme_fill_tx_map(struct pci_dev *pdev,
+ 		struct txdesc *txdesc,
+ 		struct jme_buffer_info *txbi,
+@@ -2005,6 +2005,9 @@ jme_fill_tx_map(struct pci_dev *pdev,
+ 				len,
+ 				PCI_DMA_TODEVICE);
+ 
++	if (unlikely(pci_dma_mapping_error(pdev, dmaaddr)))
++		return -EINVAL;
++
+ 	pci_dma_sync_single_for_device(pdev,
+ 				       dmaaddr,
+ 				       len,
+@@ -2021,9 +2024,30 @@ jme_fill_tx_map(struct pci_dev *pdev,
+ 
+ 	txbi->mapping = dmaaddr;
+ 	txbi->len = len;
++	return 0;
+ }
+ 
+-static void
++static void jme_drop_tx_map(struct jme_adapter *jme, int startidx, int endidx)
++{
++	struct jme_ring *txring = &(jme->txring[0]);
++	struct jme_buffer_info *txbi = txring->bufinf, *ctxbi;
++	int mask = jme->tx_ring_mask;
++	int j;
++
++	for (j = startidx ; j < endidx ; ++j) {
++		ctxbi = txbi + ((startidx + j + 2) & (mask));
++		pci_unmap_page(jme->pdev,
++				ctxbi->mapping,
++				ctxbi->len,
++				PCI_DMA_TODEVICE);
++
++				ctxbi->mapping = 0;
++				ctxbi->len = 0;
++	}
++
++}
++
++static int
+ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx)
+ {
+ 	struct jme_ring *txring = &(jme->txring[0]);
+@@ -2034,25 +2058,37 @@ jme_map_tx_skb(struct jme_adapter *jme,
+ 	int mask = jme->tx_ring_mask;
+ 	const struct skb_frag_struct *frag;
+ 	u32 len;
++	int ret = 0;
+ 
+ 	for (i = 0 ; i < nr_frags ; ++i) {
+ 		frag = &skb_shinfo(skb)->frags[i];
+ 		ctxdesc = txdesc + ((idx + i + 2) & (mask));
+ 		ctxbi = txbi + ((idx + i + 2) & (mask));
+ 
+-		jme_fill_tx_map(jme->pdev, ctxdesc, ctxbi,
++		ret = jme_fill_tx_map(jme->pdev, ctxdesc, ctxbi,
+ 				skb_frag_page(frag),
+ 				frag->page_offset, skb_frag_size(frag), hidma);
++		if (ret) {
++			jme_drop_tx_map(jme, idx, idx+i);
++			goto out;
++		}
++
+ 	}
+ 
+ 	len = skb_is_nonlinear(skb) ? skb_headlen(skb) : skb->len;
+ 	ctxdesc = txdesc + ((idx + 1) & (mask));
+ 	ctxbi = txbi + ((idx + 1) & (mask));
+-	jme_fill_tx_map(jme->pdev, ctxdesc, ctxbi, virt_to_page(skb->data),
++	ret = jme_fill_tx_map(jme->pdev, ctxdesc, ctxbi, virt_to_page(skb->data),
+ 			offset_in_page(skb->data), len, hidma);
++	if (ret)
++		jme_drop_tx_map(jme, idx, idx+i);
++
++out:
++	return ret;
+ 
+ }
+ 
++
+ static int
+ jme_expand_header(struct jme_adapter *jme, struct sk_buff *skb)
+ {
+@@ -2144,6 +2180,7 @@ jme_fill_tx_desc(struct jme_adapter *jme
+ 	struct txdesc *txdesc;
+ 	struct jme_buffer_info *txbi;
+ 	u8 flags;
++	int ret = 0;
+ 
+ 	txdesc = (struct txdesc *)txring->desc + idx;
+ 	txbi = txring->bufinf + idx;
+@@ -2168,7 +2205,10 @@ jme_fill_tx_desc(struct jme_adapter *jme
+ 	if (jme_tx_tso(skb, &txdesc->desc1.mss, &flags))
+ 		jme_tx_csum(jme, skb, &flags);
+ 	jme_tx_vlan(skb, &txdesc->desc1.vlan, &flags);
+-	jme_map_tx_skb(jme, skb, idx);
++	ret = jme_map_tx_skb(jme, skb, idx);
++	if (ret)
++		return ret;
++
+ 	txdesc->desc1.flags = flags;
+ 	/*
+ 	 * Set tx buffer info after telling NIC to send
+@@ -2240,7 +2280,8 @@ jme_start_xmit(struct sk_buff *skb, stru
+ 		return NETDEV_TX_BUSY;
+ 	}
+ 
+-	jme_fill_tx_desc(jme, skb, idx);
++	if (jme_fill_tx_desc(jme, skb, idx))
++		return NETDEV_TX_BUSY;
+ 
+ 	jwrite32(jme, JME_TXCS, jme->reg_txcs |
+ 				TXCS_SELECT_QUEUE0 |

keys-fix-race-with-concurrent-install_user_keyrings.patch

@@ -1,15 +0,0 @@
-diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
-index 58dfe08..c5ec083 100644
---- a/security/keys/process_keys.c
-+++ b/security/keys/process_keys.c
-@@ -57,7 +57,7 @@ int install_user_keyrings(void)
- 
- 	kenter("%p{%u}", user, uid);
- 
--	if (user->uid_keyring) {
-+	if (user->uid_keyring && user->session_keyring) {
- 		kleave(" = 0 [exist]");
- 		return 0;
- 	}
-
-  

lib-percpu_counter.c-fix-bad-percpu-counter-state-du.patch

@@ -0,0 +1,63 @@
+Bugzilla: 1074235
+Upstream-status: 3.15 and CC'd to stable
+
+From e39435ce68bb4685288f78b1a7e24311f7ef939f Mon Sep 17 00:00:00 2001
+From: Jens Axboe <axboe@fb.com>
+Date: Tue, 8 Apr 2014 16:04:12 -0700
+Subject: [PATCH] lib/percpu_counter.c: fix bad percpu counter state during
+ suspend
+
+I got a bug report yesterday from Laszlo Ersek in which he states that
+his kvm instance fails to suspend.  Laszlo bisected it down to this
+commit 1cf7e9c68fe8 ("virtio_blk: blk-mq support") where virtio-blk is
+converted to use the blk-mq infrastructure.
+
+After digging a bit, it became clear that the issue was with the queue
+drain.  blk-mq tracks queue usage in a percpu counter, which is
+incremented on request alloc and decremented when the request is freed.
+The initial hunt was for an inconsistency in blk-mq, but everything
+seemed fine.  In fact, the counter only returned crazy values when
+suspend was in progress.
+
+When a CPU is unplugged, the percpu counters merges that CPU state with
+the general state.  blk-mq takes care to register a hotcpu notifier with
+the appropriate priority, so we know it runs after the percpu counter
+notifier.  However, the percpu counter notifier only merges the state
+when the CPU is fully gone.  This leaves a state transition where the
+CPU going away is no longer in the online mask, yet it still holds
+private values.  This means that in this state, percpu_counter_sum()
+returns invalid results, and the suspend then hangs waiting for
+abs(dead-cpu-value) requests to complete which of course will never
+happen.
+
+Fix this by clearing the state earlier, so we never have a case where
+the CPU isn't in online mask but still holds private state.  This bug
+has been there since forever, I guess we don't have a lot of users where
+percpu counters needs to be reliable during the suspend cycle.
+
+Signed-off-by: Jens Axboe <axboe@fb.com>
+Reported-by: Laszlo Ersek <lersek@redhat.com>
+Tested-by: Laszlo Ersek <lersek@redhat.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ lib/percpu_counter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
+index 8280a5dd1727..7dd33577b905 100644
+--- a/lib/percpu_counter.c
++++ b/lib/percpu_counter.c
+@@ -169,7 +169,7 @@ static int percpu_counter_hotcpu_callback(struct notifier_block *nb,
+ 	struct percpu_counter *fbc;
+ 
+ 	compute_batch_value();
+-	if (action != CPU_DEAD)
++	if (action != CPU_DEAD && action != CPU_DEAD_FROZEN)
+ 		return NOTIFY_OK;
+ 
+ 	cpu = (unsigned long)hcpu;
+-- 
+1.8.5.3
+

locks-allow-__break_lease-to-sleep-even-when-break_t.patch

@@ -0,0 +1,50 @@
+Bugzilla: 1082586
+Upstream-status: 3.15 and sent for stable
+
+From f1c6bb2cb8b81013e8979806f8e15e3d53efb96d Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@redhat.com>
+Date: Tue, 15 Apr 2014 06:17:49 -0400
+Subject: [PATCH] locks: allow __break_lease to sleep even when break_time is 0
+
+A fl->fl_break_time of 0 has a special meaning to the lease break code
+that basically means "never break the lease". knfsd uses this to ensure
+that leases don't disappear out from under it.
+
+Unfortunately, the code in __break_lease can end up passing this value
+to wait_event_interruptible as a timeout, which prevents it from going
+to sleep at all. This makes __break_lease to spin in a tight loop and
+causes soft lockups.
+
+Fix this by ensuring that we pass a minimum value of 1 as a timeout
+instead.
+
+Cc: <stable@vger.kernel.org>
+Cc: J. Bruce Fields <bfields@fieldses.org>
+Reported-by: Terry Barnaby <terry1@beam.ltd.uk>
+Signed-off-by: Jeff Layton <jlayton@redhat.com>
+---
+ fs/locks.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/fs/locks.c b/fs/locks.c
+index 13fc7a6d380a..b380f5543614 100644
+--- a/fs/locks.c
++++ b/fs/locks.c
+@@ -1391,11 +1391,10 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)
+ 
+ restart:
+ 	break_time = flock->fl_break_time;
+-	if (break_time != 0) {
++	if (break_time != 0)
+ 		break_time -= jiffies;
+-		if (break_time == 0)
+-			break_time++;
+-	}
++	if (break_time == 0)
++		break_time++;
+ 	locks_insert_block(flock, new_fl);
+ 	spin_unlock(&inode->i_lock);
+ 	error = wait_event_interruptible_timeout(new_fl->fl_wait,
+-- 
+1.9.0
+

makefile-after_link.patch

@@ -8,11 +8,25 @@ after each final link.  This includes vmlinux itself and vDSO images.
 
 Signed-off-by: Roland McGrath <roland@redhat.com>
 
+diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
+index d8064af..04dcfe1 100644
+--- a/arch/arm64/kernel/vdso/Makefile
++++ b/arch/arm64/kernel/vdso/Makefile
+@@ -48,7 +48,8 @@ $(obj-vdso): %.o: %.S
+ 
+ # Actual build commands
+ 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 $@
+       cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
+ 
 diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile
-index 9a7946c..28d6765 100644
+index 53e6c9b..e427844 100644
 --- a/arch/powerpc/kernel/vdso32/Makefile
 +++ b/arch/powerpc/kernel/vdso32/Makefile
-@@ -41,7 +41,8 @@ $(obj-vdso32): %.o: %.S
+@@ -43,7 +43,8 @@ $(obj-vdso32): %.o: %.S
  
  # actual build commands
  quiet_cmd_vdso32ld = VDSO32L $@
@@ -23,7 +37,7 @@ index 9a7946c..28d6765 100644
        cmd_vdso32as = $(CROSS32CC) $(a_flags) -c -o $@ $<
  
 diff --git a/arch/powerpc/kernel/vdso64/Makefile b/arch/powerpc/kernel/vdso64/Makefile
-index 8c500d8..d27737b 100644
+index effca94..713891a 100644
 --- a/arch/powerpc/kernel/vdso64/Makefile
 +++ b/arch/powerpc/kernel/vdso64/Makefile
 @@ -36,7 +36,8 @@ $(obj-vdso64): %.o: %.S
@@ -81,7 +95,7 @@ index fd14be1..1f3eb19 100644
  VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
  GCOV_PROFILE := n
 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
-index cd9c6c6..3edf048 100644
+index 0149949..e307cda 100644
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
 @@ -65,6 +65,10 @@ vmlinux_link()
@@ -95,6 +109,3 @@ index cd9c6c6..3edf048 100644
  }
  
  
--- 
-1.7.7.6
-

mm-page_alloc.c-change-mm-debug-routines-back-to-EXP.patch

@@ -0,0 +1,61 @@
+Bugzilla: 1074710
+Upstream-status: 3.15
+
+From ed12d845b5f528cc0846023862b9c448a36122ec Mon Sep 17 00:00:00 2001
+From: John Hubbard <jhubbard@nvidia.com>
+Date: Mon, 7 Apr 2014 15:37:59 -0700
+Subject: [PATCH] mm/page_alloc.c: change mm debug routines back to
+ EXPORT_SYMBOL
+
+A new dump_page() routine was recently added, and marked
+EXPORT_SYMBOL_GPL.  dump_page() was also added to the VM_BUG_ON_PAGE()
+macro, and so the end result is that non-GPL code can no longer call
+get_page() and a few other routines.
+
+This only happens if the kernel was compiled with CONFIG_DEBUG_VM.
+
+Change dump_page() to be EXPORT_SYMBOL.
+
+Longer explanation:
+
+Prior to commit 309381feaee5 ("mm: dump page when hitting a VM_BUG_ON
+using VM_BUG_ON_PAGE") , it was possible to build MIT-licensed (non-GPL)
+drivers on Fedora.  Fedora is semi-unique, in that it sets
+CONFIG_VM_DEBUG.
+
+Because Fedora sets CONFIG_VM_DEBUG, they end up pulling in dump_page(),
+via VM_BUG_ON_PAGE, via get_page().  As one of the authors of NVIDIA's
+new, open source, "UVM-Lite" kernel module, I originally choose to use
+the kernel's get_page() routine from within nvidia_uvm_page_cache.c,
+because get_page() has always seemed to be very clearly intended for use
+by non-GPL, driver code.
+
+So I'm hoping that making get_page() widely accessible again will not be
+too controversial.  We did check with Fedora first, and they responded
+(https://bugzilla.redhat.com/show_bug.cgi?id=1074710#c3) that we should
+try to get upstream changed, before asking Fedora to change.  Their
+reasoning seems beneficial to Linux: leaving CONFIG_DEBUG_VM set allows
+Fedora to help catch mm bugs.
+
+Signed-off-by: John Hubbard <jhubbard@nvidia.com>
+Cc: Sasha Levin <sasha.levin@oracle.com>
+Cc: Josh Boyer <jwboyer@redhat.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ mm/page_alloc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mm/page_alloc.c b/mm/page_alloc.c
+index 48427a7cfb45..5dba2933c9c0 100644
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -6568,4 +6568,4 @@ void dump_page(struct page *page, const char *reason)
+ {
+ 	dump_page_badflags(page, reason, 0);
+ }
+-EXPORT_SYMBOL_GPL(dump_page);
++EXPORT_SYMBOL(dump_page);
+-- 
+1.9.0
+

mm-try_to_unmap_cluster-should-lock_page-before-mloc.patch

@@ -0,0 +1,95 @@
+Bugzilla: 1093084
+Upstream-status: 3.15 and stable CC'd
+
+From 85cc8301cbedcf3049ce15de6f3c2b9e935d0d76 Mon Sep 17 00:00:00 2001
+From: Vlastimil Babka <vbabka@suse.cz>
+Date: Mon, 7 Apr 2014 15:37:50 -0700
+Subject: [PATCH] mm: try_to_unmap_cluster() should lock_page() before mlocking
+
+A BUG_ON(!PageLocked) was triggered in mlock_vma_page() by Sasha Levin
+fuzzing with trinity.  The call site try_to_unmap_cluster() does not lock
+the pages other than its check_page parameter (which is already locked).
+
+The BUG_ON in mlock_vma_page() is not documented and its purpose is
+somewhat unclear, but apparently it serializes against page migration,
+which could otherwise fail to transfer the PG_mlocked flag.  This would
+not be fatal, as the page would be eventually encountered again, but
+NR_MLOCK accounting would become distorted nevertheless.  This patch adds
+a comment to the BUG_ON in mlock_vma_page() and munlock_vma_page() to that
+effect.
+
+The call site try_to_unmap_cluster() is fixed so that for page !=
+check_page, trylock_page() is attempted (to avoid possible deadlocks as we
+already have check_page locked) and mlock_vma_page() is performed only
+upon success.  If the page lock cannot be obtained, the page is left
+without PG_mlocked, which is again not a problem in the whole unevictable
+memory design.
+
+Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
+Signed-off-by: Bob Liu <bob.liu@oracle.com>
+Reported-by: Sasha Levin <sasha.levin@oracle.com>
+Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
+Cc: Michel Lespinasse <walken@google.com>
+Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
+Acked-by: Rik van Riel <riel@redhat.com>
+Cc: David Rientjes <rientjes@google.com>
+Cc: Mel Gorman <mgorman@suse.de>
+Cc: Hugh Dickins <hughd@google.com>
+Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ mm/mlock.c |  2 ++
+ mm/rmap.c  | 14 ++++++++++++--
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/mm/mlock.c b/mm/mlock.c
+index 192e6eebe4f2..1b12dfad0794 100644
+--- a/mm/mlock.c
++++ b/mm/mlock.c
+@@ -79,6 +79,7 @@ void clear_page_mlock(struct page *page)
+  */
+ void mlock_vma_page(struct page *page)
+ {
++	/* Serialize with page migration */
+ 	BUG_ON(!PageLocked(page));
+ 
+ 	if (!TestSetPageMlocked(page)) {
+@@ -153,6 +154,7 @@ unsigned int munlock_vma_page(struct page *page)
+ {
+ 	unsigned int nr_pages;
+ 
++	/* For try_to_munlock() and to serialize with page migration */
+ 	BUG_ON(!PageLocked(page));
+ 
+ 	if (TestClearPageMlocked(page)) {
+diff --git a/mm/rmap.c b/mm/rmap.c
+index 068522d8502a..b99c74271fec 100644
+--- a/mm/rmap.c
++++ b/mm/rmap.c
+@@ -1389,9 +1389,19 @@ static int try_to_unmap_cluster(unsigned long cursor, unsigned int *mapcount,
+ 		BUG_ON(!page || PageAnon(page));
+ 
+ 		if (locked_vma) {
+-			mlock_vma_page(page);   /* no-op if already mlocked */
+-			if (page == check_page)
++			if (page == check_page) {
++				/* we know we have check_page locked */
++				mlock_vma_page(page);
+ 				ret = SWAP_MLOCK;
++			} else if (trylock_page(page)) {
++				/*
++				 * If we can lock the page, perform mlock.
++				 * Otherwise leave the page alone, it will be
++				 * eventually encountered again later.
++				 */
++				mlock_vma_page(page);
++				unlock_page(page);
++			}
+ 			continue;	/* don't unmap */
+ 		}
+ 
+-- 
+1.9.0
+

mod-sign.sh

@@ -9,20 +9,28 @@
 # This essentially duplicates the 'modules_sign' Kbuild target and runs the
 # same commands for those modules.
 
-moddir=$1
+MODSECKEY=$1
+MODPUBKEY=$2
+
+moddir=$3
 
 modules=`find $moddir -name *.ko`
 
-MODSECKEY="./signing_key.priv"
-MODPUBKEY="./signing_key.x509"
-
 for mod in $modules
 do
     dir=`dirname $mod`
     file=`basename $mod`
 
-    ./scripts/sign-file sha256 ${MODSECKEY} ${MODPUBKEY} ${dir}/${file} \
-       ${dir}/${file}.signed
-    mv ${dir}/${file}.signed ${dir}/${file}
+    ./scripts/sign-file sha256 ${MODSECKEY} ${MODPUBKEY} ${dir}/${file}
     rm -f ${dir}/${file}.{sig,dig}
 done
+
+RANDOMMOD=$(find $moddir -type f -name '*.ko' | sort -R | head -n 1)
+if [ "~Module signature appended~" != "$(tail -c 28 $RANDOMMOD)" ]; then
+    echo "*****************************"
+    echo "*** Modules are unsigned! ***"
+    echo "*****************************"
+    exit 1
+fi
+
+exit 0

modsign-uefi.patch

@@ -0,0 +1,621 @@
+From 0a5e59dd7a921f20d77b13aa4e01392086ddbd12 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 eed2202..1da1b3c 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -389,6 +389,12 @@ typedef efi_status_t efi_query_variable_store_t(u32 attributes, unsigned long si
+ #define EFI_FILE_SYSTEM_GUID \
+     EFI_GUID(  0x964e5b22, 0x6459, 0x11d2, 0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b )
+ 
++#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;
+@@ -524,6 +530,20 @@ typedef struct {
+ 
+ #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.8.3.1
+
+
+From 8b75428a7e1813cd3bc225a959e63d67898e4808 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 6d2c2ea..ace9c30 100644
+--- a/crypto/asymmetric_keys/Kconfig
++++ b/crypto/asymmetric_keys/Kconfig
+@@ -35,4 +35,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 0727204..cd8388e 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 0000000..424896a
+--- /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 1da1b3c..42a1d25 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -619,6 +619,10 @@ extern int efi_set_rtc_mmss(const struct timespec *now);
+ extern void efi_reserve_boot_services(void);
+ extern struct efi_memory_map memmap;
+ 
++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.8.3.1
+
+
+From 920108c0f9cc5854dd329a5dfc904e91d40a4b26 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 8dabc39..e466de1 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 0ff5407..ba76e57 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1680,6 +1680,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 0b6b870..0a29b40 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 564dd93..389b50d 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 u8 system_certificate_list_end[];
+@@ -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.8.3.1
+
+
+From 69dca9998380c1931227a01205cdf23c34509753 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 42a1d25..d3e6036 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -395,6 +395,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 ba76e57..b09cd98 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1799,6 +1799,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 6313698..cb35a89 100644
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -57,6 +57,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
+@@ -115,6 +116,8 @@ obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.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 0000000..94b0eb3
+--- /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.8.3.1
+
+
+From c8e6d256ddfa2182d5b011a4ab70f8c5c9b2b590 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 94b0eb3..ae28b97 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.8.3.1
+

n_tty-Fix-n_tty_write-crash-when-echoing-in-raw-mode.patch

@@ -0,0 +1,86 @@
+Bugzilla: 1094240
+Upstream-status: 3.15 and CC'd to stable
+
+From 4291086b1f081b869c6d79e5b7441633dc3ace00 Mon Sep 17 00:00:00 2001
+From: Peter Hurley <peter@hurleysoftware.com>
+Date: Sat, 3 May 2014 14:04:59 +0200
+Subject: [PATCH] n_tty: Fix n_tty_write crash when echoing in raw mode
+
+The tty atomic_write_lock does not provide an exclusion guarantee for
+the tty driver if the termios settings are LECHO & !OPOST.  And since
+it is unexpected and not allowed to call TTY buffer helpers like
+tty_insert_flip_string concurrently, this may lead to crashes when
+concurrect writers call pty_write. In that case the following two
+writers:
+* the ECHOing from a workqueue and
+* pty_write from the process
+race and can overflow the corresponding TTY buffer like follows.
+
+If we look into tty_insert_flip_string_fixed_flag, there is:
+  int space = __tty_buffer_request_room(port, goal, flags);
+  struct tty_buffer *tb = port->buf.tail;
+  ...
+  memcpy(char_buf_ptr(tb, tb->used), chars, space);
+  ...
+  tb->used += space;
+
+so the race of the two can result in something like this:
+              A                                B
+__tty_buffer_request_room
+                                  __tty_buffer_request_room
+memcpy(buf(tb->used), ...)
+tb->used += space;
+                                  memcpy(buf(tb->used), ...) ->BOOM
+
+B's memcpy is past the tty_buffer due to the previous A's tb->used
+increment.
+
+Since the N_TTY line discipline input processing can output
+concurrently with a tty write, obtain the N_TTY ldisc output_lock to
+serialize echo output with normal tty writes.  This ensures the tty
+buffer helper tty_insert_flip_string is not called concurrently and
+everything is fine.
+
+Note that this is nicely reproducible by an ordinary user using
+forkpty and some setup around that (raw termios + ECHO). And it is
+present in kernels at least after commit
+d945cb9cce20ac7143c2de8d88b187f62db99bdc (pty: Rework the pty layer to
+use the normal buffering logic) in 2.6.31-rc3.
+
+js: add more info to the commit log
+js: switch to bool
+js: lock unconditionally
+js: lock only the tty->ops->write call
+
+References: CVE-2014-0196
+Reported-and-tested-by: Jiri Slaby <jslaby@suse.cz>
+Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/tty/n_tty.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
+index 41fe8a047d37..fe9d129c8735 100644
+--- a/drivers/tty/n_tty.c
++++ b/drivers/tty/n_tty.c
+@@ -2353,8 +2353,12 @@ static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
+ 			if (tty->ops->flush_chars)
+ 				tty->ops->flush_chars(tty);
+ 		} else {
++			struct n_tty_data *ldata = tty->disc_data;
++
+ 			while (nr > 0) {
++				mutex_lock(&ldata->output_lock);
+ 				c = tty->ops->write(tty, b, nr);
++				mutex_unlock(&ldata->output_lock);
+ 				if (c < 0) {
+ 					retval = c;
+ 					goto break_out;
+-- 
+1.9.0
+

nowatchdog-on-virt.patch

@@ -0,0 +1,67 @@
+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.
+(Example: https://bugzilla.redhat.com/show_bug.cgi?id=971139)
+
+In some cases it seems that the host just never scheduled the app running
+the VM for a very long time (Could be the host was under heavy load).
+
+Just disable the detector on VMs.
+
+Signed-off-by: Dave Jones <davej@redhat.com>
+
+diff --git a/kernel/watchdog.c b/kernel/watchdog.c
+index 1241d8c..b2dc4e4 100644
+--- a/kernel/watchdog.c
++++ b/kernel/watchdog.c
+@@ -24,6 +24,7 @@
+ #include <linux/sysctl.h>
+ #include <linux/smpboot.h>
+ #include <linux/sched/rt.h>
++#include <linux/dmi.h>
+ 
+ #include <asm/irq_regs.h>
+ #include <linux/kvm_para.h>
+@@ -96,6 +97,32 @@ static int __init nosoftlockup_setup(char *str)
+ __setup("nosoftlockup", nosoftlockup_setup);
+ /*  */
+ 
++static int disable_watchdog(const struct dmi_system_id *d)
++{
++	printk(KERN_INFO "watchdog: disabled (inside virtual machine)\n");
++	watchdog_user_enabled = 0;
++	return 0;
++}
++
++static const struct dmi_system_id watchdog_virt_dmi_table[] = {
++	{
++		.callback = disable_watchdog,
++		.ident = "VMware",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "VMware, Inc."),
++		},
++	},
++	{
++		.callback = disable_watchdog,
++		.ident = "Bochs",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "Bochs"),
++		},
++	},
++	{}
++};
++
++
+ /*
+  * Hard-lockup warnings should be triggered after just a few seconds. Soft-
+  * lockups can have false positives under extreme conditions. So we generally
+@@ -551,6 +578,8 @@ int proc_dowatchdog(struct ctl_table *table, int write,
+ 
+ void __init lockup_detector_init(void)
+ {
++	dmi_check_system(watchdog_virt_dmi_table);
++
+ 	set_sample_period();
+ 
+ #ifdef CONFIG_NO_HZ_FULL

revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch

@@ -0,0 +1,40 @@
+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
+

sb-hibernate.patch

@@ -0,0 +1,112 @@
+From ffe1ee94d526900ce1e5191cdd38934477dd209a 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 b26f5f1..e65228b 100644
+--- a/kernel/power/hibernate.c
++++ b/kernel/power/hibernate.c
+@@ -28,6 +28,8 @@
+ #include <linux/syscore_ops.h>
+ #include <linux/ctype.h>
+ #include <linux/genhd.h>
++#include <linux/efi.h>
++#include <linux/module.h>
+ 
+ #include "power.h"
+ 
+@@ -632,6 +634,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)) {
+@@ -723,7 +729,7 @@ static int software_resume(void)
+ 	/*
+ 	 * If the user said "noresume".. bail out early.
+ 	 */
+-	if (noresume)
++	if (noresume || secure_modules())
+ 		return 0;
+ 
+ 	/*
+@@ -889,6 +895,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;
+@@ -923,6 +934,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 1d1bf63..300f300 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 15cb72f..fa85ed5 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.8.3.1
+

secure-modules.patch

@@ -0,0 +1,877 @@
+Bugzilla: N/A
+Upstream-status: Fedora mustard.  Replaced by securelevels, but that was nak'd
+
+From f212a4d8b8638a3e15e4cd76874d4fab60726752 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 15cd6b1..30702eb 100644
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -512,6 +512,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. */
+@@ -622,6 +624,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 f5a3b1e..644c33e 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -3831,3 +3831,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.8.4.2
+
+
+From 394a8259d0b457495dddda8704821ec9e56ea44a 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 c91e6c1..447742e 100644
+--- a/drivers/pci/pci-sysfs.c
++++ b/drivers/pci/pci-sysfs.c
+@@ -29,6 +29,7 @@
+ #include <linux/slab.h>
+ #include <linux/vgaarb.h>
+ #include <linux/pm_runtime.h>
++#include <linux/module.h>
+ #include "pci.h"
+ 
+ static int sysfs_initialized;	/* = 0 */
+@@ -668,6 +669,9 @@ 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) {
+@@ -974,6 +978,9 @@ 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;
+@@ -1081,6 +1088,9 @@ 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 46d1378..294fe7b 100644
+--- a/drivers/pci/proc.c
++++ b/drivers/pci/proc.c
+@@ -117,6 +117,9 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof
+ 	int size = dev->cfg_size;
+ 	int cnt;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (pos >= size)
+ 		return 0;
+ 	if (nbytes >= size)
+@@ -196,6 +199,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);
+@@ -234,7 +240,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 24750a1..fa57896 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.8.4.2
+
+
+From 69532e626cece8a43c2528246e0421488b468102 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 4ddaf66..00b4403 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 f895a8c..1af8664 100644
+--- a/drivers/char/mem.c
++++ b/drivers/char/mem.c
+@@ -28,6 +28,7 @@
+ #include <linux/export.h>
+ #include <linux/io.h>
+ #include <linux/aio.h>
++#include <linux/module.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -563,6 +564,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.8.4.2
+
+
+From 8771ff55273e964d707b174dd0dbe433783c0254 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 12b62f2..50647b3 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.8.4.2
+
+
+From 7d3e3db90e1b4cf33ba4a46624ae4a68f787e5fc 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 19c313b..db18ef66 100644
+--- a/drivers/platform/x86/asus-wmi.c
++++ b/drivers/platform/x86/asus-wmi.c
+@@ -1618,6 +1618,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)
+@@ -1634,6 +1637,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);
+ 
+@@ -1658,6 +1664,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.8.4.2
+
+
+From 98ebe083d75333e269730fe374cca42ac7f08a07 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 1af8664..61406c8 100644
+--- a/drivers/char/mem.c
++++ b/drivers/char/mem.c
+@@ -159,6 +159,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
+ 	unsigned long copied;
+ 	void *ptr;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (!valid_phys_addr_range(p, count))
+ 		return -EFAULT;
+ 
+@@ -497,6 +500,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.8.4.2
+
+
+From 71353d491c70b303a07b4e79c896e729a4f74978 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 54a20ff..d21d269 100644
+--- a/drivers/acpi/osl.c
++++ b/drivers/acpi/osl.c
+@@ -45,6 +45,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>
+@@ -248,7 +249,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.8.4.2
+
+
+From e0a6b0dd91460123d71784d531b9df26449940ae 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 9c97016..8ad0d38 100644
+--- a/kernel/kexec.c
++++ b/kernel/kexec.c
+@@ -32,6 +32,7 @@
+ #include <linux/vmalloc.h>
+ #include <linux/swap.h>
+ #include <linux/syscore_ops.h>
++#include <linux/module.h>
+ 
+ #include <asm/page.h>
+ #include <asm/uaccess.h>
+@@ -946,6 +947,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.8.4.2
+
+
+From c340630e68e5ed4d731d60d05ef9e2ae27080b66 Mon Sep 17 00:00:00 2001
+From: Matthew Garrett <matthew.garrett@nebula.com>
+Date: Tue, 3 Sep 2013 11:23:29 -0400
+Subject: [PATCH 09/14] uswsusp: Disable when module loading is restricted
+
+uswsusp allows a user process to dump and then restore kernel state, which
+makes it possible to avoid module loading restrictions. Prevent this when
+any restrictions have been imposed on loading modules.
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ kernel/power/user.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/kernel/power/user.c b/kernel/power/user.c
+index 98d3575..efe99de 100644
+--- a/kernel/power/user.c
++++ b/kernel/power/user.c
+@@ -24,6 +24,7 @@
+ #include <linux/console.h>
+ #include <linux/cpu.h>
+ #include <linux/freezer.h>
++#include <linux/module.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -49,6 +50,9 @@ static int snapshot_open(struct inode *inode, struct file *filp)
+ 	struct snapshot_data *data;
+ 	int error;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	lock_system_sleep();
+ 
+ 	if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
+-- 
+1.8.4.2
+
+
+From 273deda4ddec360ce67ac256b8cbdabdc5e8c51d 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 10/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 05266b5..e2bd647 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.8.4.2
+
+
+From 089166c0d42f1b82988aad4f23607deb6ee531e7 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 11/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 199f453..ec38acf 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 5216e28..2a147a3 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -1582,6 +1582,16 @@ config EFI_STUB
+ 
+ 	  See Documentation/efi-stub.txt for more information.
+ 
++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 a7677ba..4e172e9 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 */
+ 
+@@ -741,6 +742,37 @@ free_mem_map:
+ }
+ 
+ 
++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_call_phys5(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_call_phys5(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;
++}
++
++
+ /*
+  * On success we return a pointer to a boot_params structure, and NULL
+  * on failure.
+@@ -760,6 +792,10 @@ struct boot_params *efi_main(void *handle, efi_system_table_t *_table,
+ 	if (sys_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)
+ 		goto fail;
+ 
++	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 225b098..90dbfb7 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 182b3f9..ab6cc9e 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -1129,6 +1129,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 30702eb..3eb0f52 100644
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -190,6 +190,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 644c33e..92b73b1 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -3832,6 +3832,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.8.4.2
+
+
+From e9ad6bd405fa01b7dd52d8c75b9dc91ae52e131d Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer@redhat.com>
+Date: Tue, 5 Feb 2013 19:25:05 -0500
+Subject: [PATCH 12/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@redhat.com>
+---
+ 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 4e172e9..4905f4d 100644
+--- a/arch/x86/boot/compressed/eboot.c
++++ b/arch/x86/boot/compressed/eboot.c
+@@ -744,8 +744,9 @@ free_mem_map:
+ 
+ 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;
+ 
+@@ -769,6 +770,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_call_phys5(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.8.4.2
+
+
+From f9f355d5e58c1503bb7c03d92c9e89267e0f46ad Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Tue, 27 Aug 2013 13:28:43 -0400
+Subject: [PATCH 13/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 2a147a3..9e644d5 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -1583,7 +1583,8 @@ config EFI_STUB
+ 	  See Documentation/efi-stub.txt for more information.
+ 
+ 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.8.4.2
+
+
+From a30576a9db583213474b74360c5869e8882e6ed7 Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Tue, 27 Aug 2013 13:33:03 -0400
+Subject: [PATCH 14/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 ab6cc9e..99933cd 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -1131,7 +1131,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, &x86_efi_facility);
+ 		enforce_signed_modules();
++		pr_info("Secure boot enabled\n");
+ 	}
+ #endif
+ 
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index 0a819e7..0c1d367 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -657,6 +657,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
+ # ifdef CONFIG_X86
+-- 
+1.8.4.2
+

selinux-apply-different-permission-to-ptrace-child.patch

@@ -1,162 +0,0 @@
-Some applications, like gdb, are able to ptrace both children or other
-completely unrelated tasks.  We would like to be able to discern these two
-things and to be able to allow gdb to ptrace it's children, but not to be
-able to ptrace unrelated tasks for security reasons.
-
-Upstream is a bit weary of this patch as it may be incomplete.  They are
-not fundamentally opposed to the patch, I was just ask to see if I could
-flush out any needed refinement in Fedora where we already had the
-problem.  We may find that we need to emulate the YAMA non-child
-registration module in order to completely deal with 'normal' ptrace on
-a system.  At the moment however, this patch will at least let us get
-gdb working for many users in Fedora (See fedora-devel-list for a
-discussion of the current issues people are complaining about in F17
-without this)
-
----
-
- security/selinux/hooks.c            |   38 +++++++++++++++++++++++++++++++++++
- security/selinux/include/classmap.h |    2 +-
- security/selinux/include/security.h |    2 ++
- security/selinux/selinuxfs.c        |    3 ++-
- security/selinux/ss/services.c      |    3 +++
- 5 files changed, 46 insertions(+), 2 deletions(-)
-
-diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index 1a4acf4..b226f26 100644
---- a/security/selinux/hooks.c
-+++ b/security/selinux/hooks.c
-@@ -1805,6 +1805,39 @@ static inline u32 open_file_to_av(struct file *file)
- 
- /* Hook functions begin here. */
- 
-+/**
-+ * task_is_descendant - walk up a process family tree looking for a match
-+ * @parent: the process to compare against while walking up from child
-+ * @child: the process to start from while looking upwards for parent
-+ *
-+ * Returns 1 if child is a descendant of parent, 0 if not.
-+ */
-+static int task_is_descendant(struct task_struct *parent,
-+			      struct task_struct *child)
-+{
-+	int rc = 0;
-+	struct task_struct *walker = child;
-+
-+	if (!parent || !child)
-+		return 0;
-+
-+	rcu_read_lock();
-+	if (!thread_group_leader(parent))
-+		parent = rcu_dereference(parent->group_leader);
-+	while (walker->pid > 0) {
-+		if (!thread_group_leader(walker))
-+			walker = rcu_dereference(walker->group_leader);
-+		if (walker == parent) {
-+			rc = 1;
-+			break;
-+		}
-+		walker = rcu_dereference(walker->real_parent);
-+	}
-+	rcu_read_unlock();
-+
-+	return rc;
-+}
-+
- static int selinux_ptrace_access_check(struct task_struct *child,
- 				     unsigned int mode)
- {
-@@ -1820,6 +1853,9 @@ static int selinux_ptrace_access_check(struct task_struct *child,
- 		return avc_has_perm(sid, csid, SECCLASS_FILE, FILE__READ, NULL);
- 	}
- 
-+
-+	if (selinux_policycap_ptrace_child && task_is_descendant(current, child))
-+		return current_has_perm(child, PROCESS__PTRACE_CHILD);
- 	return current_has_perm(child, PROCESS__PTRACE);
- }
- 
-@@ -1831,6 +1867,8 @@ static int selinux_ptrace_traceme(struct task_struct *parent)
- 	if (rc)
- 		return rc;
- 
-+	if (selinux_policycap_ptrace_child && task_is_descendant(parent, current))
-+		return task_has_perm(parent, current, PROCESS__PTRACE_CHILD);
- 	return task_has_perm(parent, current, PROCESS__PTRACE);
- }
- 
-diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h
-index 39e678c..72c08b9 100644
---- a/security/selinux/include/classmap.h
-+++ b/security/selinux/include/classmap.h
-@@ -29,7 +29,7 @@ struct security_class_mapping secclass_map[] = {
- 	    "getattr", "setexec", "setfscreate", "noatsecure", "siginh",
- 	    "setrlimit", "rlimitinh", "dyntransition", "setcurrent",
- 	    "execmem", "execstack", "execheap", "setkeycreate",
--	    "setsockcreate", NULL } },
-+	    "setsockcreate", "ptrace_child", NULL } },
- 	{ "system",
- 	  { "ipc_info", "syslog_read", "syslog_mod",
- 	    "syslog_console", "module_request", NULL } },
-diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
-index dde2005..ac14b0a 100644
---- a/security/selinux/include/security.h
-+++ b/security/selinux/include/security.h
-@@ -68,12 +68,14 @@ extern int selinux_enabled;
- enum {
- 	POLICYDB_CAPABILITY_NETPEER,
- 	POLICYDB_CAPABILITY_OPENPERM,
-+	POLICYDB_CAPABILITY_PTRACE_CHILD,
- 	__POLICYDB_CAPABILITY_MAX
- };
- #define POLICYDB_CAPABILITY_MAX (__POLICYDB_CAPABILITY_MAX - 1)
- 
- extern int selinux_policycap_netpeer;
- extern int selinux_policycap_openperm;
-+extern int selinux_policycap_ptrace_child;
- 
- /*
-  * type_datum properties
-diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
-index 4e93f9e..3379765 100644
---- a/security/selinux/selinuxfs.c
-+++ b/security/selinux/selinuxfs.c
-@@ -44,7 +44,8 @@
- /* Policy capability filenames */
- static char *policycap_names[] = {
- 	"network_peer_controls",
--	"open_perms"
-+	"open_perms",
-+	"ptrace_child",
- };
- 
- unsigned int selinux_checkreqprot = CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE;
-diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
-index 9b7e7ed..4d12a6e 100644
---- a/security/selinux/ss/services.c
-+++ b/security/selinux/ss/services.c
-@@ -72,6 +72,7 @@
- 
- int selinux_policycap_netpeer;
- int selinux_policycap_openperm;
-+int selinux_policycap_ptrace_child;
- 
- static DEFINE_RWLOCK(policy_rwlock);
- 
-@@ -1812,6 +1813,8 @@ static void security_load_policycaps(void)
- 						  POLICYDB_CAPABILITY_NETPEER);
- 	selinux_policycap_openperm = ebitmap_get_bit(&policydb.policycaps,
- 						  POLICYDB_CAPABILITY_OPENPERM);
-+	selinux_policycap_ptrace_child = ebitmap_get_bit(&policydb.policycaps,
-+						  POLICYDB_CAPABILITY_PTRACE_CHILD);
- }
- 
- static int security_preserve_bools(struct policydb *p);
-
-
-
-
-_______________________________________________
-kernel mailing list
-kernel@lists.fedoraproject.org
-https://admin.fedoraproject.org/mailman/listinfo/kernel

selinux-put-the-mmap-DAC-controls-before-the-MAC-controls.patch

@@ -0,0 +1,94 @@
+Bugzilla: 1013466
+Upstream-status: 3.15 (commit 98883bfd9d603a2760f6d53eccfaa3ae2c053e72)
+
+It turns out that doing the SELinux MAC checks for mmap() before the
+DAC checks was causing users and the SELinux policy folks headaches
+as users were seeing a lot of SELinux AVC denials for the
+memprotect:mmap_zero permission that would have also been denied by
+the normal DAC capability checks (CAP_SYS_RAWIO).
+
+Example:
+
+ # cat mmap_test.c
+  #include <stdlib.h>
+  #include <stdio.h>
+  #include <errno.h>
+  #include <sys/mman.h>
+
+  int main(int argc, char *argv[])
+  {
+        int rc;
+        void *mem;
+
+        mem = mmap(0x0, 4096,
+                   PROT_READ | PROT_WRITE,
+                   MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+        if (mem == MAP_FAILED)
+                return errno;
+        printf("mem = %p\n", mem);
+        munmap(mem, 4096);
+
+        return 0;
+  }
+ # gcc -g -O0 -o mmap_test mmap_test.c
+ # ./mmap_test
+ mem = (nil)
+ # ausearch -m AVC | grep mmap_zero
+ type=AVC msg=audit(...): avc:  denied  { mmap_zero }
+   for pid=1025 comm="mmap_test"
+   scontext=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
+   tcontext=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
+   tclass=memprotect
+
+This patch corrects things so that when the above example is run by a
+user without CAP_SYS_RAWIO the SELinux AVC is no longer generated as
+the DAC capability check fails before the SELinux permission check.
+
+Signed-off-by: Paul Moore <pmoore@redhat.com>
+---
+ security/selinux/hooks.c |   20 ++++++++------------
+ 1 file changed, 8 insertions(+), 12 deletions(-)
+
+diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
+index 57b0b49..e3664ae 100644
+--- a/security/selinux/hooks.c
++++ b/security/selinux/hooks.c
+@@ -3205,24 +3205,20 @@ error:
+ 
+ static int selinux_mmap_addr(unsigned long addr)
+ {
+-	int rc = 0;
+-	u32 sid = current_sid();
++	int rc;
++
++	/* do DAC check on address space usage */
++	rc = cap_mmap_addr(addr);
++	if (rc)
++		return rc;
+ 
+-	/*
+-	 * notice that we are intentionally putting the SELinux check before
+-	 * the secondary cap_file_mmap check.  This is such a likely attempt
+-	 * at bad behaviour/exploit that we always want to get the AVC, even
+-	 * if DAC would have also denied the operation.
+-	 */
+ 	if (addr < CONFIG_LSM_MMAP_MIN_ADDR) {
++		u32 sid = current_sid();
+ 		rc = avc_has_perm(sid, sid, SECCLASS_MEMPROTECT,
+ 				  MEMPROTECT__MMAP_ZERO, NULL);
+-		if (rc)
+-			return rc;
+ 	}
+ 
+-	/* do DAC check on address space usage */
+-	return cap_mmap_addr(addr);
++	return rc;
+ }
+ 
+ static int selinux_mmap_file(struct file *file, unsigned long reqprot,
+
+_______________________________________________
+Selinux mailing list
+Selinux@tycho.nsa.gov
+To unsubscribe, send email to Selinux-leave@tycho.nsa.gov.
+To get help, send an email containing "help" to Selinux-request@tycho.nsa.gov.

serial-460800.patch

@@ -1,70 +0,0 @@
-diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
-index 2209620..659c1bb 100644
---- a/drivers/tty/serial/8250/8250.c
-+++ b/drivers/tty/serial/8250/8250.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);

serial-8250-Keep-8250.-xxxx-module-options-functiona.patch

@@ -1,63 +0,0 @@
-From e94256528a988231ccc7a2a0b6b206a1131cb358 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@redhat.com>
-Date: Fri, 8 Mar 2013 21:13:52 -0500
-Subject: [PATCH] serial: 8250: Keep 8250.<xxxx> module options functional
- after driver rename
-
-With commit 835d844d1 (8250_pnp: do pnp probe before legacy probe), the
-8250 driver was renamed to 8250_core.  This means any existing usage of
-the 8259.<xxxx> module parameters or as a kernel command line switch is
-now broken, as the 8250_core driver doesn't parse options belonging to
-something called "8250".
-
-To solve this, we redefine the module options in a dummy function using
-a redefined MODULE_PARAM_PREFX when built into the kernel.  In the case
-where we're building as a module, we provide an alias to the old 8250
-name.  The dummy function prevents compiler errors due to global variable
-redefinitions that happen as part of the module_param_ macro expansions.
-
-Signed-off-by: Josh Boyer <jwboyer@redhat.com>
----
- drivers/tty/serial/8250/8250.c | 29 +++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
-
-diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c
-index 0efc815..f982633 100644
---- a/drivers/tty/serial/8250/8250.c
-+++ b/drivers/tty/serial/8250/8250.c
-@@ -3396,3 +3396,32 @@ module_param_array(probe_rsa, ulong, &probe_rsa_count, 0444);
- MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA");
- #endif
- MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR);
-+
-+#ifndef MODULE
-+/* This module was renamed to 8250_core in 3.7.  Keep the old "8250" name
-+ * working as well for the module options so we don't break people.  We
-+ * need to keep the names identical and the convenient macros will happily
-+ * refuse to let us do that by failing the build with redefinition errors
-+ * of global variables.  So we stick them inside a dummy function to avoid
-+ * those conflicts.  The options still get parsed, and the redefined
-+ * MODULE_PARAM_PREFIX lets us keep the "8250." syntax alive.
-+ *
-+ * This is hacky.  I'm sorry.
-+ */
-+static void __used s8250_options(void)
-+{
-+#undef MODULE_PARAM_PREFIX
-+#define MODULE_PARAM_PREFIX "8250."
-+
-+	module_param_cb(share_irqs, &param_ops_uint, &share_irqs, 0644);
-+	module_param_cb(nr_uarts, &param_ops_uint, &nr_uarts, 0644);
-+	module_param_cb(skip_txen_test, &param_ops_uint, &skip_txen_test, 0644);
-+#ifdef CONFIG_SERIAL_8250_RSA
-+	__module_param_call(MODULE_PARAM_PREFIX, probe_rsa,
-+		&param_array_ops, .arr = &__param_arr_probe_rsa,
-+		0444, -1);
-+#endif
-+}
-+#else
-+MODULE_ALIAS("8250");
-+#endif
--- 
-1.8.1.2
-

silence-acpi-blacklist.patch

@@ -1,25 +0,0 @@
-diff -up linux-2.6.26.noarch/drivers/acpi/blacklist.c.jx linux-2.6.26.noarch/drivers/acpi/blacklist.c
---- linux-2.6.26.noarch/drivers/acpi/blacklist.c.jx	2008-07-13 17:51:29.000000000 -0400
-+++ linux-2.6.26.noarch/drivers/acpi/blacklist.c	2008-08-12 14:21:39.000000000 -0400
-@@ -81,18 +81,18 @@ static int __init blacklist_by_year(void
- 
- 	/* Doesn't exist? Likely an old system */
- 	if (!dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL)) {
--		printk(KERN_ERR PREFIX "no DMI BIOS year, "
-+		printk(KERN_INFO PREFIX "no DMI BIOS year, "
- 			"acpi=force is required to enable ACPI\n" );
- 		return 1;
- 	}
- 	/* 0? Likely a buggy new BIOS */
- 	if (year == 0) {
--		printk(KERN_ERR PREFIX "DMI BIOS year==0, "
-+		printk(KERN_INFO PREFIX "DMI BIOS year==0, "
- 			"assuming ACPI-capable machine\n" );
- 		return 0;
- 	}
- 	if (year < CONFIG_ACPI_BLACKLIST_YEAR) {
--		printk(KERN_ERR PREFIX "BIOS age (%d) fails cutoff (%d), "
-+		printk(KERN_INFO PREFIX "BIOS age (%d) fails cutoff (%d), "
- 		       "acpi=force is required to enable ACPI\n",
- 		       year, CONFIG_ACPI_BLACKLIST_YEAR);
- 		return 1;

silence-noise.patch

@@ -7,28 +7,20 @@ 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.
 ---
- drivers/input/serio/i8042.c |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
 diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
-index 170f71e..4f3e632 100644
+index 52c9ebf..c374a96 100644
 --- a/drivers/input/serio/i8042.c
 +++ b/drivers/input/serio/i8042.c
-@@ -701,10 +701,8 @@ static int __devinit i8042_check_aux(void)
- 
+@@ -855,7 +855,6 @@ static int __init i8042_check_aux(void)
  static int i8042_controller_check(void)
  {
--	if (i8042_flush() == I8042_BUFFER_SIZE) {
+ 	if (i8042_flush()) {
 -		pr_err("No controller found\n");
-+	if (i8042_flush() == I8042_BUFFER_SIZE)
  		return -ENODEV;
--	}
- 
- 	return 0;
- }
--- 
-1.6.0.1
+ 	}
 
+--
+ 
 Socket fuzzers like sfuzz will trigger this printk a lot, even though it's
 ratelimited. It isn't particularly useful, so just remove it.
 

sources

@@ -1,2 +1,2 @@
-1c738edfc54e7c65faeb90c436104e2f  linux-3.8.tar.xz
-519f8799f8cf9aae2f05ba8fadc43bd1  patch-3.9-rc2.xz
+b621207b3f6ecbb67db18b13258f8ea8  linux-3.14.tar.xz
+d79fd9ea62b9c9dd3c17ed7651a9e408  patch-3.14.27.xz

sysrq-secure-boot.patch

@@ -0,0 +1,250 @@
+Bugzilla: N/A
+Upstream-status: Fedora mustard
+
+From 29c1f71a2d0845a71ea2ebd2fb33542373dc52dd 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
+
+---
+ arch/x86/kernel/setup.c     | 36 ++++++++++++++++++++++++++++++++++++
+ drivers/input/misc/uinput.c |  1 +
+ drivers/tty/sysrq.c         | 19 +++++++++++++------
+ include/linux/input.h       |  5 +++++
+ include/linux/sysrq.h       |  8 +++++++-
+ kernel/debug/kdb/kdb_main.c |  2 +-
+ kernel/module.c             |  4 ++--
+ 7 files changed, 65 insertions(+), 10 deletions(-)
+
+diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
+index c773add..92c480c 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -70,6 +70,11 @@
+ #include <linux/tboot.h>
+ #include <linux/jiffies.h>
+ 
++#include <linux/fips.h>
++#include <linux/cred.h>
++#include <linux/sysrq.h>
++#include <linux/init_task.h>
++
+ #include <video/edid.h>
+ 
+ #include <asm/mtrr.h>
+@@ -1275,6 +1280,37 @@ void __init i386_reserve_resources(void)
+ 
+ #endif /* CONFIG_X86_32 */
+ 
++#ifdef CONFIG_MAGIC_SYSRQ
++#ifdef CONFIG_MODULE_SIG
++extern bool sig_enforce;
++#endif
++
++static void sysrq_handle_secure_boot(int key)
++{
++	if (!efi_enabled(EFI_SECURE_BOOT))
++		return;
++
++	pr_info("Secure boot disabled\n");
++#ifdef CONFIG_MODULE_SIG
++	sig_enforce = fips_enabled;
++#endif
++}
++static struct sysrq_key_op secure_boot_sysrq_op = {
++	.handler	=	sysrq_handle_secure_boot,
++	.help_msg	=	"unSB(x)",
++	.action_msg	=	"Disabling Secure Boot restrictions",
++	.enable_mask	=	SYSRQ_DISABLE_USERSPACE,
++};
++static int __init secure_boot_sysrq(void)
++{
++	if (efi_enabled(EFI_SECURE_BOOT))
++		register_sysrq_key('x', &secure_boot_sysrq_op);
++	return 0;
++}
++late_initcall(secure_boot_sysrq);
++#endif /*CONFIG_MAGIC_SYSRQ*/
++
++
+ static struct notifier_block kernel_offset_notifier = {
+ 	.notifier_call = dump_kernel_offset
+ };
+diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
+index 7728359..a3e8ba8 100644
+--- a/drivers/input/misc/uinput.c
++++ b/drivers/input/misc/uinput.c
+@@ -351,6 +351,7 @@ static int uinput_allocate_device(struct uinput_device *udev)
+ 	if (!udev->dev)
+ 		return -ENOMEM;
+ 
++	udev->dev->flags |= INPUTDEV_FLAGS_SYNTHETIC;
+ 	udev->dev->event = uinput_dev_event;
+ 	input_set_drvdata(udev->dev, udev);
+ 
+diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
+index ce396ec..aee594a 100644
+--- a/drivers/tty/sysrq.c
++++ b/drivers/tty/sysrq.c
+@@ -462,6 +462,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
+ 	&sysrq_showstate_blocked_op,	/* w */
+ 	/* x: May be registered on ppc/powerpc for xmon */
+ 	/* x: May be registered on sparc64 for global PMU dump */
++	/* x: May be registered on x86_64 for disabling secure boot */
+ 	NULL,				/* x */
+ 	/* y: May be registered on sparc64 for global register dump */
+ 	NULL,				/* y */
+@@ -505,7 +506,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
+                 sysrq_key_table[i] = op_p;
+ }
+ 
+-void __handle_sysrq(int key, bool check_mask)
++void __handle_sysrq(int key, int from)
+ {
+ 	struct sysrq_key_op *op_p;
+ 	int orig_log_level;
+@@ -525,11 +526,15 @@ void __handle_sysrq(int key, bool check_mask)
+ 
+         op_p = __sysrq_get_key_op(key);
+         if (op_p) {
++		/* Ban synthetic events from some sysrq functionality */
++		if ((from == SYSRQ_FROM_PROC || from == SYSRQ_FROM_SYNTHETIC) &&
++		    op_p->enable_mask & SYSRQ_DISABLE_USERSPACE)
++			printk("This sysrq operation is disabled from userspace.\n");
+ 		/*
+ 		 * Should we check for enabled operations (/proc/sysrq-trigger
+ 		 * should not) and is the invoked operation enabled?
+ 		 */
+-		if (!check_mask || sysrq_on_mask(op_p->enable_mask)) {
++		if (from == SYSRQ_FROM_KERNEL || sysrq_on_mask(op_p->enable_mask)) {
+ 			printk("%s\n", op_p->action_msg);
+ 			console_loglevel = orig_log_level;
+ 			op_p->handler(key);
+@@ -560,7 +565,7 @@ void __handle_sysrq(int key, bool check_mask)
+ void handle_sysrq(int key)
+ {
+ 	if (sysrq_on())
+-		__handle_sysrq(key, true);
++		__handle_sysrq(key, SYSRQ_FROM_KERNEL);
+ }
+ EXPORT_SYMBOL(handle_sysrq);
+ 
+@@ -640,7 +645,7 @@ static void sysrq_do_reset(unsigned long _state)
+ static void sysrq_handle_reset_request(struct sysrq_state *state)
+ {
+ 	if (state->reset_requested)
+-		__handle_sysrq(sysrq_xlate[KEY_B], false);
++		__handle_sysrq(sysrq_xlate[KEY_B], SYSRQ_FROM_KERNEL);
+ 
+ 	if (sysrq_reset_downtime_ms)
+ 		mod_timer(&state->keyreset_timer,
+@@ -791,8 +796,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq,
+ 
+ 	default:
+ 		if (sysrq->active && value && value != 2) {
++			int from = sysrq->handle.dev->flags & INPUTDEV_FLAGS_SYNTHETIC ?
++					SYSRQ_FROM_SYNTHETIC : 0;
+ 			sysrq->need_reinject = false;
+-			__handle_sysrq(sysrq_xlate[code], true);
++			__handle_sysrq(sysrq_xlate[code], from);
+ 		}
+ 		break;
+ 	}
+@@ -1080,7 +1087,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
+ 
+ 		if (get_user(c, buf))
+ 			return -EFAULT;
+-		__handle_sysrq(c, false);
++		__handle_sysrq(c, SYSRQ_FROM_PROC);
+ 	}
+ 
+ 	return count;
+diff --git a/include/linux/input.h b/include/linux/input.h
+index 82ce323..9e534f2 100644
+--- a/include/linux/input.h
++++ b/include/linux/input.h
+@@ -42,6 +42,7 @@ struct input_value {
+  * @phys: physical path to the device in the system hierarchy
+  * @uniq: unique identification code for the device (if device has it)
+  * @id: id of the device (struct input_id)
++ * @flags: input device flags (SYNTHETIC, etc.)
+  * @propbit: bitmap of device properties and quirks
+  * @evbit: bitmap of types of events supported by the device (EV_KEY,
+  *	EV_REL, etc.)
+@@ -124,6 +125,8 @@ struct input_dev {
+ 	const char *uniq;
+ 	struct input_id id;
+ 
++	unsigned int flags;
++
+ 	unsigned long propbit[BITS_TO_LONGS(INPUT_PROP_CNT)];
+ 
+ 	unsigned long evbit[BITS_TO_LONGS(EV_CNT)];
+@@ -190,6 +193,8 @@ struct input_dev {
+ };
+ #define to_input_dev(d) container_of(d, struct input_dev, dev)
+ 
++#define	INPUTDEV_FLAGS_SYNTHETIC	0x000000001
++
+ /*
+  * Verify that we are in sync with input_device_id mod_devicetable.h #defines
+  */
+diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
+index 387fa7d..4b07e30 100644
+--- a/include/linux/sysrq.h
++++ b/include/linux/sysrq.h
+@@ -28,6 +28,8 @@
+ #define SYSRQ_ENABLE_BOOT	0x0080
+ #define SYSRQ_ENABLE_RTNICE	0x0100
+ 
++#define SYSRQ_DISABLE_USERSPACE	0x00010000
++
+ struct sysrq_key_op {
+ 	void (*handler)(int);
+ 	char *help_msg;
+@@ -42,8 +44,12 @@ struct sysrq_key_op {
+  * are available -- else NULL's).
+  */
+ 
++#define SYSRQ_FROM_KERNEL	0x0001
++#define SYSRQ_FROM_PROC		0x0002
++#define SYSRQ_FROM_SYNTHETIC	0x0004
++
+ void handle_sysrq(int key);
+-void __handle_sysrq(int key, bool check_mask);
++void __handle_sysrq(int key, int from);
+ int register_sysrq_key(int key, struct sysrq_key_op *op);
+ 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 0b097c8..18b400d 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)
+ 	if (argc != 1)
+ 		return KDB_ARGCOUNT;
+ 	kdb_trap_printk++;
+-	__handle_sysrq(*argv[1], false);
++	__handle_sysrq(*argv[1], SYSRQ_FROM_KERNEL);
+ 	kdb_trap_printk--;
+ 
+ 	return 0;
+diff --git a/kernel/module.c b/kernel/module.c
+index 92b73b1..a44fb2a 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 */
+ 
+ #ifdef CONFIG_MODULE_SIG
+ #ifdef CONFIG_MODULE_SIG_FORCE
+-static bool sig_enforce = true;
++bool sig_enforce = true;
+ #else
+-static bool sig_enforce = false;
++bool sig_enforce = false;
+ 
+ static int param_set_bool_enable_only(const char *val,
+ 				      const struct kernel_param *kp)
+-- 
+1.8.4.2
+

taint-vbox.patch

@@ -1,15 +0,0 @@
-diff --git a/kernel/module.c b/kernel/module.c
-index 921bed4..382414e 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -2873,6 +2873,10 @@ static int check_module_license_and_versions(struct module *mod)
- 	if (strcmp(mod->name, "ndiswrapper") == 0)
- 		add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_NOW_UNRELIABLE);
- 
-+	/* vbox is garbage. */
-+	if (strcmp(mod->name, "vboxdrv") == 0)
-+		add_taint(TAINT_CRAP, LOCKDEP_NOW_UNRELIABLE);
-+
- 	/* driverloader was caught wrongly pretending to be under GPL */
- 	if (strcmp(mod->name, "driverloader") == 0)
- 		add_taint_module(mod, TAINT_PROPRIETARY_MODULE,

vmbugon-warnon.patch

@@ -1,20 +0,0 @@
-diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h
-index 580bd58..3d908e9 100644
---- a/include/linux/mmdebug.h
-+++ b/include/linux/mmdebug.h
-@@ -2,13 +2,13 @@
- #define LINUX_MM_DEBUG_H 1
- 
- #ifdef CONFIG_DEBUG_VM
--#define VM_BUG_ON(cond) BUG_ON(cond)
-+#define VM_BUG_ON(cond) WARN_ON(cond)
- #else
- #define VM_BUG_ON(cond) BUILD_BUG_ON_INVALID(cond)
- #endif
- 
- #ifdef CONFIG_DEBUG_VIRTUAL
--#define VIRTUAL_BUG_ON(cond) BUG_ON(cond)
-+#define VIRTUAL_BUG_ON(cond) WARN_ON(cond)
- #else
- #define VIRTUAL_BUG_ON(cond) do { } while (0)
- #endif

vt-Drop-K_OFF-for-VC_MUTE.patch

@@ -1,250 +0,0 @@
-Path: news.gmane.org!not-for-mail
-From: Adam Jackson <ajax@redhat.com>
-Newsgroups: gmane.linux.kernel
-Subject: [PATCH] vt: Drop K_OFF for VC_MUTE
-Date: Fri, 16 Nov 2012 13:32:34 -0500
-Lines: 205
-Approved: news@gmane.org
-Message-ID: <1353090754-30233-1-git-send-email-ajax@redhat.com>
-NNTP-Posting-Host: plane.gmane.org
-X-Trace: ger.gmane.org 1353090772 20663 80.91.229.3 (16 Nov 2012 18:32:52 GMT)
-X-Complaints-To: usenet@ger.gmane.org
-NNTP-Posting-Date: Fri, 16 Nov 2012 18:32:52 +0000 (UTC)
-Cc: Arthur Taylor <art@ified.ca>,
-	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-To: linux-kernel@vger.kernel.org
-Original-X-From: linux-kernel-owner@vger.kernel.org Fri Nov 16 19:33:03 2012
-Return-path: <linux-kernel-owner@vger.kernel.org>
-Envelope-to: glk-linux-kernel-3@plane.gmane.org
-Original-Received: from vger.kernel.org ([209.132.180.67])
-	by plane.gmane.org with esmtp (Exim 4.69)
-	(envelope-from <linux-kernel-owner@vger.kernel.org>)
-	id 1TZQim-0000aG-BI
-	for glk-linux-kernel-3@plane.gmane.org; Fri, 16 Nov 2012 19:32:56 +0100
-Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1753232Ab2KPSck (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
-	Fri, 16 Nov 2012 13:32:40 -0500
-Original-Received: from mx1.redhat.com ([209.132.183.28]:32172 "EHLO mx1.redhat.com"
-	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
-	id S1752810Ab2KPSci (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
-	Fri, 16 Nov 2012 13:32:38 -0500
-Original-Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
-	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAGIWaM7020116
-	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
-	Fri, 16 Nov 2012 13:32:36 -0500
-Original-Received: from ihatethathostname.lab.bos.redhat.com (ihatethathostname.lab.bos.redhat.com [10.16.43.238])
-	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAGIWZD7010099;
-	Fri, 16 Nov 2012 13:32:35 -0500
-X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
-Original-Sender: linux-kernel-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List: linux-kernel@vger.kernel.org
-Xref: news.gmane.org gmane.linux.kernel:1395620
-Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1395620>
-
-The "don't enqueue stuff" semantics of K_OFF shouldn't be a function of
-the keyboard map state; we should be able to switch among cooked/raw/
-unicode without changing whether events are delivered.  Otherwise - if
-changing to K_UNICODE undoes K_OFF - then suddenly Alt-F2 under
-Gnome will switch VT instead of summoning the "run command" dialog.
-
-Drop the K_OFF handling and replace it with a new "mute" ioctl pair.
-Anybody using K_OFF would already need to be prepared to handle it
-throwing -EINVAL for old kernel compatibility, so userspace will degrade
-gracefully.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=859485
-Cc: Arthur Taylor <art@ified.ca>
-Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Tested-by: Josh Boyer <jwboyer@redhat.com>
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- drivers/tty/vt/keyboard.c | 40 +++++++++++++++++++++++++++++++++-------
- drivers/tty/vt/vt_ioctl.c | 13 +++++++++++++
- include/linux/kbd_kern.h  |  6 +++---
- include/linux/vt_kern.h   |  2 ++
- include/uapi/linux/kd.h   |  5 +++++
- 5 files changed, 56 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
-index 681765b..08d1d57 100644
---- a/drivers/tty/vt/keyboard.c
-+++ b/drivers/tty/vt/keyboard.c
-@@ -657,7 +657,7 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
- 		return;
- 	if ((kbd->kbdmode == VC_RAW ||
- 	     kbd->kbdmode == VC_MEDIUMRAW ||
--	     kbd->kbdmode == VC_OFF) &&
-+	     vc_kbd_mode(kbd, VC_MUTE)) &&
- 	     value != KVAL(K_SAK))
- 		return;		/* SAK is allowed even in raw mode */
- 	fn_handler[value](vc);
-@@ -1381,7 +1381,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
- 	if (rc == NOTIFY_STOP)
- 		return;
- 
--	if ((raw_mode || kbd->kbdmode == VC_OFF) && type != KT_SPEC && type != KT_SHIFT)
-+	if ((raw_mode || vc_kbd_mode(kbd, VC_MUTE)) && type != KT_SPEC && type != KT_SHIFT)
- 		return;
- 
- 	(*k_handler[type])(vc, keysym & 0xff, !down);
-@@ -1731,9 +1731,6 @@ int vt_do_kdskbmode(int console, unsigned int arg)
- 		kbd->kbdmode = VC_UNICODE;
- 		do_compute_shiftstate();
- 		break;
--	case K_OFF:
--		kbd->kbdmode = VC_OFF;
--		break;
- 	default:
- 		ret = -EINVAL;
- 	}
-@@ -1742,6 +1739,30 @@ int vt_do_kdskbmode(int console, unsigned int arg)
- }
- 
- /**
-+ *	vt_do_kdskbmute		-	set keyboard event mute
-+ *	@console: the console to use
-+ *	@arg: the requested mode
-+ *
-+ *	Update the keyboard mute state while holding the correct locks.
-+ *	Return 0 for success or an error code.
-+ */
-+int vt_do_kdskbmute(int console, unsigned int arg)
-+{
-+	struct kbd_struct * kbd = kbd_table + console;
-+	int ret = 0;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&kbd_event_lock, flags);
-+	if (arg)
-+		set_vc_kbd_mode(kbd, VC_MUTE);
-+	else
-+		clr_vc_kbd_mode(kbd, VC_MUTE);
-+	spin_unlock_irqrestore(&kbd_event_lock, flags);
-+	return ret;
-+}
-+
-+
-+/**
-  *	vt_do_kdskbmeta		-	set keyboard meta state
-  *	@console: the console to use
-  *	@arg: the requested meta state
-@@ -2068,13 +2089,18 @@ int vt_do_kdgkbmode(int console)
- 		return K_MEDIUMRAW;
- 	case VC_UNICODE:
- 		return K_UNICODE;
--	case VC_OFF:
--		return K_OFF;
- 	default:
- 		return K_XLATE;
- 	}
- }
- 
-+int vt_do_kdgkbmute(int console)
-+{
-+	struct kbd_struct * kbd = kbd_table + console;
-+	/* This is a spot read so needs no locking */
-+	return vc_kbd_mode(kbd, VC_MUTE);
-+}
-+
- /**
-  *	vt_do_kdgkbmeta		-	report meta status
-  *	@console: console to report
-diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
-index b841f56..f0951e2 100644
---- a/drivers/tty/vt/vt_ioctl.c
-+++ b/drivers/tty/vt/vt_ioctl.c
-@@ -477,6 +477,19 @@ int vt_ioctl(struct tty_struct *tty,
- 		ret = put_user(uival, (int __user *)arg);
- 		break;
- 
-+	case KDSKBMUTE:
-+		if (!perm)
-+			return -EPERM;
-+		ret = vt_do_kdskbmute(console, arg);
-+		if (ret == 0)
-+			tty_ldisc_flush(tty);
-+		break;
-+
-+	case KDGKBMUTE:
-+		uival = vt_do_kdgkbmute(console);
-+		ret = put_user(uival, (int __user *)arg);
-+		break;
-+
- 	/* this could be folded into KDSKBMODE, but for compatibility
- 	   reasons it is not so easy to fold KDGKBMETA into KDGKBMODE */
- 	case KDSKBMETA:
-diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h
-index b7c8cdc..9386143 100644
---- a/include/linux/kbd_kern.h
-+++ b/include/linux/kbd_kern.h
-@@ -48,19 +48,19 @@ struct kbd_struct {
- #define VC_CAPSLOCK	2	/* capslock mode */
- #define VC_KANALOCK	3	/* kanalock mode */
- 
--	unsigned char kbdmode:3;	/* one 3-bit value */
-+	unsigned char kbdmode:2;	/* one 2-bit value */
- #define VC_XLATE	0	/* translate keycodes using keymap */
- #define VC_MEDIUMRAW	1	/* medium raw (keycode) mode */
- #define VC_RAW		2	/* raw (scancode) mode */
- #define VC_UNICODE	3	/* Unicode mode */
--#define VC_OFF		4	/* disabled mode */
- 
--	unsigned char modeflags:5;
-+	unsigned char modeflags:6;
- #define VC_APPLIC	0	/* application key mode */
- #define VC_CKMODE	1	/* cursor key mode */
- #define VC_REPEAT	2	/* keyboard repeat */
- #define VC_CRLF		3	/* 0 - enter sends CR, 1 - enter sends CRLF */
- #define VC_META		4	/* 0 - meta, 1 - meta=prefix with ESC */
-+#define VC_MUTE		5	/* don't generate events */
- };
- 
- extern int kbd_init(void);
-diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
-index 50ae7d0..a886915 100644
---- a/include/linux/vt_kern.h
-+++ b/include/linux/vt_kern.h
-@@ -168,6 +168,7 @@ extern void hide_boot_cursor(bool hide);
- 
- /* keyboard  provided interfaces */
- extern int vt_do_diacrit(unsigned int cmd, void __user *up, int eperm);
-+extern int vt_do_kdskbmute(int console, unsigned int arg);
- extern int vt_do_kdskbmode(int console, unsigned int arg);
- extern int vt_do_kdskbmeta(int console, unsigned int arg);
- extern int vt_do_kbkeycode_ioctl(int cmd, struct kbkeycode __user *user_kbkc,
-@@ -177,6 +178,7 @@ extern int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe,
- extern int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb,
-                                         int perm);
- extern int vt_do_kdskled(int console, int cmd, unsigned long arg, int perm);
-+extern int vt_do_kdgkbmute(int console);
- extern int vt_do_kdgkbmode(int console);
- extern int vt_do_kdgkbmeta(int console);
- extern void vt_reset_unicode(int console);
-diff --git a/include/uapi/linux/kd.h b/include/uapi/linux/kd.h
-index 87b7cc4..c3de63c 100644
---- a/include/uapi/linux/kd.h
-+++ b/include/uapi/linux/kd.h
-@@ -81,6 +81,7 @@ struct unimapinit {
- #define		K_XLATE		0x01
- #define		K_MEDIUMRAW	0x02
- #define		K_UNICODE	0x03
-+/* K_OFF is no longer implemented, but preserved for source compatibility */
- #define		K_OFF		0x04
- #define KDGKBMODE	0x4B44	/* gets current keyboard mode */
- #define KDSKBMODE	0x4B45	/* sets current keyboard mode */
-@@ -150,6 +151,10 @@ struct kbd_repeat {
- 			/* earlier this field was misnamed "rate" */
- };
- 
-+/* get/set event mute */
-+#define KDGKBMUTE	0x4B50
-+#define KDSKBMUTE	0x4B51
-+
- #define KDKBDREP        0x4B52  /* set keyboard delay/repeat rate;
- 				 * actually used values are returned */
- 
--- 
-1.7.11.7
-

w1-fix-oops-when-w1_search-is-called-from.patch

@@ -1,111 +0,0 @@
-                                                                                                                                                                                                                                                               
-Delivered-To: jwboyer@gmail.com
-Received: by 10.101.212.35 with SMTP id o35csp6769anq;
-        Sat, 2 Mar 2013 05:50:51 -0800 (PST)
-X-Received: by 10.68.137.42 with SMTP id qf10mr19122124pbb.80.1362232251119;
-        Sat, 02 Mar 2013 05:50:51 -0800 (PST)
-Return-Path: <linux-kernel-owner@vger.kernel.org>
-Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
-        by mx.google.com with ESMTP id pu7si8560937pbc.232.2013.03.02.05.50.50;
-        Sat, 02 Mar 2013 05:50:51 -0800 (PST)
-Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
-Authentication-Results: mx.google.com;
-       spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mail=linux-kernel-owner@vger.kernel.org;
-       dkim=neutral (body hash did not verify) header.i=@gmail.com
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-	id S1752198Ab3CBNuU (ORCPT <rfc822;bloodsquadron@gmail.com>
-	+ 99 others); Sat, 2 Mar 2013 08:50:20 -0500
-Received: from mail-ee0-f48.google.com ([74.125.83.48]:46431 "EHLO
-	mail-ee0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1752038Ab3CBNuT (ORCPT
-	<rfc822;linux-kernel@vger.kernel.org>);
-	Sat, 2 Mar 2013 08:50:19 -0500
-Received: by mail-ee0-f48.google.com with SMTP id t10so2921534eei.7
-        for <linux-kernel@vger.kernel.org>; Sat, 02 Mar 2013 05:50:18 -0800 (PST)
-DKIM-Signature:	v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20120113;
-        h=x-received:date:from:to:cc:subject:message-id:references
-         :mime-version:content-type:content-disposition:in-reply-to
-         :user-agent;
-        bh=8ABPYEMGQsyhtGtpdGpnD1kQchBrqYm9rJ3sEUcIQOc=;
-        b=hx/4GjbvaME9C3c+WOrfUkkwnJ5jJXefsOhCKmPCE8kmswk3Tvm11198r4+y1jM/Bl
-         1wtIYby6sFgA08JUldm09fPpsKfbdeDnFAI5WmUAGJjahFXXRrQPocI6E0+s2BcM+t3H
-         Ii8g8ZvYJ+YMgbbSmp7mwMv98aa0+qdY6TIF4P/wNwAWrsjFh5TBgc/QyB0MzyQQ2tMp
-         LfA7n/2sH11vofS6FLSaWhtwGIIexPZ+oxWpvwBcCIYX+gTrSHPZqnLQkvhQ5oZDx7WF
-         6QlNEqlmL+usW1ApRCAwcL4jOaORDAC2MytGH4jdZNic0PqdzonfbJTRE6YmZ45FHtNG
-         l+6w==
-X-Received: by 10.15.101.204 with SMTP id bp52mr38431150eeb.31.1362232218031;
-        Sat, 02 Mar 2013 05:50:18 -0800 (PST)
-Received: from gmail.com (aek101.neoplus.adsl.tpnet.pl. [83.25.114.101])
-        by mx.google.com with ESMTPS id o3sm22363368eem.15.2013.03.02.05.50.16
-        (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
-        Sat, 02 Mar 2013 05:50:17 -0800 (PST)
-Date:	Sat, 2 Mar 2013 14:50:15 +0100
-From:	Marcin Jurkowski <marcin1j@gmail.com>
-To:	Sven Geggus <lists@fuchsschwanzdomain.de>
-Cc:	Evgeniy Polyakov <zbr@ioremap.net>, linux-kernel@vger.kernel.org
-Subject: [PATCH 1/1] w1: fix oops when w1_search is called from netlink
- connector
-Message-ID: <20130302135015.GA21448@gmail.com>
-References: <20130116141627.GA23638@ioremap.net>
- <20130302001103.GB18026@gmail.com>
- <20130302094510.GA4695@geggus.net>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-In-Reply-To: <20130302094510.GA4695@geggus.net>
-User-Agent: Mutt/1.5.21 (2010-09-15)
-Sender:	linux-kernel-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List:	linux-kernel@vger.kernel.org
-
-On Sat, Mar 02, 2013 at 10:45:10AM +0100, Sven Geggus wrote:
-> This is the bad commit I found doing git bisect:
-> 04f482faf50535229a5a5c8d629cf963899f857c is the first bad commit
-> commit 04f482faf50535229a5a5c8d629cf963899f857c
-> Author: Patrick McHardy <kaber@trash.net>
-> Date:   Mon Mar 28 08:39:36 2011 +0000
-
-Good job. I was too lazy to bisect for bad commit;)
-
-Reading the code I found problematic kthread_should_stop call from netlink 
-connector which causes the oops. After applying a patch, I've been testing 
-owfs+w1 setup for nearly two days and it seems to work very reliable (no 
-hangs, no memleaks etc).
-More detailed description and possible fix is given below:
-
-Function w1_search can be called from either kthread or netlink callback.
-While the former works fine, the latter causes oops due to kthread_should_stop
-invocation.
-
-This patch adds a check if w1_search is serving netlink command, skipping
-kthread_should_stop invocation if so.
-
-Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
----
- drivers/w1/w1.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
-index 7994d933..7e2220d 100644
---- a/drivers/w1/w1.c
-+++ b/drivers/w1/w1.c
-@@ -924,7 +924,8 @@ void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb
- 			tmp64 = (triplet_ret >> 2);
- 			rn |= (tmp64 << i);
- 
--			if (kthread_should_stop()) {
-+			/* ensure we're called from kthread and not by netlink callback */
-+			if (!dev->priv && kthread_should_stop()) {
- 				mutex_unlock(&dev->bus_mutex);
- 				dev_dbg(&dev->dev, "Abort w1_search\n");
- 				return;
--- 
-1.7.12.4
-
---
-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/

x86-fpu-amd-clear-exceptions-in-amd-fxsave-workaround.patch

@@ -0,0 +1,48 @@
+Bugzilla: 1053599
+Upstream-status: 3.13 and 3.12.8
+
+From 26bef1318adc1b3a530ecc807ef99346db2aa8b0 Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Sat, 11 Jan 2014 19:15:52 -0800
+Subject: x86, fpu, amd: Clear exceptions in AMD FXSAVE workaround
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit 26bef1318adc1b3a530ecc807ef99346db2aa8b0 upstream.
+
+Before we do an EMMS in the AMD FXSAVE information leak workaround we
+need to clear any pending exceptions, otherwise we trap with a
+floating-point exception inside this code.
+
+Reported-by: halfdog <me@halfdog.net>
+Tested-by: Borislav Petkov <bp@suse.de>
+Link: http://lkml.kernel.org/r/CA%2B55aFxQnY_PCG_n4=0w-VG=YLXL-yr7oMxyy0WU2gCBAf3ydg@mail.gmail.com
+Signed-off-by: H. Peter Anvin <hpa@zytor.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/include/asm/fpu-internal.h |   13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+--- a/arch/x86/include/asm/fpu-internal.h
++++ b/arch/x86/include/asm/fpu-internal.h
+@@ -293,12 +293,13 @@ static inline int restore_fpu_checking(s
+ 	/* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception
+ 	   is pending.  Clear the x87 state here by setting it to fixed
+ 	   values. "m" is a random variable that should be in L1 */
+-	alternative_input(
+-		ASM_NOP8 ASM_NOP2,
+-		"emms\n\t"		/* clear stack tags */
+-		"fildl %P[addr]",	/* set F?P to defined value */
+-		X86_FEATURE_FXSAVE_LEAK,
+-		[addr] "m" (tsk->thread.fpu.has_fpu));
++	if (unlikely(static_cpu_has(X86_FEATURE_FXSAVE_LEAK))) {
++		asm volatile(
++			"fnclex\n\t"
++			"emms\n\t"
++			"fildl %P[addr]"	/* set F?P to defined value */
++			: : [addr] "m" (tsk->thread.fpu.has_fpu));
++	}
+ 
+ 	return fpu_restore_checking(&tsk->thread.fpu);
+ }

x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch

@@ -1,48 +0,0 @@
-From:	Samu Kallio <>
-Subject: [PATCH] x86: mm: Fix vmalloc_fault oops during lazy MMU updates.
-Date: Sun, 17 Feb 2013 04:35:52 +0200
-
-In paravirtualized x86_64 kernels, vmalloc_fault may cause an oops
-when lazy MMU updates are enabled, because set_pgd effects are being
-deferred.
-
-One instance of this problem is during process mm cleanup with memory
-cgroups enabled. The chain of events is as follows:
-
-- zap_pte_range enables lazy MMU updates
-- zap_pte_range eventually calls mem_cgroup_charge_statistics,
-  which accesses the vmalloc'd mem_cgroup per-cpu stat area
-- vmalloc_fault is triggered which tries to sync the corresponding
-  PGD entry with set_pgd, but the update is deferred
-- vmalloc_fault oopses due to a mismatch in the PUD entries
-
-Calling arch_flush_lazy_mmu_mode immediately after set_pgd makes the
-changes visible to the consistency checks.
-
-Signed-off-by: Samu Kallio <samu.kallio@aberdeencloud.com>
----
- arch/x86/mm/fault.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
-index 8e13ecb..0a45298 100644
---- a/arch/x86/mm/fault.c
-+++ b/arch/x86/mm/fault.c
-@@ -378,10 +378,12 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
- 	if (pgd_none(*pgd_ref))
- 		return -1;
- 
--	if (pgd_none(*pgd))
-+	if (pgd_none(*pgd)) {
- 		set_pgd(pgd, *pgd_ref);
--	else
-+		arch_flush_lazy_mmu_mode();
-+	} else {
- 		BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
-+	}
- 
- 	/*
- 	 * Below here mismatches are bugs because these lower tables
--- 
-1.8.1.3
-
-