Backport btrfs fixes queued for stable (rhbz 1217191)

This went upstream as commit 3295d73002f4be341069a000aec4b8d7e5ea8d2c in 4.0-rc1

.gitignore

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

0001-HID-usbhid-Add-HID_QUIRK_NOGET-for-Aten-DVI-KVM-swit.patch

@@ -0,0 +1,52 @@
+From 25c1b8af5b11bd1dbd17d0c1212586bb56ec4efd Mon Sep 17 00:00:00 2001
+From: Laura Abbott <labbott@fedoraproject.org>
+Date: Fri, 8 May 2015 14:13:56 -0700
+Subject: [PATCH] HID: usbhid: Add HID_QUIRK_NOGET for Aten DVI KVM switch
+To: Jiri Kosina <jkosina@suse.cz>
+Cc: linux-input@vger.kernel.org
+Cc: linux-kernel@vger.kernel.org
+Cc: linux-usb@vger.kernel.org
+Cc: stephane.tranchemer@devinci.fr
+
+Like other KVM switches, the Aten DVI KVM switch needs a
+quirk to avoid spewing errors:
+
+[791759.606542] usb 1-5.4: input irq status -75 received
+[791759.614537] usb 1-5.4: input irq status -75 received
+[791759.622542] usb 1-5.4: input irq status -75 received
+
+Add it.
+
+Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
+---
+ drivers/hid/hid-ids.h           | 1 +
+ drivers/hid/usbhid/hid-quirks.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index 41f167e..7ce93d9 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -164,6 +164,7 @@
+ #define USB_DEVICE_ID_ATEN_2PORTKVM	0x2204
+ #define USB_DEVICE_ID_ATEN_4PORTKVM	0x2205
+ #define USB_DEVICE_ID_ATEN_4PORTKVMC	0x2208
++#define USB_DEVICE_ID_ATEN_CS682	0x2213
+ 
+ #define USB_VENDOR_ID_ATMEL		0x03eb
+ #define USB_DEVICE_ID_ATMEL_MULTITOUCH	0x211c
+diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
+index a775143..4696895e 100644
+--- a/drivers/hid/usbhid/hid-quirks.c
++++ b/drivers/hid/usbhid/hid-quirks.c
+@@ -61,6 +61,7 @@ static const struct hid_blacklist {
+ 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },
++	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS682, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FIGHTERSTICK, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_COMBATSTICK, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE, HID_QUIRK_NOGET },
+-- 
+2.1.0
+

0001-cx18-add-missing-caps-for-the-PCM-video-device.patch

@@ -0,0 +1,75 @@
+From 0ce518efc8ddd9d2d45dcc2f14b20032d1e88946 Mon Sep 17 00:00:00 2001
+From: Hans Verkuil <hverkuil@xs4all.nl>
+Date: Fri, 24 Apr 2015 08:55:07 +0200
+Subject: [PATCH] cx18: add missing caps for the PCM video device
+
+The cx18 PCM video device didn't have any capabilities set, which caused a warnings
+in the v4l2 core:
+
+[    6.229393] ------------[ cut here ]------------
+[    6.229414] WARNING: CPU: 1 PID: 593 at
+drivers/media/v4l2-core/v4l2-ioctl.c:1025 v4l_querycap+0x41/0x70
+[videodev]()
+[    6.229415] Modules linked in: cx18_alsa mxl5005s s5h1409
+tuner_simple tuner_types cs5345 tuner intel_rapl iosf_mbi
+x86_pkg_temp_thermal coretemp raid1 snd_hda_codec_realtek kvm_intel
+snd_hda_codec_generic snd_hda_codec_hdmi kvm snd_oxygen(+) snd_hda_intel
+snd_oxygen_lib snd_hda_controller snd_hda_codec snd_mpu401_uart iTCO_wdt
+snd_rawmidi iTCO_vendor_support snd_hwdep crct10dif_pclmul crc32_pclmul
+crc32c_intel snd_seq cx18 snd_seq_device ghash_clmulni_intel
+videobuf_vmalloc tveeprom cx2341x snd_pcm serio_raw videobuf_core vfat
+dvb_core fat v4l2_common snd_timer videodev snd lpc_ich i2c_i801 joydev
+mfd_core mei_me media soundcore tpm_infineon soc_button_array tpm_tis
+mei shpchp tpm nfsd auth_rpcgss nfs_acl lockd grace sunrpc binfmt_misc
+i915 nouveau mxm_wmi wmi e1000e ttm i2c_algo_bit drm_kms_helper
+[    6.229444]  drm ptp pps_core video
+[    6.229446] CPU: 1 PID: 593 Comm: v4l_id Not tainted
+3.19.3-200.fc21.x86_64 #1
+[    6.229447] Hardware name: Gigabyte Technology Co., Ltd.
+Z87-D3HP/Z87-D3HP-CF, BIOS F6 01/20/2014
+[    6.229448]  0000000000000000 00000000d12b1131 ffff88042dacfc28
+ffffffff8176e215
+[    6.229449]  0000000000000000 0000000000000000 ffff88042dacfc68
+ffffffff8109bc1a
+[    6.229451]  ffffffffa0594000 ffff88042dacfd90 0000000000000000
+ffffffffa04e2140
+[    6.229452] Call Trace:
+[    6.229466]  [<ffffffff8176e215>] dump_stack+0x45/0x57
+[    6.229469]  [<ffffffff8109bc1a>] warn_slowpath_common+0x8a/0xc0
+[    6.229472]  [<ffffffff8109bd4a>] warn_slowpath_null+0x1a/0x20
+[    6.229474]  [<ffffffffa04ca401>] v4l_querycap+0x41/0x70 [videodev]
+[    6.229477]  [<ffffffffa04ca6cc>] __video_do_ioctl+0x29c/0x320 [videodev]
+[    6.229479]  [<ffffffff81227131>] ? do_last+0x2f1/0x1210
+[    6.229491]  [<ffffffffa04cc776>] video_usercopy+0x366/0x5d0 [videodev]
+[    6.229494]  [<ffffffffa04ca430>] ? v4l_querycap+0x70/0x70 [videodev]
+[    6.229497]  [<ffffffffa04cc9f5>] video_ioctl2+0x15/0x20 [videodev]
+[    6.229499]  [<ffffffffa04c6794>] v4l2_ioctl+0x164/0x180 [videodev]
+[    6.229501]  [<ffffffff8122e298>] do_vfs_ioctl+0x2f8/0x500
+[    6.229502]  [<ffffffff8122e521>] SyS_ioctl+0x81/0xa0
+[    6.229505]  [<ffffffff81774a09>] system_call_fastpath+0x12/0x17
+[    6.229506] ---[ end trace dacd80d4b19277ea ]---
+
+Added the necessary capabilities to stop this warning.
+
+Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
+Reported-by: Laura Abbott <labbott@redhat.com>
+Cc: <stable@vger.kernel.org>      # for v3.19 and up
+---
+ drivers/media/pci/cx18/cx18-streams.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/media/pci/cx18/cx18-streams.c b/drivers/media/pci/cx18/cx18-streams.c
+index c82d25d..c986084 100644
+--- a/drivers/media/pci/cx18/cx18-streams.c
++++ b/drivers/media/pci/cx18/cx18-streams.c
+@@ -90,6 +90,7 @@ static struct {
+ 		"encoder PCM audio",
+ 		VFL_TYPE_GRABBER, CX18_V4L2_ENC_PCM_OFFSET,
+ 		PCI_DMA_FROMDEVICE,
++		V4L2_CAP_TUNER | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE,
+ 	},
+ 	{	/* CX18_ENC_STREAM_TYPE_IDX */
+ 		"encoder IDX",
+-- 
+2.1.0
+

0001-firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch

@@ -0,0 +1,92 @@
+From: Laura Abbott <labbott@fedoraproject.org>
+Date: Tue, 28 Apr 2015 15:37:44 -0700
+Subject: [PATCH] firmware: Drop WARN from usermodehelper_read_trylock error
+ case
+
+We've received a number of reports of warnings when coming
+out of suspend with certain bluetooth firmware configurations:
+
+WARNING: CPU: 3 PID: 3280 at drivers/base/firmware_class.c:1126
+_request_firmware+0x558/0x810()
+Modules linked in: ccm ip6t_rpfilter ip6t_REJECT nf_reject_ipv6
+xt_conntrack ebtable_nat ebtable_broute bridge stp llc ebtable_filter
+ebtables ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6
+ip6table_mangle ip6table_security ip6table_raw ip6table_filter
+ip6_tables iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4
+nf_nat nf_conntrack iptable_mangle iptable_security iptable_raw
+binfmt_misc bnep intel_rapl iosf_mbi arc4 x86_pkg_temp_thermal
+snd_hda_codec_hdmi coretemp kvm_intel joydev snd_hda_codec_realtek
+iwldvm snd_hda_codec_generic kvm iTCO_wdt mac80211 iTCO_vendor_support
+snd_hda_intel snd_hda_controller snd_hda_codec crct10dif_pclmul
+snd_hwdep crc32_pclmul snd_seq crc32c_intel ghash_clmulni_intel uvcvideo
+snd_seq_device iwlwifi btusb videobuf2_vmalloc snd_pcm videobuf2_core
+ serio_raw bluetooth cfg80211 videobuf2_memops sdhci_pci v4l2_common
+videodev thinkpad_acpi sdhci i2c_i801 lpc_ich mfd_core wacom mmc_core
+media snd_timer tpm_tis hid_logitech_hidpp wmi tpm rfkill snd mei_me mei
+shpchp soundcore nfsd auth_rpcgss nfs_acl lockd grace sunrpc i915
+i2c_algo_bit drm_kms_helper e1000e drm hid_logitech_dj ptp pps_core
+video
+CPU: 3 PID: 3280 Comm: kworker/u17:0 Not tainted 3.19.3-200.fc21.x86_64
+Hardware name: LENOVO 343522U/343522U, BIOS GCET96WW (2.56 ) 10/22/2013
+Workqueue: hci0 hci_power_on [bluetooth]
+ 0000000000000000 0000000089944328 ffff88040acffb78 ffffffff8176e215
+ 0000000000000000 0000000000000000 ffff88040acffbb8 ffffffff8109bc1a
+ 0000000000000000 ffff88040acffcd0 00000000fffffff5 ffff8804076bac40
+Call Trace:
+ [<ffffffff8176e215>] dump_stack+0x45/0x57
+ [<ffffffff8109bc1a>] warn_slowpath_common+0x8a/0xc0
+ [<ffffffff8109bd4a>] warn_slowpath_null+0x1a/0x20
+ [<ffffffff814dbe78>] _request_firmware+0x558/0x810
+ [<ffffffff814dc165>] request_firmware+0x35/0x50
+ [<ffffffffa03a7886>] btusb_setup_bcm_patchram+0x86/0x590 [btusb]
+ [<ffffffff814d40e6>] ? rpm_idle+0xd6/0x230
+ [<ffffffffa04d4801>] hci_dev_do_open+0xe1/0xa90 [bluetooth]
+ [<ffffffff810c51dd>] ? ttwu_do_activate.constprop.90+0x5d/0x70
+ [<ffffffffa04d5980>] hci_power_on+0x40/0x200 [bluetooth]
+ [<ffffffff810b487c>] process_one_work+0x14c/0x3f0
+ [<ffffffff810b52f3>] worker_thread+0x53/0x470
+ [<ffffffff810b52a0>] ? rescuer_thread+0x300/0x300
+ [<ffffffff810ba548>] kthread+0xd8/0xf0
+ [<ffffffff810ba470>] ? kthread_create_on_node+0x1b0/0x1b0
+ [<ffffffff81774958>] ret_from_fork+0x58/0x90
+ [<ffffffff810ba470>] ? kthread_create_on_node+0x1b0/0x1b0
+
+This occurs after every resume.
+
+When resuming, the bluetooth driver needs to re-request the
+firmware. This re-request is happening before usermodehelper
+is fully enabled. If the firmware load succeeded previously, the
+caching behavior of the firmware code typically negates the
+need to call the usermodehelper code again and the request
+succeeds. If the firmware was never loaded because it isn't
+actually present in the file system, this results in a call
+to usermodehelper and a failure warning every resume.
+
+The proper fix is to add a reset_resume functionality to the
+btusb driver to be able to handle the resume case. The
+work for this is ongoing so in the mean time just silence
+the warning since we know it's a problem.
+
+Bugzilla: 1133378
+Upstream-status: Working on it. It's a difficult problem :(
+Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
+---
+ drivers/base/firmware_class.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
+index 171841a..48ce9ac 100644
+--- a/drivers/base/firmware_class.c
++++ b/drivers/base/firmware_class.c
+@@ -1115,7 +1115,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
+ 		}
+ 	} else {
+ 		ret = usermodehelper_read_trylock();
+-		if (WARN_ON(ret)) {
++		if (ret) {
+ 			dev_err(device, "firmware: %s will not be loaded\n",
+ 				name);
+ 			goto out;
+-- 
+2.1.0
+

0001-media-media-Fix-regression-in-some-more-dib0700-base.patch

@@ -0,0 +1,58 @@
+From e989a73ebd09d22c22ead51fa363a2f56f70f28a Mon Sep 17 00:00:00 2001
+From: Thomas Reitmayr <treitmayr@devbase.at>
+Date: Fri, 1 May 2015 20:18:04 -0300
+Subject: [PATCH] [media] media: Fix regression in some more dib0700 based
+ devices
+
+Fix an oops during device initialization by correctly setting size_of_priv
+instead of leaving it 0.
+The regression was introduced by 8abe4a0a3f6d4217b16a ("[media] dib7000:
+export just one symbol") and only fixed for one type of dib0700 based
+devices in 9e334c75642b6e5bfb95 ("[media] Fix regression in some dib0700
+based devices").
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=92301
+
+Fixes: 8abe4a0a3f6d4217b16a ("[media] dib7000: export just one symbol")
+
+Cc: stable@vger.kernel.org # for version 3.17+
+Signed-off-by: Thomas Reitmayr <treitmayr@devbase.at>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
+---
+ drivers/media/usb/dvb-usb/dib0700_devices.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
+index 90cee38..e87ce83 100644
+--- a/drivers/media/usb/dvb-usb/dib0700_devices.c
++++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
+@@ -3944,6 +3944,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
+ 
+ 				DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+ 			}},
++				.size_of_priv = sizeof(struct
++						dib0700_adapter_state),
+ 			}, {
+ 			.num_frontends = 1,
+ 			.fe = {{
+@@ -3956,6 +3958,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
+ 
+ 				DIB0700_DEFAULT_STREAMING_CONFIG(0x03),
+ 			}},
++				.size_of_priv = sizeof(struct
++						dib0700_adapter_state),
+ 			}
+ 		},
+ 
+@@ -4009,6 +4013,8 @@ struct dvb_usb_device_properties dib0700_devices[] = {
+ 
+ 				DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+ 			}},
++				.size_of_priv = sizeof(struct
++						dib0700_adapter_state),
+ 			},
+ 		},
+ 
+-- 
+2.1.0
+

0001-mwifiex-use-del_timer-variant-in-interrupt-context.patch

@@ -0,0 +1,68 @@
+From 6e9344fd8e90ff0bd8e74c15ec7c21eae7d54bd3 Mon Sep 17 00:00:00 2001
+From: Amitkumar Karwar <akarwar@marvell.com>
+Date: Thu, 12 Mar 2015 00:38:40 -0700
+Subject: [PATCH] mwifiex: use del_timer variant in interrupt context
+
+We might be in interrupt context at few places. So replace
+del_timer_sync() with del_timer(). This patch fixes a kernel
+trace problem seen occasionally during our testing.
+
+Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+ drivers/net/wireless/mwifiex/main.c      | 2 +-
+ drivers/net/wireless/mwifiex/sta_event.c | 4 ++--
+ drivers/net/wireless/mwifiex/usb.c       | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
+index 74488ab..42bf884 100644
+--- a/drivers/net/wireless/mwifiex/main.c
++++ b/drivers/net/wireless/mwifiex/main.c
+@@ -247,7 +247,7 @@ process_start:
+ 		if (IS_CARD_RX_RCVD(adapter)) {
+ 			adapter->data_received = false;
+ 			adapter->pm_wakeup_fw_try = false;
+-			del_timer_sync(&adapter->wakeup_timer);
++			del_timer(&adapter->wakeup_timer);
+ 			if (adapter->ps_state == PS_STATE_SLEEP)
+ 				adapter->ps_state = PS_STATE_AWAKE;
+ 		} else {
+diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
+index 64c4223..0dc7a1d 100644
+--- a/drivers/net/wireless/mwifiex/sta_event.c
++++ b/drivers/net/wireless/mwifiex/sta_event.c
+@@ -312,7 +312,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
+ 					adapter->ps_state = PS_STATE_AWAKE;
+ 					adapter->pm_wakeup_card_req = false;
+ 					adapter->pm_wakeup_fw_try = false;
+-					del_timer_sync(&adapter->wakeup_timer);
++					del_timer(&adapter->wakeup_timer);
+ 					break;
+ 				}
+ 				if (!mwifiex_send_null_packet
+@@ -327,7 +327,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
+ 		adapter->ps_state = PS_STATE_AWAKE;
+ 		adapter->pm_wakeup_card_req = false;
+ 		adapter->pm_wakeup_fw_try = false;
+-		del_timer_sync(&adapter->wakeup_timer);
++		del_timer(&adapter->wakeup_timer);
+ 
+ 		break;
+ 
+diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c
+index 2238730..8beb38c 100644
+--- a/drivers/net/wireless/mwifiex/usb.c
++++ b/drivers/net/wireless/mwifiex/usb.c
+@@ -1006,7 +1006,7 @@ static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter)
+ {
+ 	/* Simulation of HS_AWAKE event */
+ 	adapter->pm_wakeup_fw_try = false;
+-	del_timer_sync(&adapter->wakeup_timer);
++	del_timer(&adapter->wakeup_timer);
+ 	adapter->pm_wakeup_card_req = false;
+ 	adapter->ps_state = PS_STATE_AWAKE;
+ 
+-- 
+2.4.1
+

0001-n_tty-Fix-auditing-support-for-cannonical-mode.patch

@@ -0,0 +1,64 @@
+From 9983ea5b8ff57286d625787ee8fd6ce5df430fbc Mon Sep 17 00:00:00 2001
+From: Laura Abbott <labbott@fedoraproject.org>
+Date: Wed, 13 May 2015 17:03:06 -0700
+Subject: [PATCH] n_tty: Fix auditing support for cannonical mode
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+To: Jiri Slaby <jslaby@suse.cz>
+To: Peter Hurley <peter@hurleysoftware.com>
+To: Andy Lutomirski <luto@amacapital.net>
+Cc: linux-kernel@vger.kernel.org
+
+Commit 32f13521ca68bc624ff6effc77f308a52b038bf0
+("n_tty: Line copy to user buffer in canonical mode")
+changed cannonical mode copying to use copy_to_user
+but missed adding the call to the audit framework.
+Add in the appropriate functions to get audit support.
+
+Fixes: 32f13521ca68 ("n_tty: Line copy to user buffer in canonical mode")
+Reported-by: Miloslav Trmač <mitr@redhat.com>
+Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
+---
+ drivers/tty/n_tty.c | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
+index cf6e0f2..1a3d39b 100644
+--- a/drivers/tty/n_tty.c
++++ b/drivers/tty/n_tty.c
+@@ -162,6 +162,17 @@ static inline int tty_put_user(struct tty_struct *tty, unsigned char x,
+ 	return put_user(x, ptr);
+ }
+ 
++static inline int tty_copy_to_user(struct tty_struct *tty,
++					void __user *to,
++					const void *from,
++					unsigned long n)
++{
++	struct n_tty_data *ldata = tty->disc_data;
++
++	tty_audit_add_data(tty, to, n, ldata->icanon);
++	return copy_to_user(to, from, n);
++}
++
+ /**
+  *	n_tty_kick_worker - start input worker (if required)
+  *	@tty: terminal
+@@ -2072,12 +2083,12 @@ static int canon_copy_from_read_buf(struct tty_struct *tty,
+ 		    __func__, eol, found, n, c, size, more);
+ 
+ 	if (n > size) {
+-		ret = copy_to_user(*b, read_buf_addr(ldata, tail), size);
++		ret = tty_copy_to_user(tty, *b, read_buf_addr(ldata, tail), size);
+ 		if (ret)
+ 			return -EFAULT;
+-		ret = copy_to_user(*b + size, ldata->read_buf, n - size);
++		ret = tty_copy_to_user(tty, *b + size, ldata->read_buf, n - size);
+ 	} else
+-		ret = copy_to_user(*b, read_buf_addr(ldata, tail), n);
++		ret = tty_copy_to_user(tty, *b, read_buf_addr(ldata, tail), n);
+ 
+ 	if (ret)
+ 		return -EFAULT;
+-- 
+2.1.0
+

0001-target-use-vfs_iter_read-write-in-fd_do_rw.patch

@@ -0,0 +1,70 @@
+From 6b9a44d0939ca6235c72b811bd55b462d6a0a553 Mon Sep 17 00:00:00 2001
+From: Christoph Hellwig <hch@lst.de>
+Date: Sun, 22 Feb 2015 08:48:41 -0800
+Subject: [PATCH] target: use vfs_iter_read/write in fd_do_rw
+
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
+Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
+---
+ drivers/target/target_core_file.c | 31 ++++++++++++++-----------------
+ 1 file changed, 14 insertions(+), 17 deletions(-)
+
+diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
+index 44620fb..ea6e14e 100644
+--- a/drivers/target/target_core_file.c
++++ b/drivers/target/target_core_file.c
+@@ -331,36 +331,33 @@ static int fd_do_rw(struct se_cmd *cmd, struct scatterlist *sgl,
+ 	struct fd_dev *dev = FD_DEV(se_dev);
+ 	struct file *fd = dev->fd_file;
+ 	struct scatterlist *sg;
+-	struct iovec *iov;
+-	mm_segment_t old_fs;
++	struct iov_iter iter;
++	struct bio_vec *bvec;
++	ssize_t len = 0;
+ 	loff_t pos = (cmd->t_task_lba * se_dev->dev_attrib.block_size);
+ 	int ret = 0, i;
+ 
+-	iov = kzalloc(sizeof(struct iovec) * sgl_nents, GFP_KERNEL);
+-	if (!iov) {
++	bvec = kcalloc(sgl_nents, sizeof(struct bio_vec), GFP_KERNEL);
++	if (!bvec) {
+ 		pr_err("Unable to allocate fd_do_readv iov[]\n");
+ 		return -ENOMEM;
+ 	}
+ 
+ 	for_each_sg(sgl, sg, sgl_nents, i) {
+-		iov[i].iov_len = sg->length;
+-		iov[i].iov_base = kmap(sg_page(sg)) + sg->offset;
+-	}
++		bvec[i].bv_page = sg_page(sg);
++		bvec[i].bv_len = sg->length;
++		bvec[i].bv_offset = sg->offset;
+ 
+-	old_fs = get_fs();
+-	set_fs(get_ds());
++		len += sg->length;
++	}
+ 
++	iov_iter_bvec(&iter, ITER_BVEC, bvec, sgl_nents, len);
+ 	if (is_write)
+-		ret = vfs_writev(fd, &iov[0], sgl_nents, &pos);
++		ret = vfs_iter_write(fd, &iter, &pos);
+ 	else
+-		ret = vfs_readv(fd, &iov[0], sgl_nents, &pos);
+-
+-	set_fs(old_fs);
+-
+-	for_each_sg(sgl, sg, sgl_nents, i)
+-		kunmap(sg_page(sg));
++		ret = vfs_iter_read(fd, &iter, &pos);
+ 
+-	kfree(iov);
++	kfree(bvec);
+ 
+ 	if (is_write) {
+ 		if (ret < 0 || ret != cmd->data_length) {
+-- 
+2.4.1
+

ACPI-Limit-access-to-custom_method.patch

@@ -0,0 +1,30 @@
+From: Matthew Garrett <matthew.garrett@nebula.com>
+Date: Fri, 9 Mar 2012 08:39:37 -0500
+Subject: [PATCH] ACPI: Limit access to custom_method
+
+custom_method effectively allows arbitrary access to system memory, making
+it possible for an attacker to circumvent restrictions on module loading.
+Disable it if any such restrictions have been enabled.
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ drivers/acpi/custom_method.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
+index c68e72414a67..4277938af700 100644
+--- a/drivers/acpi/custom_method.c
++++ b/drivers/acpi/custom_method.c
+@@ -29,6 +29,9 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
+ 	struct acpi_table_header table;
+ 	acpi_status status;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (!(*ppos)) {
+ 		/* parse the table header to get the table length */
+ 		if (count <= sizeof(struct acpi_table_header))
+-- 
+1.9.3
+

ARM-tegra-usb-no-reset.patch

@@ -0,0 +1,31 @@
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Thu, 3 May 2012 20:27:11 +0100
+Subject: [PATCH] ARM: tegra: usb no reset
+
+Patch for disconnect issues with storage attached to a
+ tegra-ehci controller
+---
+ drivers/usb/core/hub.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
+index b649fef2e35d..fb89290710ad 100644
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -5023,6 +5023,13 @@ static void hub_event(struct work_struct *work)
+ 			(u16) hub->change_bits[0],
+ 			(u16) hub->event_bits[0]);
+ 
++	/* Don't disconnect USB-SATA on TrimSlice */
++	if (strcmp(dev_name(hdev->bus->controller), "tegra-ehci.0") == 0) {
++		if ((hdev->state == 7) && (hub->change_bits[0] == 0) &&
++				(hub->event_bits[0] == 0x2))
++			hub->event_bits[0] = 0;
++	}
++
+ 	/* Lock the device, then check to see if we were
+ 	 * disconnected while waiting for the lock to succeed. */
+ 	usb_lock_device(hdev);
+-- 
+2.1.0
+

Add-EFI-signature-data-types.patch

@@ -0,0 +1,56 @@
+From: Dave Howells <dhowells@redhat.com>
+Date: Tue, 23 Oct 2012 09:30:54 -0400
+Subject: [PATCH] Add EFI signature data types
+
+Add the data types that are used for containing hashes, keys and certificates
+for cryptographic verification.
+
+Bugzilla: N/A
+Upstream-status: Fedora mustard for now
+
+Signed-off-by: David Howells <dhowells@redhat.com>
+---
+ include/linux/efi.h | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index ebe6a24cc1e1..5ce40e215f15 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -581,6 +581,12 @@ void efi_native_runtime_setup(void);
+ #define DEVICE_TREE_GUID \
+     EFI_GUID(  0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 )
+ 
++#define EFI_CERT_SHA256_GUID \
++    EFI_GUID(  0xc1c41626, 0x504c, 0x4092, 0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 )
++
++#define EFI_CERT_X509_GUID \
++    EFI_GUID(  0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 )
++
+ typedef struct {
+ 	efi_guid_t guid;
+ 	u64 table;
+@@ -796,6 +802,20 @@ typedef struct _efi_file_io_interface {
+ 
+ #define EFI_INVALID_TABLE_ADDR		(~0UL)
+ 
++typedef struct  {
++	efi_guid_t signature_owner;
++	u8 signature_data[];
++} efi_signature_data_t;
++
++typedef struct {
++	efi_guid_t signature_type;
++	u32 signature_list_size;
++	u32 signature_header_size;
++	u32 signature_size;
++	u8 signature_header[];
++	/* efi_signature_data_t signatures[][] */
++} efi_signature_list_t;
++
+ /*
+  * All runtime access to EFI goes through this structure:
+  */
+-- 
+1.9.3
+

Add-an-EFI-signature-blob-parser-and-key-loader.patch

@@ -0,0 +1,178 @@
+From: Dave Howells <dhowells@redhat.com>
+Date: Tue, 23 Oct 2012 09:36:28 -0400
+Subject: [PATCH] Add an EFI signature blob parser and key loader.
+
+X.509 certificates are loaded into the specified keyring as asymmetric type
+keys.
+
+Signed-off-by: David Howells <dhowells@redhat.com>
+---
+ crypto/asymmetric_keys/Kconfig      |   8 +++
+ crypto/asymmetric_keys/Makefile     |   1 +
+ crypto/asymmetric_keys/efi_parser.c | 109 ++++++++++++++++++++++++++++++++++++
+ include/linux/efi.h                 |   4 ++
+ 4 files changed, 122 insertions(+)
+ create mode 100644 crypto/asymmetric_keys/efi_parser.c
+
+diff --git a/crypto/asymmetric_keys/Kconfig b/crypto/asymmetric_keys/Kconfig
+index 4870f28403f5..4a1b50d73b80 100644
+--- a/crypto/asymmetric_keys/Kconfig
++++ b/crypto/asymmetric_keys/Kconfig
+@@ -67,4 +67,12 @@ config SIGNED_PE_FILE_VERIFICATION
+ 	  This option provides support for verifying the signature(s) on a
+ 	  signed PE binary.
+ 
++config EFI_SIGNATURE_LIST_PARSER
++	bool "EFI signature list parser"
++	depends on EFI
++	select X509_CERTIFICATE_PARSER
++	help
++	  This option provides support for parsing EFI signature lists for
++	  X.509 certificates and turning them into keys.
++
+ endif # ASYMMETRIC_KEY_TYPE
+diff --git a/crypto/asymmetric_keys/Makefile b/crypto/asymmetric_keys/Makefile
+index e47fcd9ac5e8..6512f6596785 100644
+--- a/crypto/asymmetric_keys/Makefile
++++ b/crypto/asymmetric_keys/Makefile
+@@ -8,6 +8,7 @@ asymmetric_keys-y := asymmetric_type.o signature.o
+ 
+ obj-$(CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE) += public_key.o
+ obj-$(CONFIG_PUBLIC_KEY_ALGO_RSA) += rsa.o
++obj-$(CONFIG_EFI_SIGNATURE_LIST_PARSER) += efi_parser.o
+ 
+ #
+ # X.509 Certificate handling
+diff --git a/crypto/asymmetric_keys/efi_parser.c b/crypto/asymmetric_keys/efi_parser.c
+new file mode 100644
+index 000000000000..424896a0b169
+--- /dev/null
++++ b/crypto/asymmetric_keys/efi_parser.c
+@@ -0,0 +1,109 @@
++/* EFI signature/key/certificate list parser
++ *
++ * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
++ * Written by David Howells (dhowells@redhat.com)
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public Licence
++ * as published by the Free Software Foundation; either version
++ * 2 of the Licence, or (at your option) any later version.
++ */
++
++#define pr_fmt(fmt) "EFI: "fmt
++#include <linux/module.h>
++#include <linux/printk.h>
++#include <linux/err.h>
++#include <linux/efi.h>
++#include <keys/asymmetric-type.h>
++
++static __initdata efi_guid_t efi_cert_x509_guid = EFI_CERT_X509_GUID;
++
++/**
++ * parse_efi_signature_list - Parse an EFI signature list for certificates
++ * @data: The data blob to parse
++ * @size: The size of the data blob
++ * @keyring: The keyring to add extracted keys to
++ */
++int __init parse_efi_signature_list(const void *data, size_t size, struct key *keyring)
++{
++	unsigned offs = 0;
++	size_t lsize, esize, hsize, elsize;
++
++	pr_devel("-->%s(,%zu)\n", __func__, size);
++
++	while (size > 0) {
++		efi_signature_list_t list;
++		const efi_signature_data_t *elem;
++		key_ref_t key;
++
++		if (size < sizeof(list))
++			return -EBADMSG;
++
++		memcpy(&list, data, sizeof(list));
++		pr_devel("LIST[%04x] guid=%pUl ls=%x hs=%x ss=%x\n",
++			 offs,
++			 list.signature_type.b, list.signature_list_size,
++			 list.signature_header_size, list.signature_size);
++
++		lsize = list.signature_list_size;
++		hsize = list.signature_header_size;
++		esize = list.signature_size;
++		elsize = lsize - sizeof(list) - hsize;
++
++		if (lsize > size) {
++			pr_devel("<--%s() = -EBADMSG [overrun @%x]\n",
++				 __func__, offs);
++			return -EBADMSG;
++		}
++		if (lsize < sizeof(list) ||
++		    lsize - sizeof(list) < hsize ||
++		    esize < sizeof(*elem) ||
++		    elsize < esize ||
++		    elsize % esize != 0) {
++			pr_devel("- bad size combo @%x\n", offs);
++			return -EBADMSG;
++		}
++
++		if (efi_guidcmp(list.signature_type, efi_cert_x509_guid) != 0) {
++			data += lsize;
++			size -= lsize;
++			offs += lsize;
++			continue;
++		}
++
++		data += sizeof(list) + hsize;
++		size -= sizeof(list) + hsize;
++		offs += sizeof(list) + hsize;
++
++		for (; elsize > 0; elsize -= esize) {
++			elem = data;
++
++			pr_devel("ELEM[%04x]\n", offs);
++
++			key = key_create_or_update(
++				make_key_ref(keyring, 1),
++				"asymmetric",
++				NULL,
++				&elem->signature_data,
++				esize - sizeof(*elem),
++				(KEY_POS_ALL & ~KEY_POS_SETATTR) |
++				KEY_USR_VIEW,
++				KEY_ALLOC_NOT_IN_QUOTA |
++				KEY_ALLOC_TRUSTED);
++
++			if (IS_ERR(key))
++				pr_err("Problem loading in-kernel X.509 certificate (%ld)\n",
++				       PTR_ERR(key));
++			else
++				pr_notice("Loaded cert '%s' linked to '%s'\n",
++					  key_ref_to_ptr(key)->description,
++					  keyring->description);
++
++			data += esize;
++			size -= esize;
++			offs += esize;
++		}
++	}
++
++	return 0;
++}
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index 58d7feadd149..b1d686e9175e 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -919,6 +919,10 @@ extern bool efi_poweroff_required(void);
+ char * __init efi_md_typeattr_format(char *buf, size_t size,
+ 				     const efi_memory_desc_t *md);
+ 
++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
+-- 
+2.1.0
+

Add-option-to-automatically-enforce-module-signature.patch

@@ -0,0 +1,182 @@
+From: Matthew Garrett <matthew.garrett@nebula.com>
+Date: Fri, 9 Aug 2013 18:36:30 -0400
+Subject: [PATCH] Add option to automatically enforce module signatures when in
+ Secure Boot mode
+
+UEFI Secure Boot provides a mechanism for ensuring that the firmware will
+only load signed bootloaders and kernels. Certain use cases may also
+require that all kernel modules also be signed. Add a configuration option
+that enforces this automatically when enabled.
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ Documentation/x86/zero-page.txt       |  2 ++
+ arch/x86/Kconfig                      | 10 ++++++++++
+ arch/x86/boot/compressed/eboot.c      | 36 +++++++++++++++++++++++++++++++++++
+ arch/x86/include/uapi/asm/bootparam.h |  3 ++-
+ arch/x86/kernel/setup.c               |  6 ++++++
+ include/linux/module.h                |  6 ++++++
+ kernel/module.c                       |  7 +++++++
+ 7 files changed, 69 insertions(+), 1 deletion(-)
+
+diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt
+index 82fbdbc1e0b0..a811210ad486 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 b7d31ca55187..ab403a636357 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -1695,6 +1695,16 @@ config EFI_MIXED
+ 
+ 	   If unsure, say N.
+ 
++config EFI_SECURE_BOOT_SIG_ENFORCE
++        def_bool n
++	prompt "Force module signing when UEFI Secure Boot is enabled"
++	---help---
++	  UEFI Secure Boot provides a mechanism for ensuring that the
++	  firmware will only load signed bootloaders and kernels. Certain
++	  use cases may also require that all kernel modules also be signed.
++	  Say Y here to automatically enable module signature enforcement
++	  when a system boots with UEFI Secure Boot enabled.
++
+ config SECCOMP
+ 	def_bool y
+ 	prompt "Enable seccomp to safely compute untrusted bytecode"
+diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
+index ef17683484e9..105e7360d747 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>
+ 
+ #include "../string.h"
+ #include "eboot.h"
+@@ -827,6 +828,37 @@ out:
+ 	return status;
+ }
+ 
++static int get_secure_boot(void)
++{
++	u8 sb, setup;
++	unsigned long datasize = sizeof(sb);
++	efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID;
++	efi_status_t status;
++
++	status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
++				L"SecureBoot", &var_guid, NULL, &datasize, &sb);
++
++	if (status != EFI_SUCCESS)
++		return 0;
++
++	if (sb == 0)
++		return 0;
++
++
++	status = efi_early->call((unsigned long)sys_table->runtime->get_variable,
++				L"SetupMode", &var_guid, NULL, &datasize,
++				&setup);
++
++	if (status != EFI_SUCCESS)
++		return 0;
++
++	if (setup == 1)
++		return 0;
++
++	return 1;
++}
++
++
+ /*
+  * See if we have Graphics Output Protocol
+  */
+@@ -1406,6 +1438,10 @@ struct boot_params *efi_main(struct efi_config *c,
+ 	else
+ 		setup_boot_services32(efi_early);
+ 
++	sanitize_boot_params(boot_params);
++
++	boot_params->secure_boot = get_secure_boot();
++
+ 	setup_graphics(boot_params);
+ 
+ 	setup_efi_pci(boot_params);
+diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
+index 225b0988043a..90dbfb73e11f 100644
+--- a/arch/x86/include/uapi/asm/bootparam.h
++++ b/arch/x86/include/uapi/asm/bootparam.h
+@@ -133,7 +133,8 @@ struct boot_params {
+ 	__u8  eddbuf_entries;				/* 0x1e9 */
+ 	__u8  edd_mbr_sig_buf_entries;			/* 0x1ea */
+ 	__u8  kbd_status;				/* 0x1eb */
+-	__u8  _pad5[3];					/* 0x1ec */
++	__u8  secure_boot;				/* 0x1ec */
++	__u8  _pad5[2];					/* 0x1ed */
+ 	/*
+ 	 * The sentinel is set to a nonzero value (0xff) in header.S.
+ 	 *
+diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
+index 0a2421cca01f..a3d8174dedf9 100644
+--- a/arch/x86/kernel/setup.c
++++ b/arch/x86/kernel/setup.c
+@@ -1151,6 +1151,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 b033dab5c8bf..f526b6e02f59 100644
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -188,6 +188,12 @@ const struct exception_table_entry *search_exception_tables(unsigned long add);
+ 
+ struct notifier_block;
+ 
++#ifdef CONFIG_MODULE_SIG
++extern void enforce_signed_modules(void);
++#else
++static inline void enforce_signed_modules(void) {};
++#endif
++
+ #ifdef CONFIG_MODULES
+ 
+ extern int modules_disabled; /* for sysctl */
+diff --git a/kernel/module.c b/kernel/module.c
+index 0372c3961016..55dacebb687b 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -3909,6 +3909,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

Add-secure_modules-call.patch

@@ -0,0 +1,63 @@
+From: Matthew Garrett <matthew.garrett@nebula.com>
+Date: Fri, 9 Aug 2013 17:58:15 -0400
+Subject: [PATCH] Add secure_modules() call
+
+Provide a single call to allow kernel code to determine whether the system
+has been configured to either disable module loading entirely or to load
+only modules signed with a trusted key.
+
+Bugzilla: N/A
+Upstream-status: Fedora mustard.  Replaced by securelevels, but that was nak'd
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ include/linux/module.h |  7 +++++++
+ kernel/module.c        | 10 ++++++++++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/include/linux/module.h b/include/linux/module.h
+index 71f282a4e307..341a73ecea2e 100644
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -516,6 +516,8 @@ int unregister_module_notifier(struct notifier_block *nb);
+ 
+ extern void print_modules(void);
+ 
++extern bool secure_modules(void);
++
+ #else /* !CONFIG_MODULES... */
+ 
+ /* Given an address, look for it in the exception tables. */
+@@ -626,6 +628,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
+ static inline void print_modules(void)
+ {
+ }
++
++static inline bool secure_modules(void)
++{
++	return false;
++}
+ #endif /* CONFIG_MODULES */
+ 
+ #ifdef CONFIG_SYSFS
+diff --git a/kernel/module.c b/kernel/module.c
+index 03214bd288e9..1f7b4664300e 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -3842,3 +3842,13 @@ void module_layout(struct module *mod,
+ }
+ EXPORT_SYMBOL(module_layout);
+ #endif
++
++bool secure_modules(void)
++{
++#ifdef CONFIG_MODULE_SIG
++	return (sig_enforce || modules_disabled);
++#else
++	return modules_disabled;
++#endif
++}
++EXPORT_SYMBOL(secure_modules);
+-- 
+1.9.3
+

Add-sysrq-option-to-disable-secure-boot-mode.patch

@@ -1,5 +1,21 @@
+From: Kyle McMartin <kyle@redhat.com>
+Date: Fri, 30 Aug 2013 09:28:51 -0400
+Subject: [PATCH] Add sysrq option to disable secure boot mode
+
+Bugzilla: N/A
+Upstream-status: Fedora mustard
+---
+ arch/x86/kernel/setup.c     | 36 ++++++++++++++++++++++++++++++++++++
+ drivers/input/misc/uinput.c |  1 +
+ 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 167ca34..2a06699 100644
+index 26c5d54124c1..dab298f03a9c 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
 @@ -70,6 +70,11 @@
@@ -14,53 +30,24 @@ index 167ca34..2a06699 100644
  #include <video/edid.h>
  
  #include <asm/mtrr.h>
-@@ -1252,3 +1257,61 @@ void __init i386_reserve_resources(void)
- }
+@@ -1278,6 +1283,37 @@ void __init i386_reserve_resources(void)
  
  #endif /* CONFIG_X86_32 */
-+
+ 
++#ifdef CONFIG_MAGIC_SYSRQ
 +#ifdef CONFIG_MODULE_SIG
 +extern bool sig_enforce;
 +#endif
 +
-+int sb_enabled;
-+
-+void __init secureboot_enable()
-+{
-+	pr_info("Secure boot enabled\n");
-+	cap_lower(init_cred.cap_bset, CAP_COMPROMISE_KERNEL);
-+	cap_lower(init_cred.cap_permitted, CAP_COMPROMISE_KERNEL);
-+#ifdef CONFIG_MODULE_SIG
-+	/* Enable module signature enforcing */
-+	sig_enforce = true;
-+#endif
-+	sb_enabled = 1;
-+}
-+
-+/* Dummy Secure Boot enable option to fake out UEFI SB=1 */
-+static int __init secureboot_enable_opt(char *str)
-+{
-+	int sb_enable = !!simple_strtol(str, NULL, 0);
-+	if (sb_enable)
-+		secureboot_enable();
-+	return 1;
-+}
-+__setup("secureboot_enable=", secureboot_enable_opt);
-+
-+#ifdef CONFIG_MAGIC_SYSRQ
-+extern int sb_enabled;
 +static void sysrq_handle_secure_boot(int key)
 +{
-+	if (!sb_enabled)
++	if (!efi_enabled(EFI_SECURE_BOOT))
 +		return;
 +
 +	pr_info("Secure boot disabled\n");
-+	cap_raise(init_cred.cap_bset, CAP_COMPROMISE_KERNEL);
-+	cap_raise(init_cred.cap_permitted, CAP_COMPROMISE_KERNEL);
 +#ifdef CONFIG_MODULE_SIG
 +	sig_enforce = fips_enabled;
 +#endif
-+	sb_enabled = 0;
 +}
 +static struct sysrq_key_op secure_boot_sysrq_op = {
 +	.handler	=	sysrq_handle_secure_boot,
@@ -70,17 +57,22 @@ index 167ca34..2a06699 100644
 +};
 +static int __init secure_boot_sysrq(void)
 +{
-+	if (sb_enabled)
++	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 a0a4bba..3327cc3 100644
+index 421e29e4cd81..61c1eb97806c 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)
+@@ -366,6 +366,7 @@ static int uinput_allocate_device(struct uinput_device *udev)
  	if (!udev->dev)
  		return -ENOMEM;
  
@@ -89,10 +81,10 @@ index a0a4bba..3327cc3 100644
  	input_set_drvdata(udev->dev, udev);
  
 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
-index d5cc3ac..05b33f5 100644
+index 259a4d5a4e8f..512c21dcb86f 100644
 --- a/drivers/tty/sysrq.c
 +++ b/drivers/tty/sysrq.c
-@@ -461,6 +461,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
+@@ -464,6 +464,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 */
@@ -100,7 +92,7 @@ index d5cc3ac..05b33f5 100644
  	NULL,				/* x */
  	/* y: May be registered on sparc64 for global register dump */
  	NULL,				/* y */
-@@ -504,7 +505,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
+@@ -507,7 +508,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
                  sysrq_key_table[i] = op_p;
  }
  
@@ -109,7 +101,7 @@ index d5cc3ac..05b33f5 100644
  {
  	struct sysrq_key_op *op_p;
  	int orig_log_level;
-@@ -524,11 +525,15 @@ void __handle_sysrq(int key, bool check_mask)
+@@ -527,11 +528,15 @@ void __handle_sysrq(int key, bool check_mask)
  
          op_p = __sysrq_get_key_op(key);
          if (op_p) {
@@ -123,10 +115,10 @@ index d5cc3ac..05b33f5 100644
  		 */
 -		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);
+ 			pr_cont("%s\n", op_p->action_msg);
  			console_loglevel = orig_log_level;
  			op_p->handler(key);
-@@ -559,7 +564,7 @@ void __handle_sysrq(int key, bool check_mask)
+@@ -563,7 +568,7 @@ void __handle_sysrq(int key, bool check_mask)
  void handle_sysrq(int key)
  {
  	if (sysrq_on())
@@ -135,7 +127,7 @@ index d5cc3ac..05b33f5 100644
  }
  EXPORT_SYMBOL(handle_sysrq);
  
-@@ -639,7 +644,7 @@ static void sysrq_do_reset(unsigned long _state)
+@@ -643,7 +648,7 @@ static void sysrq_do_reset(unsigned long _state)
  static void sysrq_handle_reset_request(struct sysrq_state *state)
  {
  	if (state->reset_requested)
@@ -144,7 +136,7 @@ index d5cc3ac..05b33f5 100644
  
  	if (sysrq_reset_downtime_ms)
  		mod_timer(&state->keyreset_timer,
-@@ -756,8 +761,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq,
+@@ -794,8 +799,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq,
  
  	default:
  		if (sysrq->active && value && value != 2) {
@@ -156,7 +148,7 @@ index d5cc3ac..05b33f5 100644
  		}
  		break;
  	}
-@@ -1038,7 +1045,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
+@@ -1090,7 +1097,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
  
  		if (get_user(c, buf))
  			return -EFAULT;
@@ -166,7 +158,7 @@ index d5cc3ac..05b33f5 100644
  
  	return count;
 diff --git a/include/linux/input.h b/include/linux/input.h
-index 82ce323..9e534f2 100644
+index 82ce323b9986..9e534f228945 100644
 --- a/include/linux/input.h
 +++ b/include/linux/input.h
 @@ -42,6 +42,7 @@ struct input_value {
@@ -196,10 +188,10 @@ index 82ce323..9e534f2 100644
   * 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 7faf933..87ae634 100644
+index 387fa7d05c98..4b07e30b3279 100644
 --- a/include/linux/sysrq.h
 +++ b/include/linux/sysrq.h
-@@ -31,6 +31,8 @@
+@@ -28,6 +28,8 @@
  #define SYSRQ_ENABLE_BOOT	0x0080
  #define SYSRQ_ENABLE_RTNICE	0x0100
  
@@ -208,7 +200,7 @@ index 7faf933..87ae634 100644
  struct sysrq_key_op {
  	void (*handler)(int);
  	char *help_msg;
-@@ -45,8 +47,12 @@ struct sysrq_key_op {
+@@ -42,8 +44,12 @@ struct sysrq_key_op {
   * are available -- else NULL's).
   */
  
@@ -222,52 +214,32 @@ index 7faf933..87ae634 100644
  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/cred.c b/kernel/cred.c
-index c5554e0..e0573a4 100644
---- a/kernel/cred.c
-+++ b/kernel/cred.c
-@@ -565,31 +565,6 @@ void __init cred_init(void)
- 				     0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
- }
- 
--#ifdef CONFIG_MODULE_SIG
--extern bool sig_enforce;
--#endif
--
--void __init secureboot_enable()
--{
--	pr_info("Secure boot enabled\n");
--	cap_lower((&init_cred)->cap_bset, CAP_COMPROMISE_KERNEL);
--	cap_lower((&init_cred)->cap_permitted, CAP_COMPROMISE_KERNEL);
--#ifdef CONFIG_MODULE_SIG
--	/* Enable module signature enforcing */
--	sig_enforce = true;
--#endif
--}
--
--/* Dummy Secure Boot enable option to fake out UEFI SB=1 */
--static int __init secureboot_enable_opt(char *str)
--{
--	int sb_enable = !!simple_strtol(str, NULL, 0);
--	if (sb_enable)
--		secureboot_enable();
--	return 1;
--}
--__setup("secureboot_enable=", secureboot_enable_opt);
--
- /**
-  * prepare_kernel_cred - Prepare a set of credentials for a kernel service
-  * @daemon: A userspace daemon to be used as a reference
 diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
-index 00eb8f7..54fbbcc 100644
+index 4121345498e0..0ff3cef5df96 100644
 --- a/kernel/debug/kdb/kdb_main.c
 +++ b/kernel/debug/kdb/kdb_main.c
-@@ -1921,7 +1921,7 @@ static int kdb_sr(int argc, const char **argv)
- 	if (argc != 1)
+@@ -1968,7 +1968,7 @@ static int kdb_sr(int argc, const char **argv)
  		return KDB_ARGCOUNT;
+ 
  	kdb_trap_printk++;
--	__handle_sysrq(*argv[1], false);
-+	__handle_sysrq(*argv[1], SYSRQ_FROM_KERNEL);
+-	__handle_sysrq(*argv[1], check_mask);
++	__handle_sysrq(*argv[1], check_mask & SYSRQ_FROM_KERNEL);
  	kdb_trap_printk--;
  
  	return 0;
+diff --git a/kernel/module.c b/kernel/module.c
+index 55dacebb687b..9d4deeb9268e 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -107,9 +107,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)

Btrfs-fix-range-cloning-when-same-inode-used-as-sour.patch

@@ -0,0 +1,126 @@
+From: Filipe Manana <fdmanana@suse.com>
+Date: Tue, 31 Mar 2015 14:56:46 +0100
+Subject: [PATCH] Btrfs: fix range cloning when same inode used as source and
+ destination
+
+While searching for extents to clone we might find one where we only use
+a part of it coming from its tail. If our destination inode is the same
+the source inode, we end up removing the tail part of the extent item and
+insert after a new one that point to the same extent with an adjusted
+key file offset and data offset. After this we search for the next extent
+item in the fs/subvol tree with a key that has an offset incremented by
+one. But this second search leaves us at the new extent item we inserted
+previously, and since that extent item has a non-zero data offset, it
+it can make us call btrfs_drop_extents with an empty range (start == end)
+which causes the following warning:
+
+[23978.537119] WARNING: CPU: 6 PID: 16251 at fs/btrfs/file.c:550 btrfs_drop_extent_cache+0x43/0x385 [btrfs]()
+(...)
+[23978.557266] Call Trace:
+[23978.557978]  [<ffffffff81425fd9>] dump_stack+0x4c/0x65
+[23978.559191]  [<ffffffff81045390>] warn_slowpath_common+0xa1/0xbb
+[23978.560699]  [<ffffffffa047f0ea>] ? btrfs_drop_extent_cache+0x43/0x385 [btrfs]
+[23978.562389]  [<ffffffff8104544d>] warn_slowpath_null+0x1a/0x1c
+[23978.563613]  [<ffffffffa047f0ea>] btrfs_drop_extent_cache+0x43/0x385 [btrfs]
+[23978.565103]  [<ffffffff810e3a18>] ? time_hardirqs_off+0x15/0x28
+[23978.566294]  [<ffffffff81079ff8>] ? trace_hardirqs_off+0xd/0xf
+[23978.567438]  [<ffffffffa047f73d>] __btrfs_drop_extents+0x6b/0x9e1 [btrfs]
+[23978.568702]  [<ffffffff8107c03f>] ? trace_hardirqs_on+0xd/0xf
+[23978.569763]  [<ffffffff811441c0>] ? ____cache_alloc+0x69/0x2eb
+[23978.570817]  [<ffffffff81142269>] ? virt_to_head_page+0x9/0x36
+[23978.571872]  [<ffffffff81143c15>] ? cache_alloc_debugcheck_after.isra.42+0x16c/0x1cb
+[23978.573466]  [<ffffffff811420d5>] ? kmemleak_alloc_recursive.constprop.52+0x16/0x18
+[23978.574962]  [<ffffffffa0480d07>] btrfs_drop_extents+0x66/0x7f [btrfs]
+[23978.576179]  [<ffffffffa049aa35>] btrfs_clone+0x516/0xaf5 [btrfs]
+[23978.577311]  [<ffffffffa04983dc>] ? lock_extent_range+0x7b/0xcd [btrfs]
+[23978.578520]  [<ffffffffa049b2a2>] btrfs_ioctl_clone+0x28e/0x39f [btrfs]
+[23978.580282]  [<ffffffffa049d9ae>] btrfs_ioctl+0xb51/0x219a [btrfs]
+(...)
+[23978.591887] ---[ end trace 988ec2a653d03ed3 ]---
+
+Then we attempt to insert a new extent item with a key that already
+exists, which makes btrfs_insert_empty_item return -EEXIST resulting in
+abortion of the current transaction:
+
+[23978.594355] WARNING: CPU: 6 PID: 16251 at fs/btrfs/super.c:260 __btrfs_abort_transaction+0x52/0x114 [btrfs]()
+(...)
+[23978.622589] Call Trace:
+[23978.623181]  [<ffffffff81425fd9>] dump_stack+0x4c/0x65
+[23978.624359]  [<ffffffff81045390>] warn_slowpath_common+0xa1/0xbb
+[23978.625573]  [<ffffffffa044ab6c>] ? __btrfs_abort_transaction+0x52/0x114 [btrfs]
+[23978.626971]  [<ffffffff810453f0>] warn_slowpath_fmt+0x46/0x48
+[23978.628003]  [<ffffffff8108a6c8>] ? vprintk_default+0x1d/0x1f
+[23978.629138]  [<ffffffffa044ab6c>] __btrfs_abort_transaction+0x52/0x114 [btrfs]
+[23978.630528]  [<ffffffffa049ad1b>] btrfs_clone+0x7fc/0xaf5 [btrfs]
+[23978.631635]  [<ffffffffa04983dc>] ? lock_extent_range+0x7b/0xcd [btrfs]
+[23978.632886]  [<ffffffffa049b2a2>] btrfs_ioctl_clone+0x28e/0x39f [btrfs]
+[23978.634119]  [<ffffffffa049d9ae>] btrfs_ioctl+0xb51/0x219a [btrfs]
+(...)
+[23978.647714] ---[ end trace 988ec2a653d03ed4 ]---
+
+This is wrong because we should not process the extent item that we just
+inserted previously, and instead process the extent item that follows it
+in the tree
+
+For example for the test case I wrote for fstests:
+
+   bs=$((64 * 1024))
+   mkfs.btrfs -f -l $bs -O ^no-holes /dev/sdc
+   mount /dev/sdc /mnt
+
+   xfs_io -f -c "pwrite -S 0xaa $(($bs * 2)) $(($bs * 2))" /mnt/foo
+
+   $CLONER_PROG -s $((3 * $bs)) -d $((267 * $bs)) -l 0 /mnt/foo /mnt/foo
+   $CLONER_PROG -s $((217 * $bs)) -d $((95 * $bs)) -l 0 /mnt/foo /mnt/foo
+
+The second clone call fails with -EEXIST, because when we process the
+first extent item (offset 262144), we drop part of it (counting from the
+end) and then insert a new extent item with a key greater then the key we
+found. The next time we search the tree we search for a key with offset
+262144 + 1, which leaves us at the new extent item we have just inserted
+but we think it refers to an extent that we need to clone.
+
+Fix this by ensuring the next search key uses an offset corresponding to
+the offset of the key we found previously plus the data length of the
+corresponding extent item. This ensures we skip new extent items that we
+inserted and works for the case of implicit holes too (NO_HOLES feature).
+
+A test case for fstests follows soon.
+
+Signed-off-by: Filipe Manana <fdmanana@suse.com>
+Signed-off-by: Chris Mason <clm@fb.com>
+---
+ fs/btrfs/ioctl.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
+index 2b4c5423672d..d79c599240a7 100644
+--- a/fs/btrfs/ioctl.c
++++ b/fs/btrfs/ioctl.c
+@@ -3206,6 +3206,8 @@ static int btrfs_clone(struct inode *src, struct inode *inode,
+ 	key.offset = off;
+ 
+ 	while (1) {
++		u64 next_key_min_offset;
++
+ 		/*
+ 		 * note the key will change type as we walk through the
+ 		 * tree.
+@@ -3286,7 +3288,7 @@ process_slot:
+ 			} else if (key.offset >= off + len) {
+ 				break;
+ 			}
+-
++			next_key_min_offset = key.offset + datal;
+ 			size = btrfs_item_size_nr(leaf, slot);
+ 			read_extent_buffer(leaf, buf,
+ 					   btrfs_item_ptr_offset(leaf, slot),
+@@ -3501,7 +3503,7 @@ process_slot:
+ 				break;
+ 		}
+ 		btrfs_release_path(path);
+-		key.offset++;
++		key.offset = next_key_min_offset;
+ 	}
+ 	ret = 0;
+ 

Btrfs-fix-regression-in-raid-level-conversion.patch

@@ -0,0 +1,55 @@
+From: Chris Mason <clm@fb.com>
+Date: Thu, 11 Jun 2015 18:06:51 +0200
+Subject: [PATCH] Btrfs: fix regression in raid level conversion
+
+Commit 2f0810880f082fa8ba66ab2c33b02e4ff9770a5e changed
+btrfs_set_block_group_ro to avoid trying to allocate new chunks with the
+new raid profile during conversion.  This fixed failures when there was
+no space on the drive to allocate a new chunk, but the metadata
+reserves were sufficient to continue the conversion.
+
+But this ended up causing a regression when the drive had plenty of
+space to allocate new chunks, mostly because reduce_alloc_profile isn't
+using the new raid profile.
+
+Fixing btrfs_reduce_alloc_profile is a bigger patch.  For now, do a
+partial revert of 2f0810880, and don't error out if we hit ENOSPC.
+
+Signed-off-by: Chris Mason <clm@fb.com>
+Tested-by: Dave Sterba <dsterba@suse.cz>
+Reported-by: Holger Hoffstaette <holger.hoffstaette@googlemail.com>
+[adapted for stable kernel branch, v4.0.5]
+Signed-off-by: David Sterba <dsterba@suse.cz>
+---
+ fs/btrfs/extent-tree.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
+index 8b33da6ec3dd..63be2a96ed6a 100644
+--- a/fs/btrfs/extent-tree.c
++++ b/fs/btrfs/extent-tree.c
+@@ -8535,6 +8535,24 @@ int btrfs_set_block_group_ro(struct btrfs_root *root,
+ 	trans = btrfs_join_transaction(root);
+ 	if (IS_ERR(trans))
+ 		return PTR_ERR(trans);
++	/*
++	 * if we are changing raid levels, try to allocate a corresponding
++	 * block group with the new raid level.
++	 */
++	alloc_flags = update_block_group_flags(root, cache->flags);
++	if (alloc_flags != cache->flags) {
++		ret = do_chunk_alloc(trans, root, alloc_flags,
++				     CHUNK_ALLOC_FORCE);
++		/*
++		 * ENOSPC is allowed here, we may have enough space
++		 * already allocated at the new raid level to
++		 * carry on
++		 */
++		if (ret == -ENOSPC)
++			ret = 0;
++		if (ret < 0)
++			goto out;
++	}
+ 
+ 	ret = set_block_group_ro(cache, 0);
+ 	if (!ret)

Btrfs-fix-uninit-variable-in-clone-ioctl.patch

@@ -0,0 +1,26 @@
+From: Chris Mason <clm@fb.com>
+Date: Sat, 11 Apr 2015 05:09:06 -0700
+Subject: [PATCH] Btrfs: fix uninit variable in clone ioctl
+
+Commit 0d97a64e0 creates a new variable but doesn't always set it up.
+This puts it back to the original method (key.offset + 1) for the cases
+not covered by Filipe's new logic.
+
+Signed-off-by: Chris Mason <clm@fb.com>
+---
+ fs/btrfs/ioctl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
+index d79c599240a7..64e8fb639f72 100644
+--- a/fs/btrfs/ioctl.c
++++ b/fs/btrfs/ioctl.c
+@@ -3206,7 +3206,7 @@ static int btrfs_clone(struct inode *src, struct inode *inode,
+ 	key.offset = off;
+ 
+ 	while (1) {
+-		u64 next_key_min_offset;
++		u64 next_key_min_offset = key.offset + 1;
+ 
+ 		/*
+ 		 * note the key will change type as we walk through the

Btrfs-send-add-missing-check-for-dead-clone-root.patch

@@ -0,0 +1,29 @@
+From: Filipe Manana <fdmanana@suse.com>
+Date: Mon, 2 Mar 2015 20:53:52 +0000
+Subject: [PATCH] Btrfs: send, add missing check for dead clone root
+
+After we locked the root's root item, a concurrent snapshot deletion
+call might have set the dead flag on it. So check if the dead flag
+is set and abort if it is, just like we do for the parent root.
+
+Signed-off-by: Filipe Manana <fdmanana@suse.com>
+Reviewed-by: David Sterba <dsterba@suse.cz>
+Signed-off-by: Chris Mason <clm@fb.com>
+---
+ fs/btrfs/send.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
+index d6033f540cc7..6ec28f13659e 100644
+--- a/fs/btrfs/send.c
++++ b/fs/btrfs/send.c
+@@ -5855,7 +5855,8 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
+ 			clone_sources_to_rollback = i + 1;
+ 			spin_lock(&clone_root->root_item_lock);
+ 			clone_root->send_in_progress++;
+-			if (!btrfs_root_readonly(clone_root)) {
++			if (!btrfs_root_readonly(clone_root) ||
++			    btrfs_root_dead(clone_root)) {
+ 				spin_unlock(&clone_root->root_item_lock);
+ 				srcu_read_unlock(&fs_info->subvol_srcu, index);
+ 				ret = -EPERM;

Btrfs-send-don-t-leave-without-decrementing-clone-ro.patch

@@ -0,0 +1,58 @@
+From: Filipe Manana <fdmanana@suse.com>
+Date: Mon, 2 Mar 2015 20:53:53 +0000
+Subject: [PATCH] Btrfs: send, don't leave without decrementing clone root's
+ send_progress
+
+If the clone root was not readonly or the dead flag was set on it, we were
+leaving without decrementing the root's send_progress counter (and before
+we just incremented it). If a concurrent snapshot deletion was in progress
+and ended up being aborted, it would be impossible to later attempt to
+delete again the snapshot, since the root's send_in_progress counter could
+never go back to 0.
+
+We were also setting clone_sources_to_rollback to i + 1 too early - if we
+bailed out because the clone root we got is not readonly or flagged as dead
+we ended up later derreferencing a null pointer because we didn't assign
+the clone root to sctx->clone_roots[i].root:
+
+		for (i = 0; sctx && i < clone_sources_to_rollback; i++)
+			btrfs_root_dec_send_in_progress(
+					sctx->clone_roots[i].root);
+
+So just don't increment the send_in_progress counter if the root is readonly
+or flagged as dead.
+
+Signed-off-by: Filipe Manana <fdmanana@suse.com>
+Reviewed-by: David Sterba <dsterba@suse.cz>
+Signed-off-by: Chris Mason <clm@fb.com>
+---
+ fs/btrfs/send.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
+index 6ec28f13659e..571de5a08fe7 100644
+--- a/fs/btrfs/send.c
++++ b/fs/btrfs/send.c
+@@ -5852,9 +5852,7 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
+ 				ret = PTR_ERR(clone_root);
+ 				goto out;
+ 			}
+-			clone_sources_to_rollback = i + 1;
+ 			spin_lock(&clone_root->root_item_lock);
+-			clone_root->send_in_progress++;
+ 			if (!btrfs_root_readonly(clone_root) ||
+ 			    btrfs_root_dead(clone_root)) {
+ 				spin_unlock(&clone_root->root_item_lock);
+@@ -5862,10 +5860,12 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
+ 				ret = -EPERM;
+ 				goto out;
+ 			}
++			clone_root->send_in_progress++;
+ 			spin_unlock(&clone_root->root_item_lock);
+ 			srcu_read_unlock(&fs_info->subvol_srcu, index);
+ 
+ 			sctx->clone_roots[i].root = clone_root;
++			clone_sources_to_rollback = i + 1;
+ 		}
+ 		vfree(clone_sources_tmp);
+ 		clone_sources_tmp = NULL;

HID-lenovo-set-INPUT_PROP_POINTING_STICK.patch

@@ -0,0 +1,52 @@
+From: Andreas Fleig <andreasfleig@gmail.com>
+Date: Thu, 23 Apr 2015 10:25:58 +0200
+Subject: [PATCH] HID: lenovo: set INPUT_PROP_POINTING_STICK
+
+Set flags INPUT_PROP_POINTER and INPUT_PROP_POINTING_STICK for the trackpoint
+integrated in Lenovo USB and Bluetooth keyboards. Libinput checks these flags
+to enable features such as middle-button-scrolling by default.
+
+Signed-off-by: Andreas Fleig <andreasfleig@gmail.com>
+Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+---
+ drivers/hid/hid-lenovo.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c
+index c4c3f0952521..78608d646007 100644
+--- a/drivers/hid/hid-lenovo.c
++++ b/drivers/hid/hid-lenovo.c
+@@ -762,6 +762,24 @@ static void lenovo_remove(struct hid_device *hdev)
+ 	hid_hw_stop(hdev);
+ }
+ 
++static void lenovo_input_configured(struct hid_device *hdev,
++		struct hid_input *hi)
++{
++	switch (hdev->product) {
++		case USB_DEVICE_ID_LENOVO_TPKBD:
++		case USB_DEVICE_ID_LENOVO_CUSBKBD:
++		case USB_DEVICE_ID_LENOVO_CBTKBD:
++			if (test_bit(EV_REL, hi->input->evbit)) {
++				/* set only for trackpoint device */
++				__set_bit(INPUT_PROP_POINTER, hi->input->propbit);
++				__set_bit(INPUT_PROP_POINTING_STICK,
++						hi->input->propbit);
++			}
++			break;
++	}
++}
++
++
+ static const struct hid_device_id lenovo_devices[] = {
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TPKBD) },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CUSBKBD) },
+@@ -774,6 +792,7 @@ MODULE_DEVICE_TABLE(hid, lenovo_devices);
+ static struct hid_driver lenovo_driver = {
+ 	.name = "lenovo",
+ 	.id_table = lenovo_devices,
++	.input_configured = lenovo_input_configured,
+ 	.input_mapping = lenovo_input_mapping,
+ 	.probe = lenovo_probe,
+ 	.remove = lenovo_remove,

HID-logitech-hidpp-add-a-module-parameter-to-keep-fi.patch

@@ -0,0 +1,52 @@
+From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Date: Thu, 26 Mar 2015 12:41:57 -0400
+Subject: [PATCH] HID: logitech-hidpp: add a module parameter to keep firmware
+ gestures
+
+The Logitech T650 used to report 3 fingers swipes to the up as a press on the
+Super key. When we switched the touchpad to the raw mode, we also disable such
+firmware gesture and some users may rely on it.
+
+Unfortunately, 3 finger swipes are still not supported in most of the Linux
+environments, which means that we disabled a feature of the touchpad.
+
+Allow users to revert the raw reporting mode and keep going with the firmware
+gestures by providing a new module parameter.
+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+---
+ drivers/hid/hid-logitech-hidpp.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
+index a93cefe0e522..00304f742eca 100644
+--- a/drivers/hid/hid-logitech-hidpp.c
++++ b/drivers/hid/hid-logitech-hidpp.c
+@@ -28,6 +28,11 @@ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Benjamin Tissoires <benjamin.tissoires@gmail.com>");
+ MODULE_AUTHOR("Nestor Lopez Casado <nlopezcasad@logitech.com>");
+ 
++static bool disable_raw_mode;
++module_param(disable_raw_mode, bool, 0644);
++MODULE_PARM_DESC(disable_raw_mode,
++	"Disable Raw mode reporting for touchpads and keep firmware gestures.");
++
+ #define REPORT_ID_HIDPP_SHORT			0x10
+ #define REPORT_ID_HIDPP_LONG			0x11
+ 
+@@ -1159,6 +1164,11 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
+ 
+ 	hidpp->quirks = id->driver_data;
+ 
++	if (disable_raw_mode) {
++		hidpp->quirks &= ~HIDPP_QUIRK_CLASS_WTP;
++		hidpp->quirks &= ~HIDPP_QUIRK_DELAYED_INIT;
++	}
++
+ 	if (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP) {
+ 		ret = wtp_allocate(hdev, id);
+ 		if (ret)
+-- 
+2.1.0
+

HID-multitouch-add-support-of-clickpads.patch

@@ -0,0 +1,50 @@
+From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Date: Fri, 6 Mar 2015 11:14:42 -0500
+Subject: [PATCH] HID: multitouch: add support of clickpads
+
+Touchpads that have only one button are called clickpads and should
+be advertised as such by the kernel.
+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Tested-by: Jason Ekstrand <jason@jlekstrand.net>
+---
+ drivers/hid/hid-multitouch.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
+index 51e25b9407f2..a8e738191625 100644
+--- a/drivers/hid/hid-multitouch.c
++++ b/drivers/hid/hid-multitouch.c
+@@ -115,6 +115,7 @@ struct mt_device {
+ 	__u8 touches_by_report;	/* how many touches are present in one report:
+ 				* 1 means we should use a serial protocol
+ 				* > 1 means hybrid (multitouch) protocol */
++	__u8 buttons_count;	/* number of physical buttons per touchpad */
+ 	bool serial_maybe;	/* need to check for serial protocol */
+ 	bool curvalid;		/* is the current contact valid? */
+ 	unsigned mt_flags;	/* flags to pass to input-mt */
+@@ -372,6 +373,10 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+ 		td->inputmode_value = MT_INPUTMODE_TOUCHPAD;
+ 	}
+ 
++	/* count the buttons on touchpads */
++	if ((usage->hid & HID_USAGE_PAGE) == HID_UP_BUTTON)
++		td->buttons_count++;
++
+ 	if (usage->usage_index)
+ 		prev_usage = &field->usage[usage->usage_index - 1];
+ 
+@@ -721,6 +726,10 @@ static void mt_touch_input_configured(struct hid_device *hdev,
+ 	if (cls->quirks & MT_QUIRK_NOT_SEEN_MEANS_UP)
+ 		td->mt_flags |= INPUT_MT_DROP_UNUSED;
+ 
++	/* check for clickpads */
++	if ((td->mt_flags & INPUT_MT_POINTER) && (td->buttons_count == 1))
++		__set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
++
+ 	input_mt_init_slots(input, td->maxcontacts, td->mt_flags);
+ 
+ 	td->mt_flags = 0;
+-- 
+2.1.0
+

HID-rmi-check-sanity-of-the-incoming-report.patch

@@ -0,0 +1,107 @@
+From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Date: Wed, 10 Sep 2014 18:02:37 -0700
+Subject: [PATCH] HID: rmi: check sanity of the incoming report
+
+In the Dell XPS 13 9333, it appears that sometimes the bus get confused
+and corrupts the incoming data. It fills the input report with the
+sentinel value "ff". Synaptics told us that such behavior does not comes
+from the touchpad itself, so we filter out such reports here.
+
+Unfortunately, we can not simply discard the incoming data because they
+may contain useful information. Most of the time, the misbehavior is
+quite near the end of the report, so we can still use the valid part of
+it.
+
+Fixes:
+https://bugzilla.redhat.com/show_bug.cgi?id=1123584
+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+---
+ drivers/hid/hid-rmi.c | 44 ++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 38 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
+index 8389e8109218..3cccff73b9b9 100644
+--- a/drivers/hid/hid-rmi.c
++++ b/drivers/hid/hid-rmi.c
+@@ -320,10 +320,7 @@ static int rmi_f11_input_event(struct hid_device *hdev, u8 irq, u8 *data,
+ 	int offset;
+ 	int i;
+ 
+-	if (size < hdata->f11.report_size)
+-		return 0;
+-
+-	if (!(irq & hdata->f11.irq_mask))
++	if (!(irq & hdata->f11.irq_mask) || size <= 0)
+ 		return 0;
+ 
+ 	offset = (hdata->max_fingers >> 2) + 1;
+@@ -332,9 +329,19 @@ static int rmi_f11_input_event(struct hid_device *hdev, u8 irq, u8 *data,
+ 		int fs_bit_position = (i & 0x3) << 1;
+ 		int finger_state = (data[fs_byte_position] >> fs_bit_position) &
+ 					0x03;
++		int position = offset + 5 * i;
++
++		if (position + 5 > size) {
++			/* partial report, go on with what we received */
++			printk_once(KERN_WARNING
++				"%s %s: Detected incomplete finger report. Finger reports may occasionally get dropped on this platform.\n",
++				 dev_driver_string(&hdev->dev),
++				 dev_name(&hdev->dev));
++			hid_dbg(hdev, "Incomplete finger report\n");
++			break;
++		}
+ 
+-		rmi_f11_process_touch(hdata, i, finger_state,
+-				&data[offset + 5 * i]);
++		rmi_f11_process_touch(hdata, i, finger_state, &data[position]);
+ 	}
+ 	input_mt_sync_frame(hdata->input);
+ 	input_sync(hdata->input);
+@@ -352,6 +359,11 @@ static int rmi_f30_input_event(struct hid_device *hdev, u8 irq, u8 *data,
+ 	if (!(irq & hdata->f30.irq_mask))
+ 		return 0;
+ 
++	if (size < (int)hdata->f30.report_size) {
++		hid_warn(hdev, "Click Button pressed, but the click data is missing\n");
++		return 0;
++	}
++
+ 	for (i = 0; i < hdata->gpio_led_count; i++) {
+ 		if (test_bit(i, &hdata->button_mask)) {
+ 			value = (data[i / 8] >> (i & 0x07)) & BIT(0);
+@@ -412,9 +424,29 @@ static int rmi_read_data_event(struct hid_device *hdev, u8 *data, int size)
+ 	return 1;
+ }
+ 
++static int rmi_check_sanity(struct hid_device *hdev, u8 *data, int size)
++{
++	int valid_size = size;
++	/*
++	 * On the Dell XPS 13 9333, the bus sometimes get confused and fills
++	 * the report with a sentinel value "ff". Synaptics told us that such
++	 * behavior does not comes from the touchpad itself, so we filter out
++	 * such reports here.
++	 */
++
++	while ((data[valid_size - 1] == 0xff) && valid_size > 0)
++		valid_size--;
++
++	return valid_size;
++}
++
+ static int rmi_raw_event(struct hid_device *hdev,
+ 		struct hid_report *report, u8 *data, int size)
+ {
++	size = rmi_check_sanity(hdev, data, size);
++	if (size < 2)
++		return 0;
++
+ 	switch (data[0]) {
+ 	case RMI_READ_DATA_REPORT_ID:
+ 		return rmi_read_data_event(hdev, data, size);
+-- 
+1.9.3
+

Input-synaptics-add-min-max-quirk-for-Lenovo-S540.patch

@@ -0,0 +1,39 @@
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon, 8 Jun 2015 10:17:32 -0700
+Subject: [PATCH] Input: synaptics - add min/max quirk for Lenovo S540
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1223051#c2
+
+Cc: stable@vger.kernel.org
+Tested-by: tommy.gagnes@gmail.com
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+---
+ drivers/input/mouse/synaptics.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index 3b06c8a360b6..907ac9bdd763 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -148,6 +148,11 @@ static const struct min_max_quirk min_max_pnpid_table[] = {
+ 		1024, 5112, 2024, 4832
+ 	},
+ 	{
++		(const char * const []){"LEN2000", NULL},
++		{ANY_BOARD_ID, ANY_BOARD_ID},
++		1024, 5113, 2021, 4832
++	},
++	{
+ 		(const char * const []){"LEN2001", NULL},
+ 		{ANY_BOARD_ID, ANY_BOARD_ID},
+ 		1024, 5022, 2508, 4832
+@@ -188,7 +193,7 @@ static const char * const topbuttonpad_pnp_ids[] = {
+ 	"LEN0045",
+ 	"LEN0047",
+ 	"LEN0049",
+-	"LEN2000",
++	"LEN2000", /* S540 */
+ 	"LEN2001", /* Edge E431 */
+ 	"LEN2002", /* Edge E531 */
+ 	"LEN2003",

Input-synaptics-pin-3-touches-when-the-firmware-repo.patch

@@ -0,0 +1,47 @@
+From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Date: Thu, 16 Apr 2015 13:01:46 -0400
+Subject: [PATCH] Input - synaptics: pin 3 touches when the firmware reports 3
+ fingers
+
+Synaptics PS/2 touchpad can send only 2 touches in a report. They can
+detect 4 or 5 and this information is valuable.
+
+In commit 63c4fda (Input: synaptics - allocate 3 slots to keep stability
+in image sensors), we allocate 3 slots, but we still continue to report
+the 2 available fingers. That means that the client sees 2 used slots while
+there is a total of 3 fingers advertised by BTN_TOOL_TRIPLETAP.
+
+For old kernels this is not a problem because max_slots was 2 and libinput/
+xorg-synaptics knew how to deal with that. Now that max_slot is 3, the
+clients ignore BTN_TOOL_TRIPLETAP and count the actual used slots (so 2).
+It then gets confused when receiving the BTN_TOOL_TRIPLETAP and DOUBLETAP
+information, and goes wild.
+
+We can pin the 3 slots until we get a total number of fingers below 2.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1212230
+
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+---
+ drivers/input/mouse/synaptics.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index 630af73e98c4..c69b308beb3f 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -935,6 +935,14 @@ static void synaptics_report_mt_data(struct psmouse *psmouse,
+ 		input_report_abs(dev, ABS_MT_PRESSURE, hw[i]->z);
+ 	}
+ 
++	/* keep (slot count <= num_fingers) by pinning all slots */
++	if (num_fingers >= 3) {
++		for (i = 0; i < 3; i++) {
++			input_mt_slot(dev, i);
++			input_mt_report_slot_state(dev, MT_TOOL_FINGER, true);
++		}
++	}
++
+ 	input_mt_drop_unused(dev);
+ 
+ 	/* Don't use active slot count to generate BTN_TOOL events. */

KEYS-Add-a-system-blacklist-keyring.patch

@@ -0,0 +1,111 @@
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Fri, 26 Oct 2012 12:36:24 -0400
+Subject: [PATCH] KEYS: Add a system blacklist keyring
+
+This adds an additional keyring that is used to store certificates that
+are blacklisted.  This keyring is searched first when loading signed modules
+and if the module's certificate is found, it will refuse to load.  This is
+useful in cases where third party certificates are used for module signing.
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ include/keys/system_keyring.h |  4 ++++
+ init/Kconfig                  |  9 +++++++++
+ kernel/module_signing.c       | 12 ++++++++++++
+ kernel/system_keyring.c       | 17 +++++++++++++++++
+ 4 files changed, 42 insertions(+)
+
+diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h
+index 72665eb80692..2c7b80d31366 100644
+--- a/include/keys/system_keyring.h
++++ b/include/keys/system_keyring.h
+@@ -28,4 +28,8 @@ static inline struct key *get_system_trusted_keyring(void)
+ }
+ #endif
+ 
++#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
++extern struct key *system_blacklist_keyring;
++#endif
++
+ #endif /* _KEYS_SYSTEM_KEYRING_H */
+diff --git a/init/Kconfig b/init/Kconfig
+index 80a6907f91c5..dfdd7f738247 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1723,6 +1723,15 @@ config SYSTEM_TRUSTED_KEYRING
+ 
+ 	  Keys in this keyring are used by module signature checking.
+ 
++config SYSTEM_BLACKLIST_KEYRING
++	bool "Provide system-wide ring of blacklisted keys"
++	depends on KEYS
++	help
++	  Provide a system keyring to which blacklisted keys can be added.
++	  Keys in the keyring are considered entirely untrusted.  Keys in this
++	  keyring are used by the module signature checking to reject loading
++	  of modules signed with a blacklisted key.
++
+ config PROFILING
+ 	bool "Profiling support"
+ 	help
+diff --git a/kernel/module_signing.c b/kernel/module_signing.c
+index be5b8fac4bd0..fed815fcdaf2 100644
+--- a/kernel/module_signing.c
++++ b/kernel/module_signing.c
+@@ -158,6 +158,18 @@ static struct key *request_asymmetric_key(const char *signer, size_t signer_len,
+ 
+ 	pr_debug("Look up: \"%s\"\n", id);
+ 
++#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
++	key = keyring_search(make_key_ref(system_blacklist_keyring, 1),
++				   &key_type_asymmetric, id);
++	if (!IS_ERR(key)) {
++		/* module is signed with a cert in the blacklist.  reject */
++		pr_err("Module key '%s' is in blacklist\n", id);
++		key_ref_put(key);
++		kfree(id);
++		return ERR_PTR(-EKEYREJECTED);
++	}
++#endif
++
+ 	key = keyring_search(make_key_ref(system_trusted_keyring, 1),
+ 			     &key_type_asymmetric, id);
+ 	if (IS_ERR(key))
+diff --git a/kernel/system_keyring.c b/kernel/system_keyring.c
+index 875f64e8935b..c15e93f5a418 100644
+--- a/kernel/system_keyring.c
++++ b/kernel/system_keyring.c
+@@ -20,6 +20,9 @@
+ 
+ struct key *system_trusted_keyring;
+ EXPORT_SYMBOL_GPL(system_trusted_keyring);
++#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
++struct key *system_blacklist_keyring;
++#endif
+ 
+ extern __initconst const u8 system_certificate_list[];
+ extern __initconst const unsigned long system_certificate_list_size;
+@@ -41,6 +44,20 @@ static __init int system_trusted_keyring_init(void)
+ 		panic("Can't allocate system trusted keyring\n");
+ 
+ 	set_bit(KEY_FLAG_TRUSTED_ONLY, &system_trusted_keyring->flags);
++
++#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
++	system_blacklist_keyring = keyring_alloc(".system_blacklist_keyring",
++				    KUIDT_INIT(0), KGIDT_INIT(0),
++				    current_cred(),
++				    (KEY_POS_ALL & ~KEY_POS_SETATTR) |
++				    KEY_USR_VIEW | KEY_USR_READ,
++				    KEY_ALLOC_NOT_IN_QUOTA, NULL);
++	if (IS_ERR(system_blacklist_keyring))
++		panic("Can't allocate system blacklist keyring\n");
++
++	set_bit(KEY_FLAG_TRUSTED_ONLY, &system_blacklist_keyring->flags);
++#endif
++
+ 	return 0;
+ }
+ 
+-- 
+1.9.3
+

Kbuild-Add-an-option-to-enable-GCC-VTA.patch

@@ -0,0 +1,89 @@
+From: Josh Stone <jistone@redhat.com>
+Date: Fri, 21 Nov 2014 10:40:00 -0800
+Subject: [PATCH] Kbuild: Add an option to enable GCC VTA
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Due to recent codegen issues, gcc -fvar-tracking-assignments was
+unconditionally disabled in commit 2062afb4f804a ("Fix gcc-4.9.0
+miscompilation of load_balance() in scheduler").  However, this reduces
+the debuginfo coverage for variable locations, especially in inline
+functions.  VTA is certainly not perfect either in those cases, but it
+is much better than without.  With compiler versions that have fixed the
+codegen bugs, we would prefer to have the better details for SystemTap,
+and surely other debuginfo consumers like perf will benefit as well.
+
+This patch simply makes CONFIG_DEBUG_INFO_VTA an option.  I considered
+Frank and Linus's discussion of a cc-option-like -fcompare-debug test,
+but I'm convinced that a narrow test of an arch-specific codegen issue
+is not really useful.  GCC has their own regression tests for this, so
+I'd suggest GCC_COMPARE_DEBUG=-fvar-tracking-assignments-toggle is more
+useful for kernel developers to test confidence.
+
+In fact, I ran into a couple more issues when testing for this patch[1],
+although neither of those had any codegen impact.
+ [1] https://bugzilla.redhat.com/show_bug.cgi?id=1140872
+
+With gcc-4.9.2-1.fc22, I can now build v3.18-rc5 with Fedora's i686 and
+x86_64 configs, and this is completely clean with GCC_COMPARE_DEBUG.
+
+Cc: Frank Ch. Eigler <fche@redhat.com>
+Cc: Jakub Jelinek <jakub@redhat.com>
+Cc: Josh Boyer <jwboyer@fedoraproject.org>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Markus Trippelsdorf <markus@trippelsdorf.de>
+Cc: Michel Dänzer <michel@daenzer.net>
+Signed-off-by: Josh Stone <jistone@redhat.com>
+---
+ Makefile          |  4 ++++
+ lib/Kconfig.debug | 18 +++++++++++++++++-
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 3d16bcc87585..8d2cb8495b41 100644
+--- a/Makefile
++++ b/Makefile
+@@ -706,7 +706,11 @@ KBUILD_CFLAGS	+= -fomit-frame-pointer
+ endif
+ endif
+ 
++ifdef CONFIG_DEBUG_INFO_VTA
++KBUILD_CFLAGS   += $(call cc-option, -fvar-tracking-assignments)
++else
+ KBUILD_CFLAGS   += $(call cc-option, -fno-var-tracking-assignments)
++endif
+ 
+ ifdef CONFIG_DEBUG_INFO
+ ifdef CONFIG_DEBUG_INFO_SPLIT
+diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
+index c5cefb3c009c..b663e8e211b0 100644
+--- a/lib/Kconfig.debug
++++ b/lib/Kconfig.debug
+@@ -165,7 +165,23 @@ config DEBUG_INFO_DWARF4
+ 	  Generate dwarf4 debug info. This requires recent versions
+ 	  of gcc and gdb. It makes the debug information larger.
+ 	  But it significantly improves the success of resolving
+-	  variables in gdb on optimized code.
++	  variables in gdb on optimized code.  The gcc docs also
++	  recommend enabling -fvar-tracking-assignments for maximum
++	  benefit. (see DEBUG_INFO_VTA)
++
++config DEBUG_INFO_VTA
++	bool "Enable var-tracking-assignments for debuginfo"
++	depends on DEBUG_INFO
++	help
++	  Enable gcc -fvar-tracking-assignments for improved debug
++	  information on variable locations in optimized code.  Per
++	  gcc, DEBUG_INFO_DWARF4 is recommended for best use of VTA.
++
++	  VTA has been implicated in codegen bugs (gcc PR61801,
++	  PR61904), so this may deserve some caution.  One can set
++	  GCC_COMPARE_DEBUG=-fvar-tracking-assignments-toggle in the
++	  environment to automatically compile everything both ways,
++	  generating an error if anything differs.
+ 
+ config GDB_SCRIPTS
+ 	bool "Provide GDB scripts for kernel debugging"

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

@@ -0,0 +1,185 @@
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Fri, 26 Oct 2012 12:42:16 -0400
+Subject: [PATCH] MODSIGN: Import certificates from UEFI Secure Boot
+
+Secure Boot stores a list of allowed certificates in the 'db' variable.
+This imports those certificates into the system trusted keyring.  This
+allows for a third party signing certificate to be used in conjunction
+with signed modules.  By importing the public certificate into the 'db'
+variable, a user can allow a module signed with that certificate to
+load.  The shim UEFI bootloader has a similar certificate list stored
+in the 'MokListRT' variable.  We import those as well.
+
+In the opposite case, Secure Boot maintains a list of disallowed
+certificates in the 'dbx' variable.  We load those certificates into
+the newly introduced system blacklist keyring and forbid any module
+signed with those from loading.
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ include/linux/efi.h   |  6 ++++
+ init/Kconfig          |  9 +++++
+ kernel/Makefile       |  3 ++
+ kernel/modsign_uefi.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 110 insertions(+)
+ create mode 100644 kernel/modsign_uefi.c
+
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index 41359e548bcb..db9e6118575e 100644
+--- a/include/linux/efi.h
++++ b/include/linux/efi.h
+@@ -587,6 +587,12 @@ void efi_native_runtime_setup(void);
+ #define EFI_CERT_X509_GUID \
+     EFI_GUID(  0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 )
+ 
++#define EFI_IMAGE_SECURITY_DATABASE_GUID \
++    EFI_GUID(  0xd719b2cb, 0x3d3a, 0x4596, 0xa3, 0xbc, 0xda, 0xd0, 0x0e, 0x67, 0x65, 0x6f )
++
++#define EFI_SHIM_LOCK_GUID \
++    EFI_GUID(  0x605dab50, 0xe046, 0x4300, 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 )
++
+ typedef struct {
+ 	efi_guid_t guid;
+ 	u64 table;
+diff --git a/init/Kconfig b/init/Kconfig
+index dfdd7f738247..3c866db603a7 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1877,6 +1877,15 @@ config MODULE_SIG_ALL
+ comment "Do not forget to sign required modules with scripts/sign-file"
+ 	depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL
+ 
++config MODULE_SIG_UEFI
++	bool "Allow modules signed with certs stored in UEFI"
++	depends on MODULE_SIG && SYSTEM_BLACKLIST_KEYRING && EFI
++	select EFI_SIGNATURE_LIST_PARSER
++	help
++	  This will import certificates stored in UEFI and allow modules
++	  signed with those to be loaded.  It will also disallow loading
++	  of modules stored in the UEFI dbx variable.
++
+ choice
+ 	prompt "Which hash algorithm should modules be signed with?"
+ 	depends on MODULE_SIG
+diff --git a/kernel/Makefile b/kernel/Makefile
+index dc5c77544fd6..95bdf3398880 100644
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -45,6 +45,7 @@ obj-$(CONFIG_UID16) += uid16.o
+ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o
+ obj-$(CONFIG_MODULES) += module.o
+ obj-$(CONFIG_MODULE_SIG) += module_signing.o
++obj-$(CONFIG_MODULE_SIG_UEFI) += modsign_uefi.o
+ obj-$(CONFIG_KALLSYMS) += kallsyms.o
+ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
+ obj-$(CONFIG_KEXEC) += kexec.o
+@@ -99,6 +100,8 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o
+ 
+ $(obj)/configs.o: $(obj)/config_data.h
+ 
++$(obj)/modsign_uefi.o: KBUILD_CFLAGS += -fshort-wchar
++
+ # config_data.h contains the same information as ikconfig.h but gzipped.
+ # Info from config_data can be extracted from /proc/config*
+ targets += config_data.gz
+diff --git a/kernel/modsign_uefi.c b/kernel/modsign_uefi.c
+new file mode 100644
+index 000000000000..94b0eb38a284
+--- /dev/null
++++ b/kernel/modsign_uefi.c
+@@ -0,0 +1,92 @@
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/cred.h>
++#include <linux/err.h>
++#include <linux/efi.h>
++#include <linux/slab.h>
++#include <keys/asymmetric-type.h>
++#include <keys/system_keyring.h>
++#include "module-internal.h"
++
++static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, unsigned long *size)
++{
++	efi_status_t status;
++	unsigned long lsize = 4;
++	unsigned long tmpdb[4];
++	void *db = NULL;
++
++	status = efi.get_variable(name, guid, NULL, &lsize, &tmpdb);
++	if (status != EFI_BUFFER_TOO_SMALL) {
++		pr_err("Couldn't get size: 0x%lx\n", status);
++		return NULL;
++	}
++
++	db = kmalloc(lsize, GFP_KERNEL);
++	if (!db) {
++		pr_err("Couldn't allocate memory for uefi cert list\n");
++		goto out;
++	}
++
++	status = efi.get_variable(name, guid, NULL, &lsize, db);
++	if (status != EFI_SUCCESS) {
++		kfree(db);
++		db = NULL;
++		pr_err("Error reading db var: 0x%lx\n", status);
++	}
++out:
++	*size = lsize;
++	return db;
++}
++
++/*
++ *  * Load the certs contained in the UEFI databases
++ *   */
++static int __init load_uefi_certs(void)
++{
++	efi_guid_t secure_var = EFI_IMAGE_SECURITY_DATABASE_GUID;
++	efi_guid_t mok_var = EFI_SHIM_LOCK_GUID;
++	void *db = NULL, *dbx = NULL, *mok = NULL;
++	unsigned long dbsize = 0, dbxsize = 0, moksize = 0;
++	int rc = 0;
++
++	/* Check if SB is enabled and just return if not */
++	if (!efi_enabled(EFI_SECURE_BOOT))
++		return 0;
++
++	/* Get db, MokListRT, and dbx.  They might not exist, so it isn't
++	 * an error if we can't get them.
++	 */
++	db = get_cert_list(L"db", &secure_var, &dbsize);
++	if (!db) {
++		pr_err("MODSIGN: Couldn't get UEFI db list\n");
++	} else {
++		rc = parse_efi_signature_list(db, dbsize, system_trusted_keyring);
++		if (rc)
++			pr_err("Couldn't parse db signatures: %d\n", rc);
++		kfree(db);
++	}
++
++	mok = get_cert_list(L"MokListRT", &mok_var, &moksize);
++	if (!mok) {
++		pr_info("MODSIGN: Couldn't get UEFI MokListRT\n");
++	} else {
++		rc = parse_efi_signature_list(mok, moksize, system_trusted_keyring);
++		if (rc)
++			pr_err("Couldn't parse MokListRT signatures: %d\n", rc);
++		kfree(mok);
++	}
++
++	dbx = get_cert_list(L"dbx", &secure_var, &dbxsize);
++	if (!dbx) {
++		pr_info("MODSIGN: Couldn't get UEFI dbx list\n");
++	} else {
++		rc = parse_efi_signature_list(dbx, dbxsize,
++			system_blacklist_keyring);
++		if (rc)
++			pr_err("Couldn't parse dbx signatures: %d\n", rc);
++		kfree(dbx);
++	}
++
++	return rc;
++}
++late_initcall(load_uefi_certs);
+-- 
+1.9.3
+

MODSIGN-Support-not-importing-certs-from-db.patch

@@ -0,0 +1,83 @@
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Thu, 3 Oct 2013 10:14:23 -0400
+Subject: [PATCH] MODSIGN: Support not importing certs from db
+
+If a user tells shim to not use the certs/hashes in the UEFI db variable
+for verification purposes, shim will set a UEFI variable called MokIgnoreDB.
+Have the uefi import code look for this and not import things from the db
+variable.
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ kernel/modsign_uefi.c | 40 +++++++++++++++++++++++++++++++---------
+ 1 file changed, 31 insertions(+), 9 deletions(-)
+
+diff --git a/kernel/modsign_uefi.c b/kernel/modsign_uefi.c
+index 94b0eb38a284..ae28b974d49a 100644
+--- a/kernel/modsign_uefi.c
++++ b/kernel/modsign_uefi.c
+@@ -8,6 +8,23 @@
+ #include <keys/system_keyring.h>
+ #include "module-internal.h"
+ 
++static __init int check_ignore_db(void)
++{
++	efi_status_t status;
++	unsigned int db = 0;
++	unsigned long size = sizeof(db);
++	efi_guid_t guid = EFI_SHIM_LOCK_GUID;
++
++	/* Check and see if the MokIgnoreDB variable exists.  If that fails
++	 * then we don't ignore DB.  If it succeeds, we do.
++	 */
++	status = efi.get_variable(L"MokIgnoreDB", &guid, NULL, &size, &db);
++	if (status != EFI_SUCCESS)
++		return 0;
++
++	return 1;
++}
++
+ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid, unsigned long *size)
+ {
+ 	efi_status_t status;
+@@ -47,23 +64,28 @@ static int __init load_uefi_certs(void)
+ 	efi_guid_t mok_var = EFI_SHIM_LOCK_GUID;
+ 	void *db = NULL, *dbx = NULL, *mok = NULL;
+ 	unsigned long dbsize = 0, dbxsize = 0, moksize = 0;
+-	int rc = 0;
++	int ignore_db, rc = 0;
+ 
+ 	/* Check if SB is enabled and just return if not */
+ 	if (!efi_enabled(EFI_SECURE_BOOT))
+ 		return 0;
+ 
++	/* See if the user has setup Ignore DB mode */
++	ignore_db = check_ignore_db();
++
+ 	/* Get db, MokListRT, and dbx.  They might not exist, so it isn't
+ 	 * an error if we can't get them.
+ 	 */
+-	db = get_cert_list(L"db", &secure_var, &dbsize);
+-	if (!db) {
+-		pr_err("MODSIGN: Couldn't get UEFI db list\n");
+-	} else {
+-		rc = parse_efi_signature_list(db, dbsize, system_trusted_keyring);
+-		if (rc)
+-			pr_err("Couldn't parse db signatures: %d\n", rc);
+-		kfree(db);
++	if (!ignore_db) {
++		db = get_cert_list(L"db", &secure_var, &dbsize);
++		if (!db) {
++			pr_err("MODSIGN: Couldn't get UEFI db list\n");
++		} else {
++			rc = parse_efi_signature_list(db, dbsize, system_trusted_keyring);
++			if (rc)
++				pr_err("Couldn't parse db signatures: %d\n", rc);
++			kfree(db);
++		}
+ 	}
+ 
+ 	mok = get_cert_list(L"MokListRT", &mok_var, &moksize);
+-- 
+1.9.3
+

Makefile

@@ -31,7 +31,6 @@ debug:
 	@perl -pi -e 's/# CONFIG_DEBUG_STACK_USAGE is not set/CONFIG_DEBUG_STACK_USAGE=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_SLAB is not set/CONFIG_DEBUG_SLAB=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_MUTEXES is not set/CONFIG_DEBUG_MUTEXES=y/' config-nodebug
-	@perl -pi -e 's/# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set/CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_RT_MUTEXES is not set/CONFIG_DEBUG_RT_MUTEXES=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_LOCK_ALLOC is not set/CONFIG_DEBUG_LOCK_ALLOC=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_PROVE_LOCKING is not set/CONFIG_PROVE_LOCKING=y/' config-nodebug

Makefile.release

@@ -11,7 +11,6 @@ config-release:
 	@perl -pi -e 's/CONFIG_DEBUG_STACK_USAGE=y/# CONFIG_DEBUG_STACK_USAGE is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_SLAB=y/# CONFIG_DEBUG_SLAB is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_MUTEXES=y/# CONFIG_DEBUG_MUTEXES is not set/' config-nodebug
-	@perl -pi -e 's/CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y/# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_RT_MUTEXES=y/# CONFIG_DEBUG_RT_MUTEXES is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_LOCK_ALLOC=y/# CONFIG_DEBUG_LOCK_ALLOC is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_PROVE_LOCKING=y/# CONFIG_PROVE_LOCKING is not set/' config-nodebug

PCI-Lock-down-BAR-access-when-module-security-is-ena.patch

@@ -0,0 +1,116 @@
+From: Matthew Garrett <matthew.garrett@nebula.com>
+Date: Thu, 8 Mar 2012 10:10:38 -0500
+Subject: [PATCH] PCI: Lock down BAR access when module security is enabled
+
+Any hardware that can potentially generate DMA has to be locked down from
+userspace in order to avoid it being possible for an attacker to modify
+kernel code, allowing them to circumvent disabled module loading or module
+signing. Default to paranoid - in future we can potentially relax this for
+sufficiently IOMMU-isolated devices.
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ drivers/pci/pci-sysfs.c | 10 ++++++++++
+ drivers/pci/proc.c      |  8 +++++++-
+ drivers/pci/syscall.c   |  3 ++-
+ 3 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
+index 76ef7914c9aa..dddc802ccd2c 100644
+--- a/drivers/pci/pci-sysfs.c
++++ b/drivers/pci/pci-sysfs.c
+@@ -30,6 +30,7 @@
+ #include <linux/vgaarb.h>
+ #include <linux/pm_runtime.h>
+ #include <linux/of.h>
++#include <linux/module.h>
+ #include "pci.h"
+ 
+ static int sysfs_initialized;	/* = 0 */
+@@ -704,6 +705,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj,
+ 	loff_t init_off = off;
+ 	u8 *data = (u8 *) buf;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (off > dev->cfg_size)
+ 		return 0;
+ 	if (off + count > dev->cfg_size) {
+@@ -998,6 +1002,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
+ 	resource_size_t start, end;
+ 	int i;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	for (i = 0; i < PCI_ROM_RESOURCE; i++)
+ 		if (res == &pdev->resource[i])
+ 			break;
+@@ -1099,6 +1106,9 @@ static ssize_t pci_write_resource_io(struct file *filp, struct kobject *kobj,
+ 				     struct bin_attribute *attr, char *buf,
+ 				     loff_t off, size_t count)
+ {
++	if (secure_modules())
++		return -EPERM;
++
+ 	return pci_resource_io(filp, kobj, attr, buf, off, count, true);
+ }
+ 
+diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
+index 3f155e78513f..4265ea07e3b0 100644
+--- a/drivers/pci/proc.c
++++ b/drivers/pci/proc.c
+@@ -116,6 +116,9 @@ static ssize_t proc_bus_pci_write(struct file *file, const char __user *buf,
+ 	int size = dev->cfg_size;
+ 	int cnt;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (pos >= size)
+ 		return 0;
+ 	if (nbytes >= size)
+@@ -195,6 +198,9 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
+ #endif /* HAVE_PCI_MMAP */
+ 	int ret = 0;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	switch (cmd) {
+ 	case PCIIOC_CONTROLLER:
+ 		ret = pci_domain_nr(dev->bus);
+@@ -233,7 +239,7 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
+ 	struct pci_filp_private *fpriv = file->private_data;
+ 	int i, ret;
+ 
+-	if (!capable(CAP_SYS_RAWIO))
++	if (!capable(CAP_SYS_RAWIO) || secure_modules())
+ 		return -EPERM;
+ 
+ 	/* Make sure the caller is mapping a real resource for this device */
+diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
+index b91c4da68365..98f5637304d1 100644
+--- a/drivers/pci/syscall.c
++++ b/drivers/pci/syscall.c
+@@ -10,6 +10,7 @@
+ #include <linux/errno.h>
+ #include <linux/pci.h>
+ #include <linux/syscalls.h>
++#include <linux/module.h>
+ #include <asm/uaccess.h>
+ #include "pci.h"
+ 
+@@ -92,7 +93,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn,
+ 	u32 dword;
+ 	int err = 0;
+ 
+-	if (!capable(CAP_SYS_ADMIN))
++	if (!capable(CAP_SYS_ADMIN) || secure_modules())
+ 		return -EPERM;
+ 
+ 	dev = pci_get_bus_and_slot(bus, dfn);
+-- 
+1.9.3
+

PatchList.txt

@@ -1,109 +1,147 @@
-**** Queued for 3.2 ***********************************************************************************
+**** Backports and patches headed/already upstream *****************************
 
-* acpi-ensure-thermal-limits-match-cpu-freq.patch
-* revert-efi-rtclock.patch
-* block-stray-block-put-after-teardown.patch
-* efi-dont-map-boot-services-on-32bit.patch
+* 0001-Revert-epoll-use-freezable-blocking-call.patch
+  0001-Revert-select-use-freezable-blocking-call.patch (rhbz 1010603)
+  - Backport of upstream commits:
+  c511851de162e8ec03d62e7d7feecbdf590d881d
+  59612d187912750f416fbffe0c00bc0811c54ab5
 
-**** Queued for 3.3 ***********************************************************************************
-drm-edid-try-harder-to-fix-up-broken-headers.patch
-ext4-Support-check-none-nocheck-mount-options.patch
+* net-flow_dissector-fail-on-evil-iph-ihl.patch (rhbz 1007939 1025647)
+  - Should hit upstream and stable soon
 
-**** Other stuff that should go upstream (in decreasing likelyhood) ************************************
+* intel-3.12-stable-fixes.patch (rhbz 995782)
+  - Backport of upstream commits:
+  4f56d12ebb28fceac4c6e60c8993fbfc122e1399
+  7195a50b5c7e00cc3312934fd022c3006b533d12
+  c6cd2ee2d59111a07cd9199564c9bdcb2d11e5cf
+  645378d85ee524e429aa4cf52806047b56cdc596
+  1fbc0d789d12fec313c91912fc11733fdfbab863
 
-* linux-2.6-acpi-video-dos.patch
-* linux-2.6-defaults-acpi-video.patch
-* linux-2.6-defaults-aspm.patch
+* cifs-Allow-LANMAN-auth-for-unencapsulated-auth-methods.patch (rhbz 1011621)
+  - Backport of upstream commit dde2356c8466298bd77fa699e0ea296372eed47b
+
+* net_311.mbox (rhbz 1023495)
+  - Networking patches queued for 3.11.7
+
+* alps-Support-for-Dell-XT2-model.patch (1023413)
+  - http://article.gmane.org/gmane.linux.kernel.input/32484
+
+* tcp-fix-incorrect-ca_state-in-tail-loss-probe.patch (rhbz 989251)
+  - Backport of upstream commit 031afe4990a7c9dbff41a3a742c44d3e740ea0a1
+
+* fix-buslogic.patch (rhbz 1015558)
+  - Backport of upstream commit 6541932ea2f7de0b0c5203decf666b143ad5fa33
+
+* rt2800usb-slow-down-TX-status-polling.patch (rhbz 984696)
+  - Still pending upstream.  Fixes https://bugzilla.kernel.org/show_bug.cgi?id=62781
+
+* btrfs-relocate-csums-properly-with-prealloc-ext.patch (rhbz 1011714)
+  - Still pending upstream
+
+* fix-radeon-sound.patch (rhbz 1010679)
+  - Backport of:
+  062c2e4363451d49ef840232fe65e8bff0dde2a5
+  e7d12c2f98ae1e68c7298e5028048d150fa553a1
+  ee0fec312a1c4e26f255955da942562cd8908a4b
+  b852c985010a77c850b7548d64bbb964ca462b02
+  - fixes https://bugs.freedesktop.org/show_bug.cgi?id=69675
+
+* cpupower-Fix-segfault-due-to-incorrect-getopt_long-a.patch (rhbz 1000439)
+  - Queued for next upstream release I believe.  Fixes a segfault in cpupower
+
+* dm-cache-policy-mq_fix-large-scale-table-allocation-bug.patch (rhbz 993744)
+  - Still pending upstream
+
+* 0001-iwlwifi-don-t-WARN-on-host-commands-sent-when-firmwa.patch (rhbz 896695)
+  - Backport of commit 8ca95995e64f5d270889badb3e449dca91106a2b
+
+* 0002-iwlwifi-don-t-WARN-on-bad-firmware-state.patch (rhbz 896695)
+  - Still pending upstream
+
+* vfio-iommu-Fixed-interaction-of-VFIO_IOMMU_MAP_DMA.patch (rhbz 998732)
+  - Still pending upstream
+
+* iommu-Remove-stack-trace-from-broken-irq-remapping-warning.patch (rhbz 982153)
+  - Still pending upstream
+
+* netfilter-nf_conntrack-use-RCU-safe-kfree-for-conntr.patch
+  - Backport of commit c13a84a830a208fb3443628773c8ca0557773cc7
+
+* rt2800-add-support-for-rf3070.patch (rhbz 974072)
+  - Actually I'm unsure of what the upstream status on this one is.
+
+* elevator-Fix-a-race-in-elevator-switching-and-md.patch
+* elevator-acquire-q-sysfs_lock-in-elevator_change.patch (rhbz 902012)
+  - I believe these are both queued for the next upstream release
+
+* bonding-driver-alb-learning.patch (rhbz 971893)
+  - Backport of commit 7eacd03810960823393521063734fc8188446bca
+
+* Revert-rt2x00pci-Use-PCI-MSIs-whenever-possible.patch
+  - Backport of commit dfb6b7c109a7f98d324a759599d1b4616f02c79f
+
+* ntp-Make-periodic-RTC-update-more-reliable.patch (rhbz 985522)
+  - I believe this is queued in John Stultz's tree for 3.13
+
+* ansi_cprng-Fix-off-by-one-error-in-non-block-size-request.patch (rhbz 1007690 1009136)
+  - Fixes CVE-2013-4345
+
+* media-cx23885-Fix-TeVii-S471-regression-since-introduction-of-ts2020.patch (rhbz 963715)
+  - Backport of commit b43ea8068d2090cb1e44632c8a938ab40d2c7419
+
+* iwl3945-better-skb-management-in-rx-path.patch
+* iwl4965-better-skb-management-in-rx-path.patch (rhbz 977040)
+  - Backport of commits 45fe142cefa864b685615bcb930159f6749c3667 and
+c1de4a9557d9e25e41fc4ba034b9659152205539
+
+* ath9k_rx_dma_stop_check.patch (rhbz 892811)
+  - Fixes some DMA issue on specific hardware.  Taken from
+https://dev.openwrt.org/browser/trunk/package/mac80211/patches/552-ath9k_rx_dma_stop_check.patch?rev=34910
+
+* secure-modules.patch
+* modsign-uefi.patch
+* sb-hibernate.patch
+* sysrq-secure-boot.patch
+  - Fedora secure boot support.
+  - Dear Matthew, this is your fault.  Run sed already and get a new set out.
+
+* keys-expand-keyring.patch
+* keys-krb-support.patch
+* keys-x509-improv.patch
+* keyring-quota.patch
+  - I believe these are all now queued for 3.13 in James Morris' tree.
+
+**** Other stuff that should go upstream (in decreasing likelyhood) ************
+
+* defaults-acpi-video.patch
 * disable-i8042-check-on-apple-mac.patch
-* linux-2.6.30-no-pcspkr-modalias.patch
+* no-pcspkr-modalias.patch
 * die-floppy-die.patch
 	Fedora policy decisions
 	Turn into CONFIG_ options and upstream ?
 
-* linux-2.6-input-kill-stupid-messages.patch
-* linux-2.6-silence-acpi-blacklist.patch
-* linux-2.6-silence-fbcon-logo.patch
-* linux-2.6-silence-noise.patch
+* input-kill-stupid-messages.patch
+* silence-acpi-blacklist.patch
+* silence-fbcon-logo.patch
+* silence-noise.patch
 	Fedora local 'hush' patches.  (TODO: push more upstream)
 
-* linux-2.6-makefile-after_link.patch
+* makefile-after_link.patch
   Rolandware that is used by the debuginfo generation.
   Possibly upstreamable ?
 
-* linux-2.6-serial-460800.patch
+* serial-460800.patch
 	Probably not upstreamable.
 	http://marc.theaimsgroup.com/?l=linux-kernel&m=112687270832687&w=2
 	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=126403
 	http://lkml.org/lkml/2006/8/2/208
 
-* linux-2.6-acpi-debug-infinite-loop.patch
-  Responsible: mjg59
-
-* fix_xen_guest_on_old_EC2.patch
-  Ugly for upstream. It's a hack to make old HV's work optimally.
-  Eventually we can drop it, but probably not until fixed HV's
-  are commonplace. (When?)
-  Responsible: Justin.
-
-* add-appleir-usb-driver.patch
-  Added September 2009, but had been around even before that.
-  " NACKed upstream with "i'll implement this in the ir framework" or something
-  and never got around to it."
-  Responsible: j-rod
-
-* dmar-disable-when-ricoh-multifunction.patch
-  Added October 2010
-
-* linux-2.6-intel-iommu-igfx.patch
-  Invert igfx_off/igfx_on option. Around since forever. Upstreamable ?
-  Mustard ? Config option ?
-
-* arm-omap-dt-compat.patch
-* arm-smsc-support-reading-mac-address-from-device-tree.patch
-  reponsible: Dennis
-
-***********************************************************************************
+********************************************************************************
 
 'MUSTARD' patches.  Fedora local patches that are very unlikely to go upstream.
 
-* linux-2.6-32bit-mmap-exec-randomization.patch
-  One half of the remaining exec-shield diff.
-  - davej bugged Ingo again on Jun 17 2011 about upstreaming, no response.
-  - mailed Linus asking for opinions in August 2011. He still hates it.
-   "Ugh. Certainly not in this form. That patch is just disgusting." ..
-   "I think that with NX and now SMEP, if you really care about security,
-    you'd better be using a CPU that supports 64-bit operations anyway."
-   As well as the increased randomisation, there's a key part of this patch
-   that means that DSOs get loaded in the ASCII-Armor area on 32bit.
-   (Addresses have topmost byte == 0)
-   See also https://bugzilla.redhat.com/show_bug.cgi?id=734239
-
-* linux-2.6-i386-nx-emulation.patch
-  The ugly segment hack part of exec-shield that Linus hates.
-  Unlikely to ever go upstream.
-
-* linux-2.6-crash-driver.patch
+* crash-driver.patch
 	Unlikely to go upstream.
 	https://bugzilla.redhat.com/show_bug.cgi?id=492803
 
-* linux-2.6-e1000-ich9-montevina.patch
-  Intel hates it. Davej has an SDV that needs it.
-  Low maintenence, and worth hanging onto until it gets replaced
-  with something that fails in a different way.
-
-* utrace.patch
-  Hopefully it'll die when uprobes gets upstream.
-
-
-***********************************************************************************
-
-Spec file/config todos/cleanups
-
-* modules-extra: Do a few more things to make it a bit more robust.
-  - Allow for comments in the mod-extra.list file.
-  - Don't fail the build if a module is listed but not built (maybe).
-  - See if it can be tied into Kconfig instead of module names.
-
-* investigate gzip modules. Everything should support this now?
-  Looks like about 70M savings per kernel installed.
-
+********************************************************************************

Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch

@@ -0,0 +1,41 @@
+From: Matthew Garrett <matthew.garrett@nebula.com>
+Date: Fri, 9 Mar 2012 09:28:15 -0500
+Subject: [PATCH] Restrict /dev/mem and /dev/kmem when module loading is
+ restricted
+
+Allowing users to write to address space makes it possible for the kernel
+to be subverted, avoiding module loading restrictions. Prevent this when
+any restrictions have been imposed on loading modules.
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ drivers/char/mem.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/drivers/char/mem.c b/drivers/char/mem.c
+index cdf839f9defe..c63cf93b00eb 100644
+--- a/drivers/char/mem.c
++++ b/drivers/char/mem.c
+@@ -164,6 +164,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
+ 	if (p != *ppos)
+ 		return -EFBIG;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (!valid_phys_addr_range(p, count))
+ 		return -EFAULT;
+ 
+@@ -502,6 +505,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
+ 	char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
+ 	int err = 0;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	if (p < (unsigned long) high_memory) {
+ 		unsigned long to_write = min_t(unsigned long, count,
+ 					       (unsigned long)high_memory - p);
+-- 
+1.9.3
+

Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch

@@ -0,0 +1,44 @@
+Bugzilla: N/A
+Upstream-status: Sigh.  We almost got to drop this.
+
+From 20e3f1e1b9341d233a11734c07c076caac9936ef Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Mon, 28 Jul 2014 12:59:48 -0400
+Subject: [PATCH] Revert "Revert "ACPI / video: change acpi-video
+ brightness_switch_enabled default to 0""
+
+This reverts commit 2843768b701971ab10e62c77d5c75ad7c306f1bd.
+---
+ Documentation/kernel-parameters.txt | 2 +-
+ drivers/acpi/video.c                | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
+index b7fa2f599459..e8db409a7e3a 100644
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -3532,7 +3532,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+ 			the allocated input device; If set to 0, video driver
+ 			will only send out the event without touching backlight
+ 			brightness level.
+-			default: 1
++			default: 0
+ 
+ 	virtio_mmio.device=
+ 			[VMMIO] Memory mapped virtio (platform) device.
+diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
+index 350d52a8f781..44c89f705018 100644
+--- a/drivers/acpi/video.c
++++ b/drivers/acpi/video.c
+@@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot");
+ MODULE_DESCRIPTION("ACPI Video Driver");
+ MODULE_LICENSE("GPL");
+ 
+-static bool brightness_switch_enabled = 1;
++static bool brightness_switch_enabled;
+ module_param(brightness_switch_enabled, bool, 0644);
+ 
+ /*
+-- 
+1.9.3
+

USB-quirks-device-qualifier-quirk-for-another-Elan-t.patch

@@ -0,0 +1,30 @@
+From: Adel Gadllah <adel.gadllah@gmail.com>
+Date: Tue, 7 Oct 2014 18:42:28 +0200
+Subject: [PATCH] USB: quirks: device-qualifier quirk for another Elan
+ touchscreen
+
+Yet another device affected by this.
+
+Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com>
+---
+ drivers/usb/core/quirks.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
+index cac60d9b091b..e71bad25294c 100644
+--- a/drivers/usb/core/quirks.c
++++ b/drivers/usb/core/quirks.c
+@@ -98,6 +98,10 @@ static const struct usb_device_id usb_quirk_list[] = {
+ 			USB_QUIRK_DEVICE_QUALIFIER },
+ 
+ 	/* Elan Touchscreen */
++	{ USB_DEVICE(0x04f3, 0x016f), .driver_info =
++			USB_QUIRK_DEVICE_QUALIFIER },
++
++	/* Elan Touchscreen */
+ 	{ USB_DEVICE(0x04f3, 0x009b), .driver_info =
+ 			USB_QUIRK_DEVICE_QUALIFIER },
+ 
+-- 
+1.9.3
+

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

@@ -0,0 +1,38 @@
+From: Josh Boyer <jwboyer@redhat.com>
+Date: Mon, 25 Jun 2012 19:57:30 -0400
+Subject: [PATCH] acpi: Ignore acpi_rsdp kernel parameter when module loading
+ is restricted
+
+This option allows userspace to pass the RSDP address to the kernel, which
+makes it possible for a user to circumvent any restrictions imposed on
+loading modules. Disable it in that case.
+
+Signed-off-by: Josh Boyer <jwboyer@redhat.com>
+---
+ drivers/acpi/osl.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
+index 3abe9b223ba7..ee8f11cf65da 100644
+--- a/drivers/acpi/osl.c
++++ b/drivers/acpi/osl.c
+@@ -44,6 +44,7 @@
+ #include <linux/list.h>
+ #include <linux/jiffies.h>
+ #include <linux/semaphore.h>
++#include <linux/module.h>
+ 
+ #include <asm/io.h>
+ #include <asm/uaccess.h>
+@@ -245,7 +246,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
+ acpi_physical_address __init acpi_os_get_root_pointer(void)
+ {
+ #ifdef CONFIG_KEXEC
+-	if (acpi_rsdp)
++	if (acpi_rsdp && !secure_modules())
+ 		return acpi_rsdp;
+ #endif
+ 
+-- 
+1.9.3
+

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-Add-force-native-backlight-quirk-for-Leno.patch

@@ -0,0 +1,84 @@
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Tue, 3 Mar 2015 08:31:24 +0100
+Subject: [PATCH] acpi: video: Add force native backlight quirk for Lenovo
+ Ideapad Z570
+
+The Lenovo Ideapad Z570 (which is an Acer in disguise like some other Ideapads)
+has a broken acpi_video interface, this was fixed in commmit a11d342fb8
+("ACPI / video: force vendor backlight on Lenovo Ideapad Z570").
+
+Which stops acpi_video from registering a backlight interface, but this is
+only a partial fix, because for people who have the ideapad-laptop module
+installed that module will now register a backlight interface, which also
+does not work, so we need to use the native intel_backlight interface.
+
+The Lenovo Ideapad 570 is a pre-win8 laptop / too old for the acpi-video code
+to automatically prefer the native backlight interface, so add a quirk for it.
+
+This commit also removes the previous incomplete fix.
+
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1187004
+Cc: Stepan Bujnak <stepanbujnak@fastmail.fm>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/acpi/video.c        | 17 +++++++++++++++++
+ drivers/acpi/video_detect.c |  8 --------
+ 2 files changed, 17 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
+index 2f1f16df460c..16d744e4552f 100644
+--- a/drivers/acpi/video.c
++++ b/drivers/acpi/video.c
+@@ -425,6 +425,12 @@ static int __init video_disable_native_backlight(const struct dmi_system_id *d)
+ 	return 0;
+ }
+ 
++static int __init video_enable_native_backlight(const struct dmi_system_id *d)
++{
++	use_native_backlight_dmi = NATIVE_BACKLIGHT_ON;
++	return 0;
++}
++
+ static struct dmi_system_id video_dmi_table[] __initdata = {
+ 	/*
+ 	 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
+@@ -556,6 +562,17 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+ 		DMI_MATCH(DMI_PRODUCT_NAME, "XPS L521X"),
+ 		},
+ 	},
++
++	/* Non win8 machines which need native backlight nevertheless */
++	{
++	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1187004 */
++	 .callback = video_enable_native_backlight,
++	 .ident = "Lenovo Ideapad Z570",
++	 .matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++		DMI_MATCH(DMI_PRODUCT_NAME, "102434U"),
++		},
++	},
+ 	{}
+ };
+ 
+diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
+index 27c43499977a..c42feb2bacd0 100644
+--- a/drivers/acpi/video_detect.c
++++ b/drivers/acpi/video_detect.c
+@@ -174,14 +174,6 @@ static struct dmi_system_id video_detect_dmi_table[] = {
+ 		DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5737"),
+ 		},
+ 	},
+-	{
+-	.callback = video_detect_force_vendor,
+-	.ident = "Lenovo IdeaPad Z570",
+-	.matches = {
+-		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+-		DMI_MATCH(DMI_PRODUCT_VERSION, "Ideapad Z570"),
+-		},
+-	},
+ 	{ },
+ };
+ 
+-- 
+2.1.0
+

acpi-video-Allow-forcing-native-backlight-on-non-win.patch

@@ -0,0 +1,76 @@
+From: Aaron Lu <aaron.lu@intel.com>
+Date: Wed, 11 Mar 2015 14:14:56 +0800
+Subject: [PATCH] acpi: video: Allow forcing native backlight on non win8
+ machines
+
+The native backlight behavior (so not registering both the acpi-video
+and the vendor backlight driver) can be useful on some non win8 machines
+too, so change the behavior of the video.use_native_backlight=1 or 0
+kernel cmdline option to be: if user has set video.use_native_backlight=1
+or 0, use that no matter if it is a win8 system or not. Also, we will
+put some known systems into the DMI table to make them either use native
+backlight interface or not, and the use_native_backlight_dmi is used to
+reflect that.
+
+Original-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Aaron Lu <aaron.lu@intel.com>
+Acked-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/acpi/video.c | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
+index 497622ce5c31..2f1f16df460c 100644
+--- a/drivers/acpi/video.c
++++ b/drivers/acpi/video.c
+@@ -82,9 +82,15 @@ module_param(allow_duplicates, bool, 0644);
+  * For Windows 8 systems: used to decide if video module
+  * should skip registering backlight interface of its own.
+  */
+-static int use_native_backlight_param = -1;
++enum {
++	NATIVE_BACKLIGHT_NOT_SET = -1,
++	NATIVE_BACKLIGHT_OFF,
++	NATIVE_BACKLIGHT_ON,
++};
++
++static int use_native_backlight_param = NATIVE_BACKLIGHT_NOT_SET;
+ module_param_named(use_native_backlight, use_native_backlight_param, int, 0444);
+-static bool use_native_backlight_dmi = true;
++static int use_native_backlight_dmi = NATIVE_BACKLIGHT_NOT_SET;
+ 
+ static int register_count;
+ static struct mutex video_list_lock;
+@@ -237,15 +243,16 @@ static void acpi_video_switch_brightness(struct work_struct *work);
+ 
+ static bool acpi_video_use_native_backlight(void)
+ {
+-	if (use_native_backlight_param != -1)
++	if (use_native_backlight_param != NATIVE_BACKLIGHT_NOT_SET)
+ 		return use_native_backlight_param;
+-	else
++	else if (use_native_backlight_dmi != NATIVE_BACKLIGHT_NOT_SET)
+ 		return use_native_backlight_dmi;
++	return acpi_osi_is_win8();
+ }
+ 
+ bool acpi_video_verify_backlight_support(void)
+ {
+-	if (acpi_osi_is_win8() && acpi_video_use_native_backlight() &&
++	if (acpi_video_use_native_backlight() &&
+ 	    backlight_device_registered(BACKLIGHT_RAW))
+ 		return false;
+ 	return acpi_video_backlight_support();
+@@ -414,7 +421,7 @@ static int __init video_set_bqc_offset(const struct dmi_system_id *d)
+ 
+ static int __init video_disable_native_backlight(const struct dmi_system_id *d)
+ {
+-	use_native_backlight_dmi = false;
++	use_native_backlight_dmi = NATIVE_BACKLIGHT_OFF;
+ 	return 0;
+ }
+ 
+-- 
+2.1.0
+

acpi-video-add-disable_native_backlight_quirk_for_samsung_510r.patch

@@ -0,0 +1,39 @@
+From b29c0d36da67a64f5de1fe167c0b807815aa1da4 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 4 Feb 2015 14:44:51 +0100
+Subject: [PATCH 2/2] acpi-video: Add disable_native_backlight quirk for
+ Samsung 510R
+
+Backlight control through the native intel interface does not work properly
+on the Samsung 510R, where as using the acpi_video interface does work, add
+a quirk for this.
+
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1186097
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/acpi/video.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
+index 497d986..88a4f99 100644
+--- a/drivers/acpi/video.c
++++ b/drivers/acpi/video.c
+@@ -523,6 +523,15 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+ 		},
+ 	},
+ 	{
++	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1186097 */
++	 .callback = video_disable_native_backlight,
++	 .ident = "SAMSUNG 3570R/370R/470R/450R/510R/4450RV",
++	 .matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
++		DMI_MATCH(DMI_PRODUCT_NAME, "3570R/370R/470R/450R/510R/4450RV"),
++		},
++	},
++	{
+ 	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1094948 */
+ 	 .callback = video_disable_native_backlight,
+ 	 .ident = "SAMSUNG 730U3E/740U3E",
+-- 
+2.1.0
+

acpi_video-Add-enable_native_backlight-quirk-for-Mac.patch

@@ -0,0 +1,37 @@
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Thu, 28 May 2015 18:25:46 +0200
+Subject: [PATCH] acpi_video: Add enable_native_backlight quirk for
+ MacbookPro12,1
+
+It seems that the latest generation of MacbookPro needs to use the
+native backlight driver, just like most modern laptops do, but it does
+not automatically get enabled as the Apple BIOS does not advertise
+Windows 8 compatibility. So add a quirk for this.
+
+Cc: Christopher Beland <beland@alum.mit.edu>
+Reported-by: Christopher Beland <beland@alum.mit.edu>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/acpi/video.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
+index d9bf8ba7d848..b57d69370bac 100644
+--- a/drivers/acpi/video.c
++++ b/drivers/acpi/video.c
+@@ -583,6 +583,15 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+ 		DMI_MATCH(DMI_PRODUCT_NAME, "102434U"),
+ 		},
+ 	},
++	{
++	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1217249 */
++	 .callback = video_enable_native_backlight,
++	 .ident = "Apple MacBook Pro 12,1",
++	 .matches = {
++		DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
++		DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro12,1"),
++		},
++	},
+ 	{}
+ };
+ 

arm-dma-amba_pl08x-avoid-64bit-division.patch

@@ -1,36 +0,0 @@
-diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
-index 06fe45c..63744cf 100644
---- a/drivers/dma/amba-pl08x.c
-+++ b/drivers/dma/amba-pl08x.c
-@@ -886,8 +886,8 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
- 				return 0;
- 			}
- 
--			if ((bd.srcbus.addr % bd.srcbus.buswidth) ||
--					(bd.dstbus.addr % bd.dstbus.buswidth)) {
-+			if ((((u8)(bd.srcbus.addr & 0xff)) % bd.srcbus.buswidth) ||
-+					(((u8)(bd.dstbus.addr & 0xff)) % bd.dstbus.buswidth)) {
- 				dev_err(&pl08x->adev->dev,
- 					"%s src & dst address must be aligned to src"
- 					" & dst width if peripheral is flow controller",
-@@ -908,9 +908,8 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
- 		 */
- 		if (bd.remainder < mbus->buswidth)
- 			early_bytes = bd.remainder;
--		else if ((mbus->addr) % (mbus->buswidth)) {
--			early_bytes = mbus->buswidth - (mbus->addr) %
--				(mbus->buswidth);
-+		else if ((early_bytes = (u8)(mbus->addr & 0xff) % mbus->buswidth)) {
-+			early_bytes = mbus->buswidth - early_bytes;
- 			if ((bd.remainder - early_bytes) < mbus->buswidth)
- 				early_bytes = bd.remainder;
- 		}
-@@ -928,7 +927,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
- 			 * Master now aligned
- 			 * - if slave is not then we must set its width down
- 			 */
--			if (sbus->addr % sbus->buswidth) {
-+			if (((u8)(sbus->addr & 0xff)) % sbus->buswidth) {
- 				dev_dbg(&pl08x->adev->dev,
- 					"%s set down bus width to one byte\n",
- 					__func__);

arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch

@@ -0,0 +1,45 @@
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Thu, 13 Mar 2014 14:18:52 -0500
+Subject: [PATCH] arm: dts: am335x-bone-common: add
+ uart2_pins/uart4_pins/uart5_pins
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
+index 86cdb52dbf8a..db4518ef755d 100644
+--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
+@@ -105,6 +105,27 @@
+ 		>;
+ 	};
+ 
++	uart2_pins: pinmux_uart2_pins {
++		pinctrl-single,pins = <
++			0x150 0x21	/* spi0_sclk.uart2_rxd | MODE1 */
++			0x154 0x01	/* spi0_d0.uart2_txd | MODE1 */
++		>;
++	};
++
++	uart4_pins: pinmux_uart4_pins {
++		pinctrl-single,pins = <
++			0x070 0x26	/* gpmc_wait0.uart4_rxd | MODE6 */
++			0x074 0x06	/* gpmc_wpn.uart4_txd | MODE6 */
++		>;
++	};
++
++	uart5_pins: pinmux_uart5_pins {
++		pinctrl-single,pins = <
++			0x0C4 0x24	/* lcd_data9.uart5_rxd | MODE4 */
++			0x0C0 0x04	/* lcd_data8.uart5_txd | MODE4 */
++		>;
++	};
++
+ 	clkout2_pin: pinmux_clkout2_pin {
+ 		pinctrl-single,pins = <
+ 			0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
+-- 
+1.9.3
+

arm-dts-am335x-bone-common-enable-and-use-i2c2.patch

@@ -0,0 +1,69 @@
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Tue, 31 Dec 2013 11:17:45 -0600
+Subject: [PATCH] arm: dts: am335x-bone-common: enable and use i2c2
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 39 +++++++++++++++++++++++++++++++
+ 1 file changed, 39 insertions(+)
+
+diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
+index bde1777b62be..c7357bcc7d5c 100644
+--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
+@@ -84,6 +84,13 @@
+ 		>;
+ 	};
+ 
++	i2c2_pins: pinmux_i2c2_pins {
++		pinctrl-single,pins = <
++			0x178 0x73 /* (SLEWCTRL_SLOW | PIN_INPUT_PULLUP | MUX_MODE3) uart1_ctsn.i2c2_sda */
++			0x17c 0x73 /* (SLEWCTRL_SLOW | PIN_INPUT_PULLUP | MUX_MODE3) uart1_rtsn.i2c2_scl */
++		>;
++	};
++
+ 	uart0_pins: pinmux_uart0_pins {
+ 		pinctrl-single,pins = <
+ 			0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
+@@ -220,6 +227,38 @@
+ 		reg = <0x24>;
+ 	};
+ 
++	baseboard_eeprom: baseboard_eeprom@50 {
++		compatible = "at,24c256";
++		reg = <0x50>;
++	};
++};
++
++&i2c2 {
++	status = "okay";
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c2_pins>;
++
++	clock-frequency = <100000>;
++
++	cape_eeprom0: cape_eeprom0@54 {
++		compatible = "at,24c256";
++		reg = <0x54>;
++	};
++
++	cape_eeprom1: cape_eeprom1@55 {
++		compatible = "at,24c256";
++		reg = <0x55>;
++	};
++
++	cape_eeprom2: cape_eeprom2@56 {
++		compatible = "at,24c256";
++		reg = <0x56>;
++	};
++
++	cape_eeprom3: cape_eeprom3@57 {
++		compatible = "at,24c256";
++		reg = <0x57>;
++	};
+ };
+ 
+ /include/ "tps65217.dtsi"
+-- 
+1.9.3
+

arm-dts-am335x-bone-common-setup-default-pinmux-http.patch

@@ -0,0 +1,269 @@
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Tue, 31 Dec 2013 14:18:00 -0600
+Subject: [PATCH] arm: dts: am335x-bone-common: setup default pinmux
+ http://elinux.org/Basic_Proto_Cape
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 222 ++++++++++++++++++++++++++++++
+ 1 file changed, 222 insertions(+)
+
+diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
+index 1fd496fe1a68..9688dda39e7a 100644
+--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
+@@ -95,6 +95,20 @@
+ 		>;
+ 	};
+ 
++	uart1_pins: pinmux_uart1_pins {
++		pinctrl-single,pins = <
++			0x180 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart1_rxd.uart1_rxd */
++			0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart1_txd.uart1_txd */
++		>;
++	};
++
++	uart1_pins: pinmux_uart1_pins {
++		pinctrl-single,pins = <
++			0x180 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart1_rxd.uart1_rxd */
++			0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart1_txd.uart1_txd */
++		>;
++	};
++
+ 	clkout2_pin: pinmux_clkout2_pin {
+ 		pinctrl-single,pins = <
+ 			0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
+@@ -175,6 +189,60 @@
+ 			0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */
+ 		>;
+ 	};
++
++	spi0_pins: pinmux_spi0_pins {
++		pinctrl-single,pins = <
++			0x150 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_sclk.spi0_sclk */
++			0x154 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_d0.spi0_d0 */
++			0x158 (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_d1.spi0_d1 */
++			0x15c (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_cs0.spi0_cs0 */
++		>;
++	};
++
++	ehrpwm1_pin_p9_14: pinmux_ehrpwm1_pin_p9_14 {
++		pinctrl-single,pins = <
++			0x048 0x6	/* P9_14 (ZCZ ball U14) | MODE 6 */
++		>;
++	};
++
++	ehrpwm1_pin_p9_16: pinmux_ehrpwm1_pin_p9_16 {
++		pinctrl-single,pins = <
++			0x04c 0x6	/* P9_16 (ZCZ ball T14) | MODE 6 */
++		>;
++	};
++
++	ecap0_pin_p9_42: pinmux_ecap0_pin_p9_42 {
++		pinctrl-single,pins = <
++			0x164 0x0	/* P9_42 (ZCZ ball C18) | MODE 0 */
++		>;
++	};
++
++	spi0_pins: pinmux_spi0_pins {
++		pinctrl-single,pins = <
++			0x150 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_sclk.spi0_sclk */
++			0x154 (PIN_INPUT_PULLUP | MUX_MODE0)	/* spi0_d0.spi0_d0 */
++			0x158 (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_d1.spi0_d1 */
++			0x15c (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* spi0_cs0.spi0_cs0 */
++		>;
++	};
++
++	ehrpwm1_pin_p9_14: pinmux_ehrpwm1_pin_p9_14 {
++		pinctrl-single,pins = <
++			0x048 0x6	/* P9_14 (ZCZ ball U14) | MODE 6 */
++		>;
++	};
++
++	ehrpwm1_pin_p9_16: pinmux_ehrpwm1_pin_p9_16 {
++		pinctrl-single,pins = <
++			0x04c 0x6	/* P9_16 (ZCZ ball T14) | MODE 6 */
++		>;
++	};
++
++	ecap0_pin_p9_42: pinmux_ecap0_pin_p9_42 {
++		pinctrl-single,pins = <
++			0x164 0x0	/* P9_42 (ZCZ ball C18) | MODE 0 */
++		>;
++	};
+ };
+ 
+ &uart0 {
+@@ -184,6 +252,20 @@
+ 	status = "okay";
+ };
+ 
++&uart1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart1_pins>;
++
++	status = "okay";
++};
++
++&uart1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart1_pins>;
++
++	status = "okay";
++};
++
+ &usb {
+ 	status = "okay";
+ };
+@@ -259,6 +341,106 @@
+ 	};
+ };
+ 
++&epwmss0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&ecap0_pin_p9_42>;
++	status = "okay";
++
++	ecap@48300100 {
++		status = "okay";
++	};
++};
++
++&epwmss1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <
++		&ehrpwm1_pin_p9_14
++		&ehrpwm1_pin_p9_16
++	>;
++
++	status = "okay";
++
++	ehrpwm@48302200 {
++		status = "okay";
++	};
++};
++
++&spi0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&spi0_pins>;
++	status = "okay";
++
++	spidev0: spi@0 {
++		compatible = "spidev";
++		reg = <0>;
++		spi-max-frequency = <16000000>;
++		spi-cpha;
++	};
++
++	spidev1: spi@1 {
++		compatible = "spidev";
++		reg = <1>;
++		spi-max-frequency = <16000000>;
++	};
++};
++
++&tscadc {
++	status = "okay";
++	adc {
++		ti,adc-channels = <4 5 6>;
++	};
++};
++
++&epwmss0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&ecap0_pin_p9_42>;
++	status = "okay";
++
++	ecap@48300100 {
++		status = "okay";
++	};
++};
++
++&epwmss1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <
++		&ehrpwm1_pin_p9_14
++		&ehrpwm1_pin_p9_16
++	>;
++
++	status = "okay";
++
++	ehrpwm@48302200 {
++		status = "okay";
++	};
++};
++
++&spi0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&spi0_pins>;
++	status = "okay";
++
++	spidev0: spi@0 {
++		compatible = "spidev";
++		reg = <0>;
++		spi-max-frequency = <16000000>;
++		spi-cpha;
++	};
++
++	spidev1: spi@1 {
++		compatible = "spidev";
++		reg = <1>;
++		spi-max-frequency = <16000000>;
++	};
++};
++
++&tscadc {
++	status = "okay";
++	adc {
++		ti,adc-channels = <4 5 6>;
++	};
++};
++
+ /include/ "tps65217.dtsi"
+ 
+ &tps {
+@@ -347,4 +529,44 @@
+ 
+ &sham {
+ 	status = "okay";
++
++};
++
++/ {
++	ocp {
++		//FIXME: these pwm's still need work, this guild isn't working..
++		//http://elinux.org/EBC_Exercise_13_Pulse_Width_Modulation
++		pwm_test_P9_14@0 {
++			compatible = "pwm_test";
++			pwms = <&ehrpwm1 0 500000 1>;
++			pwm-names = "PWM_P9_14";
++			pinctrl-names = "default";
++			pinctrl-0 = <&ehrpwm1_pin_p9_14>;
++			enabled = <1>;
++			duty = <0>;
++			status = "okay";
++		};
++
++		pwm_test_P9_16@0 {
++			compatible = "pwm_test";
++			pwms = <&ehrpwm1 0 500000 1>;
++			pwm-names = "PWM_P9_16";
++			pinctrl-names = "default";
++			pinctrl-0 = <&ehrpwm1_pin_p9_16>;
++			enabled = <1>;
++			duty = <0>;
++			status = "okay";
++		};
++
++		pwm_test_P9_42 {
++			compatible = "pwm_test";
++			pwms = <&ecap0 0 500000 1>;
++			pwm-names = "PWM_P9_42";
++			pinctrl-names = "default";
++			pinctrl-0 = <&ecap0_pin_p9_42>;
++			enabled = <1>;
++			duty = <0>;
++			status = "okay";
++		};
++	};
+ };

arm-dts-am335x-boneblack-add-cpu0-opp-points.patch

@@ -0,0 +1,41 @@
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Fri, 27 Dec 2013 13:14:19 -0600
+Subject: [PATCH] arm: dts: am335x-boneblack: add cpu0 opp points
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-boneblack.dts | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
+index bf5349165542..acfff3befff5 100644
+--- a/arch/arm/boot/dts/am335x-boneblack.dts
++++ b/arch/arm/boot/dts/am335x-boneblack.dts
+@@ -66,6 +66,24 @@
+ };
+ 
+ / {
++	cpus {
++		cpu@0 {
++			cpu0-supply = <&dcdc2_reg>;
++			/*
++			 * To consider voltage drop between PMIC and SoC,
++			 * tolerance value is reduced to 2% from 4% and
++			 * voltage value is increased as a precaution.
++			 */
++			operating-points = <
++				/* kHz    uV */
++				1000000	1325000
++				800000	1300000
++				600000  1112000
++				300000   969000
++			>;
++		};
++	};
++
+ 	hdmi {
+ 		compatible = "ti,tilcdc,slave";
+ 		i2c = <&i2c0>;
+-- 
+1.9.3
+

arm-dts-am335x-boneblack-lcdc-add-panel-info.patch

@@ -0,0 +1,38 @@
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Fri, 27 Dec 2013 13:05:09 -0600
+Subject: [PATCH] arm: dts: am335x-boneblack: lcdc add panel-info
+
+Bugzilla: 1012025
+Upstream-status: In beagle github repository https://github.com/beagleboard/kernel
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-boneblack.dts | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
+index 305975d3f531..bf5349165542 100644
+--- a/arch/arm/boot/dts/am335x-boneblack.dts
++++ b/arch/arm/boot/dts/am335x-boneblack.dts
+@@ -73,5 +73,18 @@
+ 		pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
+ 		pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
+ 		status = "okay";
++
++		panel-info {
++			bpp = <16>;
++			ac-bias = <255>;
++			ac-bias-intrpt = <0>;
++			dma-burst-sz = <16>;
++			fdd = <16>;
++			sync-edge = <1>;
++			sync-ctrl = <1>;
++			raster-order = <0>;
++			fifo-th = <0>;
++			invert-pxl-clk;
++		};
+ 	};
+ };
+-- 
+1.9.3
+

arm-exynos-mp.patch

@@ -1,428 +0,0 @@
-commit 8b806e0201b97844d0eff4713eb88f0a6d0f689d
-Author: Arnd Bergmann <arnd@arndb.de>
-Date:   Fri Jun 14 17:16:30 2013 +0200
-
-    ARM: exynos multiplatform, next try
-    
-    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-    
-diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
-index e401a76..fad9324 100644
---- a/arch/arm/Kconfig.debug
-+++ b/arch/arm/Kconfig.debug
-@@ -422,7 +422,7 @@ choice
- 
- 	config DEBUG_S3C_UART0
- 		depends on PLAT_SAMSUNG
--		select DEBUG_EXYNOS_UART if ARCH_EXYNOS
-+		select DEBUG_EXYNOS_UART if ARCH_EXYNOS_COMMON
- 		bool "Use S3C UART 0 for low-level debug"
- 		help
- 		  Say Y here if you want the debug print routines to direct
-@@ -434,7 +434,7 @@ choice
- 
- 	config DEBUG_S3C_UART1
- 		depends on PLAT_SAMSUNG
--		select DEBUG_EXYNOS_UART if ARCH_EXYNOS
-+		select DEBUG_EXYNOS_UART if ARCH_EXYNOS_COMMON
- 		bool "Use S3C UART 1 for low-level debug"
- 		help
- 		  Say Y here if you want the debug print routines to direct
-@@ -446,7 +446,7 @@ choice
- 
- 	config DEBUG_S3C_UART2
- 		depends on PLAT_SAMSUNG
--		select DEBUG_EXYNOS_UART if ARCH_EXYNOS
-+		select DEBUG_EXYNOS_UART if ARCH_EXYNOS_COMMON
- 		bool "Use S3C UART 2 for low-level debug"
- 		help
- 		  Say Y here if you want the debug print routines to direct
-@@ -457,7 +457,7 @@ choice
- 		  by CONFIG_S3C_LOWLEVEL_UART_PORT.
- 
- 	config DEBUG_S3C_UART3
--		depends on PLAT_SAMSUNG && ARCH_EXYNOS
-+		depends on PLAT_SAMSUNG && ARCH_EXYNOS_COMMON
- 		select DEBUG_EXYNOS_UART
- 		bool "Use S3C UART 3 for low-level debug"
- 		help
-diff --git a/arch/arm/include/debug/samsung.S b/arch/arm/include/debug/samsung.S
-index f3a9cff..8d8d922 100644
---- a/arch/arm/include/debug/samsung.S
-+++ b/arch/arm/include/debug/samsung.S
-@@ -9,7 +9,7 @@
-  * published by the Free Software Foundation.
- */
- 
--#include <plat/regs-serial.h>
-+#include <linux/serial_s3c.h>
- 
- /* The S5PV210/S5PC110 implementations are as belows. */
- 
-diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
-index 855d4a7..8744890 100644
---- a/arch/arm/mach-exynos/Kconfig
-+++ b/arch/arm/mach-exynos/Kconfig
-@@ -7,13 +7,24 @@
- 
- # Configuration options for the EXYNOS4
- 
--if ARCH_EXYNOS
-+config ARCH_EXYNOS_MULTI
-+	bool "Samsung EXYNOS" if ARCH_MULTI_V7
-+	select ARCH_HAS_CPUFREQ
-+	select CPU_V7
-+	select GENERIC_CLOCKEVENTS
-+	select HAVE_CLK
-+	select HAVE_S3C2410_I2C if I2C
-+	select HAVE_S3C_RTC if RTC_CLASS
-+	help
-+	  Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)
-+
-+if ARCH_EXYNOS || ARCH_EXYNOS_MULTI
- 
- menu "SAMSUNG EXYNOS SoCs Support"
- 
- config ARCH_EXYNOS4
- 	bool "SAMSUNG EXYNOS4"
--	default y
-+	default ARCH_EXYNOS
- 	select GIC_NON_BANKED
- 	select HAVE_ARM_SCU if SMP
- 	select HAVE_SMP
-@@ -24,12 +35,16 @@ config ARCH_EXYNOS4
- 
- config ARCH_EXYNOS5
- 	bool "SAMSUNG EXYNOS5"
-+	default ARCH_EXYNOS
- 	select HAVE_ARM_SCU if SMP
- 	select HAVE_SMP
- 	select PINCTRL
- 	help
- 	  Samsung EXYNOS5 (Cortex-A15) SoC based systems
- 
-+config ARCH_EXYNOS_COMMON
-+	def_bool ARCH_EXYNOS4 || ARCH_EXYNOS5
-+
- comment "EXYNOS SoCs"
- 
- config CPU_EXYNOS4210
-@@ -41,7 +56,7 @@ config CPU_EXYNOS4210
- 	select PM_GENERIC_DOMAINS if PM
- 	select S5P_PM if PM
- 	select S5P_SLEEP if PM
--	select SAMSUNG_DMADEV
-+	select SAMSUNG_DMADEV if !ARCH_MULTIPLATFORM
- 	help
- 	  Enable EXYNOS4210 CPU support
- 
-@@ -49,10 +64,11 @@ config SOC_EXYNOS4212
- 	bool "SAMSUNG EXYNOS4212"
- 	default y
- 	depends on ARCH_EXYNOS4
-+	select MACH_EXYNOS4_DT
- 	select PINCTRL_EXYNOS
- 	select S5P_PM if PM
- 	select S5P_SLEEP if PM
--	select SAMSUNG_DMADEV
-+	select SAMSUNG_DMADEV if !ARCH_MULTIPLATFORM
- 	help
- 	  Enable EXYNOS4212 SoC support
- 
-@@ -60,8 +76,9 @@ config SOC_EXYNOS4412
- 	bool "SAMSUNG EXYNOS4412"
- 	default y
- 	depends on ARCH_EXYNOS4
-+	select MACH_EXYNOS4_DT
- 	select PINCTRL_EXYNOS
--	select SAMSUNG_DMADEV
-+	select SAMSUNG_DMADEV if !ARCH_MULTIPLATFORM
- 	help
- 	  Enable EXYNOS4412 SoC support
- 
-@@ -70,11 +87,12 @@ config SOC_EXYNOS5250
- 	default y
- 	depends on ARCH_EXYNOS5
- 	select PINCTRL_EXYNOS
-+	select MACH_EXYNOS5_DT
- 	select PM_GENERIC_DOMAINS if PM
- 	select S5P_PM if PM
- 	select S5P_SLEEP if PM
- 	select S5P_DEV_MFC
--	select SAMSUNG_DMADEV
-+	select SAMSUNG_DMADEV if !ARCH_MULTIPLATFORM
- 	help
- 	  Enable EXYNOS5250 SoC support
- 
-@@ -121,9 +139,7 @@ config MACH_EXYNOS4_DT
- 	  with this machine file.
- 
- config MACH_EXYNOS5_DT
--	bool "SAMSUNG EXYNOS5 Machine using device tree"
--	default y
--	depends on ARCH_EXYNOS5
-+	bool
- 	select ARM_AMBA
- 	select CLKSRC_OF
- 	select USB_ARCH_HAS_XHCI
-diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
-index e970a7a..ae397bb 100644
---- a/arch/arm/mach-exynos/Makefile
-+++ b/arch/arm/mach-exynos/Makefile
-diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
-@@ -5,14 +5,11 @@
- #
- # Licensed under GPLv2
- 
--obj-y				:=
--obj-m				:=
--obj-n				:=
--obj-				:=
-+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung
- 
--# Core
-+ifdef CONFIG_ARCH_EXYNOS_COMMON
- 
--obj-$(CONFIG_ARCH_EXYNOS)	+= common.o
-+obj-y                          += pmu.o
- 
- obj-$(CONFIG_S5P_PM)		+= pm.o
- obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
-@@ -24,8 +21,8 @@
- 
- obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o
- 
--obj-$(CONFIG_ARCH_EXYNOS)	+= exynos-smc.o
--obj-$(CONFIG_ARCH_EXYNOS)	+= firmware.o
-++obj-y                          += exynos-smc.o
-++obj-y                          += firmware.o
- 
- plus_sec := $(call as-instr,.arch_extension sec,+sec)
- AFLAGS_exynos-smc.o		:=-Wa,-march=armv7-a$(plus_sec)
-@@ -34,3 +31,5 @@
- 
- obj-$(CONFIG_MACH_EXYNOS4_DT)		+= mach-exynos4-dt.o
- obj-$(CONFIG_MACH_EXYNOS5_DT)		+= mach-exynos5-dt.o
-+
-+endif
-index 3dc5cbe..e61abdc 100644
---- a/arch/arm/plat-samsung/Kconfig
-+++ b/arch/arm/plat-samsung/Kconfig
-@@ -6,7 +6,7 @@
- 
- config PLAT_SAMSUNG
- 	bool
--	depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS
-+	depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS_COMMON
- 	default y
- 	select GENERIC_IRQ_CHIP
- 	select NO_IOPORT
-@@ -176,6 +176,7 @@ config S5P_DEV_UART
- 
- config S3C_ADC
- 	bool "ADC common driver support"
-+	depends on !ARCH_MULTIPLATFORM
- 	help
- 	  Core support for the ADC block found in the Samsung SoC systems
- 	  for drivers such as the touchscreen and hwmon to use to share
-@@ -396,6 +397,7 @@ config S5P_DEV_USB_EHCI
- 
- config S3C24XX_PWM
- 	bool "PWM device support"
-+	depends on !ARCH_MULTIPLATFORM
- 	select PWM
- 	select PWM_SAMSUNG
- 	help
-@@ -453,7 +455,7 @@ comment "Power management"
- config SAMSUNG_PM_DEBUG
- 	bool "S3C2410 PM Suspend debug"
- 	depends on PM
--	select DEBUG_LL
-+	depends on DEBUG_LL && SERIAL_SAMSUNG
- 	help
- 	  Say Y here if you want verbose debugging from the PM Suspend and
- 	  Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
-diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
-index 98d07d8..b458e7d 100644
---- a/arch/arm/plat-samsung/Makefile
-+++ b/arch/arm/plat-samsung/Makefile
-@@ -4,6 +4,9 @@
- #
- # Licensed under GPLv2
- 
-+ccflags-$(CONFIG_ARCH_MULTI_V7) += -I$(srctree)/$(src)/include
-+ccflags-$(CONFIG_ARCH_EXYNOS_COMMON) += -I$(srctree)/arch/arm/mach-exynos/include
-+
- obj-y				:=
- obj-m				:=
- obj-n				:= dummy.o
-diff --git a/arch/arm/plat-samsung/s5p-irq-pm.c b/arch/arm/plat-samsung/s5p-irq-pm.c
-index 7c1e3b7..dc66bb5 100644
---- a/arch/arm/plat-samsung/s5p-irq-pm.c
-+++ b/arch/arm/plat-samsung/s5p-irq-pm.c
-@@ -40,7 +40,7 @@ int s3c_irq_wake(struct irq_data *data, unsigned int state)
- 	unsigned long irqbit;
- 	unsigned int irq_rtc_tic, irq_rtc_alarm;
- 
--#ifdef CONFIG_ARCH_EXYNOS
-+#ifdef CONFIG_ARCH_EXYNOS_COMMON
- 	if (soc_is_exynos5250()) {
- 		irq_rtc_tic = EXYNOS5_IRQ_RTC_TIC;
- 		irq_rtc_alarm = EXYNOS5_IRQ_RTC_ALARM;
-diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
-index 81465c2..6bd8b5a 100644
---- a/drivers/clocksource/Kconfig
-+++ b/drivers/clocksource/Kconfig
-@@ -75,7 +75,7 @@ config CLKSRC_METAG_GENERIC
- 	  This option enables support for the Meta per-thread timers.
- 
- config CLKSRC_EXYNOS_MCT
--	def_bool y if ARCH_EXYNOS
-+	def_bool y if ARCH_EXYNOS_COMMON
- 	help
- 	  Support for Multi Core Timer controller on Exynos SoCs.
- 
-diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
-index de4d5d9..ffe9cb3 100644
---- a/drivers/cpufreq/Kconfig.arm
-+++ b/drivers/cpufreq/Kconfig.arm
-@@ -27,6 +27,7 @@ config ARM_EXYNOS_CPUFREQ
- 
- 	  If in doubt, say N.
- 
-+if ARM_EXYNOS_CPUFREQ
- config ARM_EXYNOS4210_CPUFREQ
- 	def_bool CPU_EXYNOS4210
- 	help
-@@ -54,6 +55,7 @@ config ARM_EXYNOS5440_CPUFREQ
- 	  SoC. The nature of exynos5440 clock controller is
- 	  different than previous exynos controllers so not using
- 	  the common exynos framework.
-+endif
- 
- config ARM_HIGHBANK_CPUFREQ
- 	tristate "Calxeda Highbank-based"
-diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
-index 31f3adb..15454ad 100644
---- a/drivers/devfreq/Kconfig
-+++ b/drivers/devfreq/Kconfig
-@@ -68,6 +68,7 @@ comment "DEVFREQ Drivers"
- config ARM_EXYNOS4_BUS_DEVFREQ
- 	bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver"
- 	depends on CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412
-+	depends on !ARCH_MULTIPLATFORM
- 	select ARCH_HAS_OPP
- 	select DEVFREQ_GOV_SIMPLE_ONDEMAND
- 	help
-diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
-index 6c6034e..d9ed7c0 100644
---- a/drivers/iommu/Kconfig
-+++ b/drivers/iommu/Kconfig
-@@ -168,7 +168,7 @@ config TEGRA_IOMMU_SMMU
- 
- config EXYNOS_IOMMU
- 	bool "Exynos IOMMU Support"
--	depends on ARCH_EXYNOS && EXYNOS_DEV_SYSMMU
-+	depends on ARCH_EXYNOS_COMMON && EXYNOS_DEV_SYSMMU
- 	select IOMMU_API
- 	help
- 	  Support for the IOMMU(System MMU) of Samsung Exynos application
-diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
-index 5a8ad51..03688dd 100644
---- a/drivers/pinctrl/Kconfig
-+++ b/drivers/pinctrl/Kconfig
-@@ -252,7 +252,7 @@ config PINCTRL_SAMSUNG
- 
- config PINCTRL_EXYNOS
- 	bool "Pinctrl driver data for Samsung EXYNOS SoCs other than 5440"
--	depends on OF && GPIOLIB && ARCH_EXYNOS
-+	depends on OF && GPIOLIB && ARCH_EXYNOS_COMMON
- 	select PINCTRL_SAMSUNG
- 
- config PINCTRL_EXYNOS5440
-diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
-index 75840b5..746a931 100644
---- a/drivers/pwm/Kconfig
-+++ b/drivers/pwm/Kconfig
-@@ -140,7 +140,7 @@ config PWM_RENESAS_TPU
- 
- config PWM_SAMSUNG
- 	tristate "Samsung PWM support"
--	depends on PLAT_SAMSUNG
-+	depends on PLAT_SAMSUNG && !ARCH_MULTIPLATFORM
- 	help
- 	  Generic PWM framework driver for Samsung.
- 
-diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
-index 89cbbab..830b8e7 100644
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -365,7 +365,7 @@ config SPI_S3C24XX_FIQ
- 
- config SPI_S3C64XX
- 	tristate "Samsung S3C64XX series type SPI"
--	depends on (ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5P64X0 || ARCH_EXYNOS)
-+	depends on (ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5P64X0 || ARCH_EXYNOS_COMMON)
- 	select S3C64XX_DMA if ARCH_S3C64XX
- 	help
- 	  SPI driver for Samsung S3C64XX and newer SoCs.
-diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
-index 4263d01..d7ad720 100644
---- a/drivers/usb/host/Kconfig
-+++ b/drivers/usb/host/Kconfig
-@@ -462,7 +462,7 @@ config USB_OHCI_SH
- 
- config USB_OHCI_EXYNOS
- 	boolean "OHCI support for Samsung EXYNOS SoC Series"
--	depends on ARCH_EXYNOS
-+	depends on ARCH_EXYNOS_COMMON
- 	help
- 	 Enable support for the Samsung Exynos SOC's on-chip OHCI controller.
- 
-diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
-index 2c301f8..0ba3e03 100644
---- a/drivers/video/Kconfig
-+++ b/drivers/video/Kconfig
-@@ -2039,7 +2039,7 @@ config FB_TMIO_ACCELL
- config FB_S3C
- 	tristate "Samsung S3C framebuffer support"
- 	depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || ARCH_S5P64X0 || \
--		ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
-+		ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS_COMMON)
- 	select FB_CFB_FILLRECT
- 	select FB_CFB_COPYAREA
- 	select FB_CFB_IMAGEBLIT
-diff --git a/drivers/video/exynos/Kconfig b/drivers/video/exynos/Kconfig
-index b8abda5..216af14 100644
---- a/drivers/video/exynos/Kconfig
-+++ b/drivers/video/exynos/Kconfig
-@@ -15,7 +15,7 @@ if EXYNOS_VIDEO
- 
- config EXYNOS_MIPI_DSI
- 	bool "EXYNOS MIPI DSI driver support."
--	depends on ARCH_S5PV210 || ARCH_EXYNOS
-+	depends on ARCH_S5PV210 || ARCH_EXYNOS_COMMON
- 	help
- 	  This enables support for MIPI-DSI device.
- 
-@@ -29,7 +29,7 @@ config EXYNOS_LCD_S6E8AX0
- 
- config EXYNOS_DP
- 	bool "EXYNOS DP driver support"
--	depends on ARCH_EXYNOS
-+	depends on ARCH_EXYNOS_COMMON
- 	default n
- 	help
- 	  This enables support for DP device.
-diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
-index 9855dfc..fcb2045 100644
---- a/sound/soc/samsung/Kconfig
-+++ b/sound/soc/samsung/Kconfig
-@@ -1,6 +1,6 @@
- config SND_SOC_SAMSUNG
- 	tristate "ASoC support for Samsung"
--	depends on PLAT_SAMSUNG
-+	depends on PLAT_SAMSUNG && !ARCH_MULTIPLATFORM
- 	select S3C64XX_DMA if ARCH_S3C64XX
- 	select S3C2410_DMA if ARCH_S3C24XX
- 	help

arm-highbank-l2-reverts.patch

@@ -0,0 +1,60 @@
+From: Kyle McMartin <kmcmartin@redhat.com>
+Date: Tue, 30 Sep 2014 16:19:47 -0400
+Subject: [PATCH] arm: highbank l2 reverts
+
+Revert some v3.16 changes to mach-highbank which broke L2 cache enablement.
+Will debug upstream separately, but we need F22/21 running there. (#1139762)
+---
+ arch/arm/mach-highbank/highbank.c | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
+index 8c35ae4ff176..38e1dc3b4c6e 100644
+--- a/arch/arm/mach-highbank/highbank.c
++++ b/arch/arm/mach-highbank/highbank.c
+@@ -51,13 +51,11 @@ static void __init highbank_scu_map_io(void)
+ }
+ 
+ 
+-static void highbank_l2c310_write_sec(unsigned long val, unsigned reg)
++static void highbank_l2x0_disable(void)
+ {
+-	if (reg == L2X0_CTRL)
+-		highbank_smc1(0x102, val);
+-	else
+-		WARN_ONCE(1, "Highbank L2C310: ignoring write to reg 0x%x\n",
+-			  reg);
++	outer_flush_all();
++	/* Disable PL310 L2 Cache controller */
++	highbank_smc1(0x102, 0x0);
+ }
+ 
+ static void __init highbank_init_irq(void)
+@@ -66,6 +64,14 @@ static void __init highbank_init_irq(void)
+ 
+ 	if (of_find_compatible_node(NULL, NULL, "arm,cortex-a9"))
+ 		highbank_scu_map_io();
++
++	/* Enable PL310 L2 Cache controller */
++	if (IS_ENABLED(CONFIG_CACHE_L2X0) &&
++	    of_find_compatible_node(NULL, NULL, "arm,pl310-cache")) {
++		highbank_smc1(0x102, 0x1);
++		l2x0_of_init(0, ~0);
++		outer_cache.disable = highbank_l2x0_disable;
++	}
+ }
+ 
+ static void highbank_power_off(void)
+@@ -179,9 +185,6 @@ DT_MACHINE_START(HIGHBANK, "Highbank")
+ #if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
+ 	.dma_zone_size	= (4ULL * SZ_1G),
+ #endif
+-	.l2c_aux_val	= 0,
+-	.l2c_aux_mask	= ~0,
+-	.l2c_write_sec	= highbank_l2c310_write_sec,
+ 	.init_irq	= highbank_init_irq,
+ 	.init_machine	= highbank_init,
+ 	.dt_compat	= highbank_match,
+-- 
+1.9.3
+

arm-i.MX6-Utilite-device-dtb.patch

@@ -0,0 +1,65 @@
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Fri, 11 Jul 2014 00:10:56 +0100
+Subject: [PATCH] arm: i.MX6 Utilite device dtb
+
+---
+ arch/arm/boot/dts/imx6q-cm-fx6.dts | 38 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 38 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
+index 99b46f8030ad..8b6ddd16dcc5 100644
+--- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
++++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
+@@ -97,11 +97,49 @@
+ 				MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA	0x1b0b1
+ 			>;
+ 		};
++
++		pinctrl_usdhc1: usdhc1grp {
++			fsl,pins = <
++				MX6QDL_PAD_SD1_CMD__SD1_CMD             0x17059
++				MX6QDL_PAD_SD1_CLK__SD1_CLK             0x10059
++				MX6QDL_PAD_SD1_DAT0__SD1_DATA0          0x17059
++				MX6QDL_PAD_SD1_DAT1__SD1_DATA1          0x17059
++				MX6QDL_PAD_SD1_DAT2__SD1_DATA2          0x17059
++				MX6QDL_PAD_SD1_DAT3__SD1_DATA3          0x17059
++			>;
++		};
++
++		pinctrl_usdhc3: usdhc3grp {
++			fsl,pins = <
++				MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17059
++				MX6QDL_PAD_SD3_CLK__SD3_CLK             0x10059
++				MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x17059
++				MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x17059
++				MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x17059
++				MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x17059
++			>;
++		};
+ 	};
+ };
+ 
++&sata {
++	status = "okay";
++};
++
+ &uart4 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pinctrl_uart4>;
+ 	status = "okay";
+ };
++
++&usdhc1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_usdhc1>;
++	status = "okay";
++};
++
++&usdhc3 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_usdhc3>;
++	status = "okay";
++};
+-- 
+1.9.3
+

arm-imx-fixsound.patch

@@ -1,65 +0,0 @@
-From 3f1a91aa25579ba5e7268a47a73d2a83e4802c62 Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <fabio.estevam@freescale.com>
-Date: Mon, 29 Jul 2013 21:37:32 +0000
-Subject: ASoC: fsl: Fix module build
-
-Building imx_v6_v7_defconfig with all audio drivers as modules results in
-the folowing build error:
-
-ERROR: "imx_pcm_fiq_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
-ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
-ERROR: "imx_pcm_fiq_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
-ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined!
-ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined!
-ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined!
-
-Fix this by allowing SND_SOC_IMX_PCM_FIQ and SND_SOC_IMX_PCM_DMA to be also
-built as modules and by using 'IS_ENABLED' to cover the module case.
-
-Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
-Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
-Acked-by: Shawn Guo <shawn.guo@linaro.org>
-Signed-off-by: Mark Brown <broonie@linaro.org>
----
-diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
-index 3a79d01..c26449b 100644
---- a/sound/soc/fsl/Kconfig
-+++ b/sound/soc/fsl/Kconfig
-@@ -109,11 +109,11 @@ config SND_SOC_IMX_SSI
- 	tristate
- 
- config SND_SOC_IMX_PCM_FIQ
--	bool
-+	tristate
- 	select FIQ
- 
- config SND_SOC_IMX_PCM_DMA
--	bool
-+	tristate
- 	select SND_SOC_GENERIC_DMAENGINE_PCM
- 
- config SND_SOC_IMX_AUDMUX
-diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h
-index 9136625..5d5b733 100644
---- a/sound/soc/fsl/imx-pcm.h
-+++ b/sound/soc/fsl/imx-pcm.h
-@@ -32,7 +32,7 @@
- 		dma_data->peripheral_type = IMX_DMATYPE_SSI;
- }
- 
--#ifdef CONFIG_SND_SOC_IMX_PCM_DMA
-+#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA)
- int imx_pcm_dma_init(struct platform_device *pdev);
- void imx_pcm_dma_exit(struct platform_device *pdev);
- #else
-@@ -46,7 +46,7 @@
- }
- #endif
- 
--#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ
-+#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ)
- int imx_pcm_fiq_init(struct platform_device *pdev);
- void imx_pcm_fiq_exit(struct platform_device *pdev);
- #else
---
-cgit v0.9.2

arm-lpae-ax88796.patch

@@ -1,21 +0,0 @@
-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-bbb-dts.patch

@@ -1,230 +0,0 @@
-From 227cadff47a2b00e91deb5b54f1fd551808d42ae Mon Sep 17 00:00:00 2001
-From: Pantelis Antoniou <panto@antoniou-consulting.com>
-Date: Fri, 28 Jun 2013 14:18:08 +0300
-Subject: [PATCH 1/3] am335x: dts: Add beaglebone black DTS
-
-Added the beaglebone black's DTS file. Note that at some point in
-time we'll switch to using a common black.dtsi file.
-
-Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
----
- arch/arm/boot/dts/Makefile             |   3 +-
- arch/arm/boot/dts/am335x-boneblack.dts | 196 +++++++++++++++++++++++++++++++++
- 2 files changed, 198 insertions(+), 1 deletion(-)
- create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts
-
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
---- a/arch/arm/boot/dts/Makefile.orig	2013-07-17 11:51:55.510389342 +0100
-+++ b/arch/arm/boot/dts/Makefile	2013-07-17 11:55:09.492689175 +0100
-@@ -172,6 +172,7 @@
- 	am335x-evm.dtb \
- 	am335x-evmsk.dtb \
- 	am335x-bone.dtb \
-+	am335x-boneblack.dtb \
- 	am3517-evm.dtb \
- 	am3517_mt_ventoux.dtb \
- 	am43x-epos-evm.dtb
-diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-new file mode 100644
-index 0000000..d21e223
---- /dev/null
-+++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -0,0 +1,196 @@
-+/*
-+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+/dts-v1/;
-+
-+/include/ "am33xx.dtsi"
-+
-+/ {
-+	model = "TI AM335x BeagleBone";
-+	compatible = "ti,am335x-bone", "ti,am33xx";
-+
-+	cpus {
-+		cpu@0 {
-+			cpu0-supply = <&dcdc2_reg>;
-+
-+			/*
-+			 * To consider voltage drop between PMIC and SoC,
-+			 * tolerance value is reduced to 2% from 4% and
-+			 * voltage value is increased as a precaution.
-+			 */
-+			operating-points = <
-+				/* kHz    uV */
-+				1000000	1350000
-+				800000	1300000
-+				600000  1112000
-+				300000   969000
-+			>;
-+		};
-+	};
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x80000000 0x10000000>; /* 256 MB */
-+	};
-+
-+	am33xx_pinmux: pinmux@44e10800 {
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&user_leds_s0>;
-+
-+		user_leds_s0: user_leds_s0 {
-+			pinctrl-single,pins = <
-+				0x54 0x7	/* gpmc_a5.gpio1_21, OUTPUT | MODE7 */
-+				0x58 0x17	/* gpmc_a6.gpio1_22, OUTPUT_PULLUP | MODE7 */
-+				0x5c 0x7	/* gpmc_a7.gpio1_23, OUTPUT | MODE7 */
-+				0x60 0x17	/* gpmc_a8.gpio1_24, OUTPUT_PULLUP | MODE7 */
-+			>;
-+		};
-+
-+		emmc2_pins: pinmux_emmc2_pins {
-+			pinctrl-single,pins = <
-+				0x80 0x32	/* gpmc_csn1.mmc1_clk, INPUT_PULLUP | MODE2 */
-+				0x84 0x32	/* gpmc_csn2.mmc1_cmd, INPUT_PULLUP | MODE2 */
-+				0x00 0x31	/* gpmc_ad0.mmc1_dat0, INPUT_PULLUP | MODE1 */
-+				0x04 0x31	/* gpmc_ad1.mmc1_dat1, INPUT_PULLUP | MODE1 */
-+				0x08 0x31	/* gpmc_ad2.mmc1_dat2, INPUT_PULLUP | MODE1 */
-+				0x0c 0x31	/* gpmc_ad3.mmc1_dat3, INPUT_PULLUP | MODE1 */
-+				0x10 0x31	/* gpmc_ad4.mmc1_dat4, INPUT_PULLUP | MODE1 */
-+				0x14 0x31	/* gpmc_ad5.mmc1_dat5, INPUT_PULLUP | MODE1 */
-+				0x18 0x31	/* gpmc_ad6.mmc1_dat6, INPUT_PULLUP | MODE1 */
-+				0x1c 0x31	/* gpmc_ad7.mmc1_dat7, INPUT_PULLUP | MODE1 */
-+				/* eMMC_RSTn */
-+				0x50 0x17	/* gpmc_a4.gpio1_20, OUTPUT | MODE7 | PULLUP */
-+			>;
-+		};
-+	};
-+
-+	ocp {
-+		uart1: serial@44e09000 {
-+			status = "okay";
-+		};
-+
-+		i2c0: i2c@44e0b000 {
-+			status = "okay";
-+			clock-frequency = <400000>;
-+
-+			tps: tps@24 {
-+				reg = <0x24>;
-+			};
-+
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		led@2 {
-+			label = "beaglebone:green:heartbeat";
-+			gpios = <&gpio1 21 0>;
-+			linux,default-trigger = "heartbeat";
-+			default-state = "off";
-+		};
-+
-+		led@3 {
-+			label = "beaglebone:green:mmc0";
-+			gpios = <&gpio1 22 0>;
-+			linux,default-trigger = "mmc0";
-+			default-state = "off";
-+		};
-+
-+		led@4 {
-+			label = "beaglebone:green:usr2";
-+			gpios = <&gpio1 23 0>;
-+			default-state = "off";
-+		};
-+
-+		led@5 {
-+			label = "beaglebone:green:usr3";
-+			gpios = <&gpio1 24 0>;
-+			default-state = "off";
-+		};
-+	};
-+
-+	vmmcsd_fixed: fixedregulator@0 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vmmcsd_fixed";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+	};
-+
-+};
-+
-+/include/ "tps65217.dtsi"
-+
-+&tps {
-+	regulators {
-+		dcdc1_reg: regulator@0 {
-+			regulator-always-on;
-+		};
-+
-+		dcdc2_reg: regulator@1 {
-+			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
-+			regulator-name = "vdd_mpu";
-+			regulator-min-microvolt = <925000>;
-+			regulator-max-microvolt = <1325000>;
-+			regulator-boot-on;
-+			regulator-always-on;
-+		};
-+
-+		dcdc3_reg: regulator@2 {
-+			/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
-+			regulator-name = "vdd_core";
-+			regulator-min-microvolt = <925000>;
-+			regulator-max-microvolt = <1150000>;
-+			regulator-boot-on;
-+			regulator-always-on;
-+		};
-+
-+		ldo1_reg: regulator@3 {
-+			regulator-always-on;
-+		};
-+
-+		ldo2_reg: regulator@4 {
-+			regulator-always-on;
-+		};
-+
-+		ldo3_reg: regulator@5 {
-+			regulator-min-microvolt = <1800000>;
-+			regulator-max-microvolt = <1800000>;	/* orig 3.3V*/
-+			regulator-always-on;
-+		};
-+
-+		ldo4_reg: regulator@6 {
-+			regulator-always-on;
-+		};
-+	};
-+};
-+
-+&cpsw_emac0 {
-+	phy_id = <&davinci_mdio>, <0>;
-+};
-+
-+&cpsw_emac1 {
-+	phy_id = <&davinci_mdio>, <1>;
-+};
-+
-+&mmc1 {
-+	status = "okay";
-+	vmmc-supply = <&vmmcsd_fixed>;
-+	ti,vcc-aux-disable-is-sleep;
-+};
-+
-+&mmc2 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&emmc2_pins>;	/* wrong numbering */
-+	vmmc-supply = <&ldo3_reg>;
-+	bus-width = <8>;
-+	ti,non-removable;
-+	status = "okay";
-+	ti,vcc-aux-disable-is-sleep;
-+
-+	reset-gpio = <&gpio1 20 0x00>;
-+};
--- 
-1.8.2.1

arm-omap-load-tfp410.patch

@@ -1,14 +0,0 @@
-diff -urNp linux-3.9.4-300.fc19.armv7hl_orig/drivers/video/omap2/dss/core.c linux-3.9.4-300.fc19.armv7hl/drivers/video/omap2/dss/core.c
---- linux-3.9.4-300.fc19.armv7hl_orig/drivers/video/omap2/dss/core.c	2013-04-28 20:36:01.000000000 -0400
-+++ linux-3.9.4-300.fc19.armv7hl/drivers/video/omap2/dss/core.c	2013-05-31 12:24:07.711334359 -0400
-@@ -596,6 +596,9 @@ static int __init omap_dss_init(void)
- {
- 	int r;
- 
-+	/* hack to load panel-tfp410 driver */
-+	request_module("panel-tfp410");
-+
- 	r = omap_dss_bus_register();
- 	if (r)
- 		return r;
-Binary files linux-3.9.4-300.fc19.armv7hl_orig/drivers/video/omap2/dss/.Makefile.swp and linux-3.9.4-300.fc19.armv7hl/drivers/video/omap2/dss/.Makefile.swp differ

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

@@ -1,13 +0,0 @@
-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-usb-no-reset-linux33.patch

@@ -1,16 +0,0 @@
---- linux-3.3.4-3.fc17.x86_64_orig/drivers/usb/core/hub.c	2012-05-02 20:08:18.421685932 -0400
-+++ linux-3.3.4-3.fc17.x86_64/drivers/usb/core/hub.c	2012-05-02 20:30:36.565865425 -0400
-@@ -3484,6 +3484,13 @@ static void hub_events(void)
- 				(u16) hub->change_bits[0],
- 				(u16) hub->event_bits[0]);
- 
-+		/* Don't disconnect USB-SATA on TrimSlice */
-+		if (strcmp(dev_name(hdev->bus->controller), "tegra-ehci.0") == 0) {
-+			if ((hdev->state == 7) && (hub->change_bits[0] == 0) &&
-+			    (hub->event_bits[0] == 0x2))
-+				hub->event_bits[0] = 0;
-+		}
-+
- 		/* Lock the device, then check to see if we were
- 		 * disconnected while waiting for the lock to succeed. */
- 		usb_lock_device(hdev);

arm-wandboard-quad.patch

@@ -1,58 +0,0 @@
-diff -uNr linux-3.10.0-0.rc7.git0.2.fc20.x86_64/arch/arm/boot/dts/imx6q-wandboard.dts linux-3.10.0-0.rc7.git0.2.fc20.armv7hl/arch/arm/boot/dts/imx6q-wandboard.dts
---- linux-3.10.0-0.rc7.git0.2.fc20.x86_64/arch/arm/boot/dts/imx6q-wandboard.dts	1969-12-31 18:00:00.000000000 -0600
-+++ linux-3.10.0-0.rc7.git0.2.fc20.armv7hl/arch/arm/boot/dts/imx6q-wandboard.dts	2013-06-30 15:09:21.350610898 -0500
-@@ -0,0 +1,44 @@
-+/*
-+ * Copyright 2013 Freescale Semiconductor, Inc.
-+ *
-+ * Author: Fabio Estevam <fabio.estevam@freescale.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+/dts-v1/;
-+#include "imx6q.dtsi"
-+
-+/ {
-+	model = "Wandboard i.MX6 Quad Board";
-+	compatible = "wand,imx6q-wandboard", "fsl,imx6q";
-+
-+	memory {
-+		reg = <0x10000000 0x80000000>;
-+	};
-+};
-+
-+&fec {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_enet_1>;
-+	phy-mode = "rgmii";
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_uart1_1>;
-+	status = "okay";
-+};
-+
-+&usbh1 {
-+	status = "okay";
-+};
-+
-+&usdhc3 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_usdhc3_2>;
-+	status = "okay";
-+};
---- linux-3.11.0-0.rc0.git6.2.fc20.x86_64/arch/arm/boot/dts/Makefile.orig	2013-07-12 10:45:40.231087368 -0500
-+++ linux-3.11.0-0.rc0.git6.2.fc20.x86_64/arch/arm/boot/dts/Makefile	2013-07-12 10:48:39.973819470 -0500
-@@ -131,6 +131,7 @@
- 	imx6q-sabrelite.dtb \
- 	imx6q-sabresd.dtb \
- 	imx6q-sbc6x.dtb \
-+	imx6q-wandboard.dtb \
- 	imx6sl-evk.dtb \
- 	vf610-twr.dtb
- dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \

arm64-avoid-needing-console-to-enable-serial-console.patch

@@ -0,0 +1,42 @@
+From: Mark Salter <msalter@redhat.com>
+Date: Wed, 25 Mar 2015 14:17:50 -0400
+Subject: [PATCH] arm64: avoid needing console= to enable serial console
+
+Tell kernel to prefer one of the serial ports for console on
+platforms currently supported (pl011 or 8250). console= on
+command line will override these assumed preferences. This is
+just a hack to get the behavior we want from DT provided by
+firmware.
+
+Signed-off-by: Mark Salter <msalter@redhat.com>
+---
+ arch/arm64/kernel/setup.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
+index 74753132c3ac..3cc99d7c2361 100644
+--- a/arch/arm64/kernel/setup.c
++++ b/arch/arm64/kernel/setup.c
+@@ -579,3 +579,22 @@ const struct seq_operations cpuinfo_op = {
+ 	.stop	= c_stop,
+ 	.show	= c_show
+ };
++
++/*
++ * Temporary hack to avoid need for console= on command line
++ */
++static int __init arm64_console_setup(void)
++{
++	/* Allow cmdline to override our assumed preferences */
++	if (console_set_on_cmdline)
++		return 0;
++
++	if (IS_ENABLED(CONFIG_SERIAL_AMBA_PL011))
++		add_preferred_console("ttyAMA", 0, "115200");
++
++	if (IS_ENABLED(CONFIG_SERIAL_8250))
++		add_preferred_console("ttyS", 0, "115200");
++
++	return 0;
++}
++early_initcall(arm64_console_setup);

asus-wmi-Restrict-debugfs-interface-when-module-load.patch

@@ -0,0 +1,53 @@
+From: Matthew Garrett <matthew.garrett@nebula.com>
+Date: Fri, 9 Mar 2012 08:46:50 -0500
+Subject: [PATCH] asus-wmi: Restrict debugfs interface when module loading is
+ restricted
+
+We have no way of validating what all of the Asus WMI methods do on a
+given machine, and there's a risk that some will allow hardware state to
+be manipulated in such a way that arbitrary code can be executed in the
+kernel, circumventing module loading restrictions. Prevent that if any of
+these features are enabled.
+
+Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
+---
+ drivers/platform/x86/asus-wmi.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
+index 21fc932da3a1..c6d42ad95c08 100644
+--- a/drivers/platform/x86/asus-wmi.c
++++ b/drivers/platform/x86/asus-wmi.c
+@@ -1590,6 +1590,9 @@ static int show_dsts(struct seq_file *m, void *data)
+ 	int err;
+ 	u32 retval = -1;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
+ 
+ 	if (err < 0)
+@@ -1606,6 +1609,9 @@ static int show_devs(struct seq_file *m, void *data)
+ 	int err;
+ 	u32 retval = -1;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
+ 				    &retval);
+ 
+@@ -1630,6 +1636,9 @@ static int show_call(struct seq_file *m, void *data)
+ 	union acpi_object *obj;
+ 	acpi_status status;
+ 
++	if (secure_modules())
++		return -EPERM;
++
+ 	status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
+ 				     1, asus->debug.method_id,
+ 				     &input, &output);
+-- 
+1.9.3
+

ath9k-rx-dma-stop-check.patch

@@ -1,6 +1,16 @@
+From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
+Date: Wed, 6 Feb 2013 09:57:47 -0500
+Subject: [PATCH] ath9k: rx dma stop check
+
+---
+ drivers/net/wireless/ath/ath9k/mac.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
+index 275205ab5f15..bb842623bdf6 100644
 --- a/drivers/net/wireless/ath/ath9k/mac.c
 +++ b/drivers/net/wireless/ath/ath9k/mac.c
-@@ -689,7 +689,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw 
+@@ -700,7 +700,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
  {
  #define AH_RX_STOP_DMA_TIMEOUT 10000   /* usec */
  	struct ath_common *common = ath9k_hw_common(ah);
@@ -9,7 +19,7 @@
  	int i;
  
  	/* Enable access to the DMA observation bus */
-@@ -719,6 +719,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw 
+@@ -730,6 +730,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
  	}
  
  	if (i == 0) {
@@ -26,3 +36,6 @@
  		ath_err(common,
  			"DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n",
  			AH_RX_STOP_DMA_TIMEOUT / 1000,
+-- 
+1.9.3
+

blk-loop-avoid-too-many-pending-per-work-IO.patch

@@ -0,0 +1,104 @@
+If there are too many pending per work I/O, too many
+high priority work thread can be generated so that
+system performance can be effected.
+
+This patch limits the max pending per work I/O as 16,
+and will fackback to single queue mode when the max
+number is reached.
+
+This patch fixes Fedora 22 live booting performance
+regression when it is booted from squashfs over dm
+based on loop, and looks the following reasons are
+related with the problem:
+
+- not like other filesyststems(such as ext4), squashfs
+is a bit special, and I observed that increasing I/O jobs
+to access file in squashfs only improve I/O performance a
+little, but it can make big difference for ext4
+
+- nested loop: both squashfs.img and ext3fs.img are mounted
+as loop block, and ext3fs.img is inside the squashfs
+
+- during booting, lots of tasks may run concurrently
+
+Fixes: b5dd2f6047ca108001328aac0e8588edd15f1778
+Cc: stable@vger.kernel.org (v4.0)
+Reported-by: Justin M. Forbes <jforbes@fedoraproject.org>
+Tested-by: Justin M. Forbes <jforbes@fedoraproject.org>
+Signed-off-by: Ming Lei <ming.lei@canonical.com>
+---
+ drivers/block/loop.c | 19 +++++++++++++++++--
+ drivers/block/loop.h |  2 ++
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/block/loop.c b/drivers/block/loop.c
+index ae3fcb4..5a728c6 100644
+--- a/drivers/block/loop.c
++++ b/drivers/block/loop.c
+@@ -1425,13 +1425,24 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx,
+ 		const struct blk_mq_queue_data *bd)
+ {
+ 	struct loop_cmd *cmd = blk_mq_rq_to_pdu(bd->rq);
++	struct loop_device *lo = cmd->rq->q->queuedata;
++	bool single_queue = !!(cmd->rq->cmd_flags & REQ_WRITE);
++
++	/*
++	 * Fallback to single queue mode if the pending per work
++	 * I/O number reaches 16, otherwise too many high priority
++	 * worker thread may effect system performance as reported
++	 * in fedora live booting from squashfs over loop.
++	 */
++	if (atomic_read(&lo->pending_per_work_io) >= 16)
++		single_queue = true;
+ 
+ 	blk_mq_start_request(bd->rq);
+ 
+-	if (cmd->rq->cmd_flags & REQ_WRITE) {
+-		struct loop_device *lo = cmd->rq->q->queuedata;
++	if (single_queue) {
+ 		bool need_sched = true;
+ 
++		cmd->per_work_io = false;
+ 		spin_lock_irq(&lo->lo_lock);
+ 		if (lo->write_started)
+ 			need_sched = false;
+@@ -1443,6 +1454,8 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx,
+ 		if (need_sched)
+ 			queue_work(loop_wq, &lo->write_work);
+ 	} else {
++		atomic_inc(&lo->pending_per_work_io);
++		cmd->per_work_io = true;
+ 		queue_work(loop_wq, &cmd->read_work);
+ 	}
+ 
+@@ -1467,6 +1480,8 @@ static void loop_handle_cmd(struct loop_cmd *cmd)
+ 	if (ret)
+ 		cmd->rq->errors = -EIO;
+ 	blk_mq_complete_request(cmd->rq);
++	if (cmd->per_work_io)
++		atomic_dec(&lo->pending_per_work_io);
+ }
+ 
+ static void loop_queue_write_work(struct work_struct *work)
+diff --git a/drivers/block/loop.h b/drivers/block/loop.h
+index 301c27f..eb855f5 100644
+--- a/drivers/block/loop.h
++++ b/drivers/block/loop.h
+@@ -57,6 +57,7 @@ struct loop_device {
+ 	struct list_head	write_cmd_head;
+ 	struct work_struct	write_work;
+ 	bool			write_started;
++	atomic_t		pending_per_work_io;
+ 	int			lo_state;
+ 	struct mutex		lo_ctl_mutex;
+ 
+@@ -68,6 +69,7 @@ struct loop_device {
+ struct loop_cmd {
+ 	struct work_struct read_work;
+ 	struct request *rq;
++	bool per_work_io;
+ 	struct list_head list;
+ };
+ 
+-- 
+1.9.1

block-discard-bdi_unregister-in-favour-of-bdi_destro.patch

@@ -0,0 +1,117 @@
+From: NeilBrown <neilb@suse.de>
+Date: Tue, 19 May 2015 15:58:37 +1000
+Subject: [PATCH] block: discard bdi_unregister() in favour of bdi_destroy()
+
+bdi_unregister() now contains very little functionality.
+
+It contains a "WARN_ON" if bdi->dev is NULL.  This warning is of no
+real consequence as bdi->dev isn't needed by anything else in the function,
+and it triggers if
+   blk_cleanup_queue() -> bdi_destroy()
+is called before bdi_unregister, which happens since
+  Commit: 6cd18e711dd8 ("block: destroy bdi before blockdev is unregistered.")
+
+So this isn't wanted.
+
+It also calls bdi_set_min_ratio().  This needs to be called after
+writes through the bdi have all been flushed, and before the bdi is destroyed.
+Calling it early is better than calling it late as it frees up a global
+resource.
+
+Calling it immediately after bdi_wb_shutdown() in bdi_destroy()
+perfectly fits these requirements.
+
+So bdi_unregister() can be discarded with the important content moved to
+bdi_destroy(), as can the
+  writeback_bdi_unregister
+event which is already not used.
+
+Reported-by: Mike Snitzer <snitzer@redhat.com>
+Cc: stable@vger.kernel.org (v4.0)
+Fixes: c4db59d31e39 ("fs: don't reassign dirty inodes to default_backing_dev_info")
+Fixes: 6cd18e711dd8 ("block: destroy bdi before blockdev is unregistered.")
+Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Acked-by: Dan Williams <dan.j.williams@intel.com>
+Tested-by: Nicholas Moulin <nicholas.w.moulin@linux.intel.com>
+Signed-off-by: NeilBrown <neilb@suse.de>
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Jens Axboe <axboe@fb.com>
+---
+ block/genhd.c                    |  1 -
+ include/linux/backing-dev.h      |  1 -
+ include/trace/events/writeback.h |  1 -
+ mm/backing-dev.c                 | 18 +-----------------
+ 4 files changed, 1 insertion(+), 20 deletions(-)
+
+diff --git a/block/genhd.c b/block/genhd.c
+index 0a536dc05f3b..666e11b83983 100644
+--- a/block/genhd.c
++++ b/block/genhd.c
+@@ -653,7 +653,6 @@ void del_gendisk(struct gendisk *disk)
+ 	disk->flags &= ~GENHD_FL_UP;
+ 
+ 	sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi");
+-	bdi_unregister(&disk->queue->backing_dev_info);
+ 	blk_unregister_queue(disk);
+ 	blk_unregister_region(disk_devt(disk), disk->minors);
+ 
+diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
+index aff923ae8c4b..d87d8eced064 100644
+--- a/include/linux/backing-dev.h
++++ b/include/linux/backing-dev.h
+@@ -116,7 +116,6 @@ __printf(3, 4)
+ int bdi_register(struct backing_dev_info *bdi, struct device *parent,
+ 		const char *fmt, ...);
+ int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev);
+-void bdi_unregister(struct backing_dev_info *bdi);
+ int __must_check bdi_setup_and_register(struct backing_dev_info *, char *);
+ void bdi_start_writeback(struct backing_dev_info *bdi, long nr_pages,
+ 			enum wb_reason reason);
+diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
+index 5a14ead59696..885d3a380451 100644
+--- a/include/trace/events/writeback.h
++++ b/include/trace/events/writeback.h
+@@ -233,7 +233,6 @@ DEFINE_EVENT(writeback_class, name, \
+ DEFINE_WRITEBACK_EVENT(writeback_nowork);
+ DEFINE_WRITEBACK_EVENT(writeback_wake_background);
+ DEFINE_WRITEBACK_EVENT(writeback_bdi_register);
+-DEFINE_WRITEBACK_EVENT(writeback_bdi_unregister);
+ 
+ DECLARE_EVENT_CLASS(wbc_class,
+ 	TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi),
+diff --git a/mm/backing-dev.c b/mm/backing-dev.c
+index 6dc4580df2af..000e7b3b9896 100644
+--- a/mm/backing-dev.c
++++ b/mm/backing-dev.c
+@@ -359,23 +359,6 @@ static void bdi_wb_shutdown(struct backing_dev_info *bdi)
+ 	flush_delayed_work(&bdi->wb.dwork);
+ }
+ 
+-/*
+- * Called when the device behind @bdi has been removed or ejected.
+- *
+- * We can't really do much here except for reducing the dirty ratio at
+- * the moment.  In the future we should be able to set a flag so that
+- * the filesystem can handle errors at mark_inode_dirty time instead
+- * of only at writeback time.
+- */
+-void bdi_unregister(struct backing_dev_info *bdi)
+-{
+-	if (WARN_ON_ONCE(!bdi->dev))
+-		return;
+-
+-	bdi_set_min_ratio(bdi, 0);
+-}
+-EXPORT_SYMBOL(bdi_unregister);
+-
+ static void bdi_wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi)
+ {
+ 	memset(wb, 0, sizeof(*wb));
+@@ -443,6 +426,7 @@ void bdi_destroy(struct backing_dev_info *bdi)
+ 	int i;
+ 
+ 	bdi_wb_shutdown(bdi);
++	bdi_set_min_ratio(bdi, 0);
+ 
+ 	WARN_ON(!list_empty(&bdi->work_list));
+ 	WARN_ON(delayed_work_pending(&bdi->wb.dwork));

btrfs-cleanup-orphans-while-looking-up-default-subvo.patch

@@ -0,0 +1,38 @@
+From: Jeff Mahoney <jeffm@suse.com>
+Date: Fri, 20 Mar 2015 14:02:09 -0400
+Subject: [PATCH] btrfs: cleanup orphans while looking up default subvolume
+
+Orphans in the fs tree are cleaned up via open_ctree and subvolume
+orphans are cleaned via btrfs_lookup_dentry -- except when a default
+subvolume is in use.  The name for the default subvolume uses a manual
+lookup that doesn't trigger orphan cleanup and needs to trigger it
+manually as well. This doesn't apply to the remount case since the
+subvolumes are cleaned up by walking the root radix tree.
+
+Signed-off-by: Jeff Mahoney <jeffm@suse.com>
+Reviewed-by: David Sterba <dsterba@suse.cz>
+Signed-off-by: Chris Mason <clm@fb.com>
+---
+ fs/btrfs/super.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
+index 05fef198ff94..e477ed67a49a 100644
+--- a/fs/btrfs/super.c
++++ b/fs/btrfs/super.c
+@@ -901,6 +901,15 @@ find_root:
+ 	if (IS_ERR(new_root))
+ 		return ERR_CAST(new_root);
+ 
++	if (!(sb->s_flags & MS_RDONLY)) {
++		int ret;
++		down_read(&fs_info->cleanup_work_sem);
++		ret = btrfs_orphan_cleanup(new_root);
++		up_read(&fs_info->cleanup_work_sem);
++		if (ret)
++			return ERR_PTR(ret);
++	}
++
+ 	dir_id = btrfs_root_dirid(&new_root->root_item);
+ setup_root:
+ 	location.objectid = dir_id;

btrfs-incorrect-handling-for-fiemap_fill_next_extent.patch

@@ -0,0 +1,34 @@
+From: Chengyu Song <csong84@gatech.edu>
+Date: Tue, 24 Mar 2015 18:12:56 -0400
+Subject: [PATCH] btrfs: incorrect handling for fiemap_fill_next_extent return
+
+fiemap_fill_next_extent returns 0 on success, -errno on error, 1 if this was
+the last extent that will fit in user array. If 1 is returned, the return
+value may eventually returned to user space, which should not happen, according
+to manpage of ioctl.
+
+Signed-off-by: Chengyu Song <csong84@gatech.edu>
+Reviewed-by: David Sterba <dsterba@suse.cz>
+Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
+Signed-off-by: Chris Mason <clm@fb.com>
+---
+ fs/btrfs/extent_io.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
+index d688cfe5d496..782f3bc4651d 100644
+--- a/fs/btrfs/extent_io.c
++++ b/fs/btrfs/extent_io.c
+@@ -4514,8 +4514,11 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ 		}
+ 		ret = fiemap_fill_next_extent(fieinfo, em_start, disko,
+ 					      em_len, flags);
+-		if (ret)
++		if (ret) {
++			if (ret == 1)
++				ret = 0;
+ 			goto out_free;
++		}
+ 	}
+ out_free:
+ 	free_extent_map(em);

config-arm-generic

@@ -1,66 +1,154 @@
 CONFIG_KUSER_HELPERS=y
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
-# CONFIG_COMMON_CLK_DEBUG is not set
 CONFIG_COMMON_CLK=y
 CONFIG_EARLY_PRINTK=y
+CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
 CONFIG_FB_SSD1307=m
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_MMC=y
 CONFIG_NFS_FS=y
+
+CONFIG_CRASH=m
+CONFIG_CC_STACKPROTECTOR=y
+
 # CONFIG_PID_IN_CONTEXTIDR is not set
+
+# CONFIG_CPU_BIG_ENDIAN is not set
+# CONFIG_BIG_LITTLE is not set
+# CONFIG_IWMMXT is not set
+
 CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_FSL_FTM is not set
+
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_GPIO=y
+
 CONFIG_RCU_FANOUT_LEAF=16
-# CONFIG_RTC_DRV_SNVS is not set
 CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_ARM_ARCH_TIMER=y
-# CONFIG_ARM_DT_BL_CPUFREQ is not set
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_NR_CPUS=8
-CONFIG_ARM_DMA_USE_IOMMU=y
+
+CONFIG_SWIOTLB=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_FB_SIMPLE=y
+
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 
 # ARM AMBA generic HW
 CONFIG_ARM_AMBA=y
+# CONFIG_TEGRA_AHB is not set
+CONFIG_ARM_CCI=y
+CONFIG_ARM_CCN=y
+CONFIG_ARM_DMA_USE_IOMMU=y
+CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_V2M=y
+CONFIG_ARM_GIC_V3=y
+CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_KVM_ARM_VGIC=y
+CONFIG_ARM_GLOBAL_TIMER=y
+CONFIG_ARM_SMMU=y
 CONFIG_MMC_ARMMMCI=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIO_AMBAKMI=y
-CONFIG_OC_ETM=y
+CONFIG_FB_ARMCLCD=y
 
 # ARM VExpress
 CONFIG_ARCH_VEXPRESS=y
-CONFIG_VEXPRESS_CONFIG=y
+CONFIG_MFD_VEXPRESS_SYSREG=y
+CONFIG_VEXPRESS_SYSCFG=y
 CONFIG_COMMON_CLK_VERSATILE=y
+CONFIG_CLK_SP810=y
+CONFIG_CLK_VEXPRESS_OSC=y
 CONFIG_I2C_VERSATILE=m
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_SENSORS_VEXPRESS=m
+CONFIG_CLKSRC_VERSATILE=y
+CONFIG_POWER_RESET_VERSATILE=y
+# CONFIG_ARM_CHARLCD is not set
+
+# Power/Thermal/Cpufreq
+# CONFIG_ARM_DT_BL_CPUFREQ is not set
+# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
 
 # Device tree
 CONFIG_DTC=y
 CONFIG_DMA_OF=y
-CONFIG_PROC_DEVICETREE=y
 CONFIG_OF=y
+# CONFIG_OF_UNITTEST is not set
 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_I2C=m
+CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
 CONFIG_OF_MTD=y
 CONFIG_OF_NET=y
+CONFIG_OF_OVERLAY=y
 CONFIG_OF_PCI_IRQ=m
 CONFIG_OF_PCI=m
-# CONFIG_OF_SELFTEST is not set
+CONFIG_OF_RESERVED_MEM=y
+CONFIG_OF_RESOLVE=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_PATA_OF_PLATFORM=m
 CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_THERMAL_OF=y
+
+# CONFIG_OF_MDIO is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+
+# USB
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_XHCI_PLATFORM=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_IDMAC is not set
+# CONFIG_MMC_DW_K3 is not set
+# CONFIG_MMC_QCOM_DML is not set
+CONFIG_USB_DWC2=m
+CONFIG_USB_DWC2_DUAL_ROLE=y
+CONFIG_USB_DWC2_PLATFORM=m
+CONFIG_USB_DWC2_PCI=m
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_DUAL_ROLE=y
+CONFIG_USB_DWC3_PCI=m
+# CONFIG_USB_DWC3_DEBUG is not set
+# CONFIG_DWC3_HOST_USB3_LPM_ENABLE is not set
+CONFIG_DW_WATCHDOG=m
+CONFIG_PCIE_DW=y
+# CONFIG_MMC_DW_EXYNOS is not set
+
+# External Connectors
+CONFIG_EXTCON=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_ADC_JACK=m
+# CONFIG_EXTCON_SM5502 is not set
+# CONFIG_EXTCON_RT8973A is not set
 
 # 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
@@ -70,33 +158,154 @@ CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_PHYSMAP=m
 CONFIG_MTD_PHYSMAP_OF=m
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
-CONFIG_OF_MTD=y
+# CONFIG_MTD_LPDDR2_NVM is not set
 
 # GPIO
-CONFIG_GENERIC_GPIO=y
+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_MDIO_GPIO=m
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_BACKLIGHT_GPIO=m
 CONFIG_POWER_RESET_GPIO=y
-CONFIG_RFKILL_GPIO=m
+CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_POWER_RESET_RESTART=y
+# CONFIG_GPIO_74XX_MMIO is not set
 
-# MFD
-CONFIG_MFD_CORE=m
+#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_I2C_MUX_PCA954x=m
+
+# spi
+CONFIG_SPI_PL022=m
+
+# Sensors
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+
+# PHY framework
+CONFIG_GENERIC_PHY=y
 
 CONFIG_SMC91X=m
 CONFIG_SMC911X=m
 
+CONFIG_CPU_THERMAL=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+
+# 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_MMC_DW_SOCFPGA is not set
-# CONFIG_ARM_SMMU is not set
+# CONFIG_I2C_SH_MOBILE is not set
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
-# CONFIG_LEDS_RENESAS_TPU is not set
-# CONFIG_MMC_SDHCI_PXAV2 is not set
-# CONFIG_MMC_SDHCI_PXAV3 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_LOCK_STAT is not set
+
+# CONFIG_CADENCE_WATCHDOG is not set
+
+# CONFIG_DRM_ARMADA is not set
+# CONFIG_DRM_TEGRA is not set
+# CONFIG_SHMOBILE_IOMMU is not set
+
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_QCOM is not set
+
+# CONFIG_ARM_PTDUMP is not set
+
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_USB_ULPI is not set
+# CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_PHY_SAMSUNG_USB2 is not set
+
+### turn off things which make no sense on embedded SoC
+
+# core
+
+# CONFIG_INFINIBAND is not set
+# CONFIG_ISDN is not set
+# CONFIG_PCMCIA is not set
+# CONFIG_PARPORT is not set
+# CONFIG_FIREWIRE is not set
+# CONFIG_ATM_DRIVERS is not set
+# CONFIG_ISDN is not set
+# CONFIG_GAMEPORT is not set
+# CONFIG_AGP is not set
+
+# netdrv
+
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EXAR is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_NET_VENDOR_XIRCOM is not set
+
+# scsi
+
+# 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_FUSION is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
+
+# serial
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+
+# drm
+# CONFIG_DRM_VMWGFX is not set
+# CONFIG_IMX_IPUV3_CORE is not set
+
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_CORESIGHT is not set
+
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_BMP085_SPI is not set
+# CONFIG_TI_DAC7512 is not set
+# CONFIG_SPI_ROCKCHIP is not set
+
+# EDAC
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_LEGACY_SYSFS=y

config-arm64

@@ -1,20 +1,35 @@
 CONFIG_64BIT=y
 CONFIG_ARM64=y
 
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+
+# CONFIG_CPU_BIG_ENDIAN is not set
+
 # arm64 only SoCs
 CONFIG_ARCH_XGENE=y
+CONFIG_ARCH_SEATTLE=y
+# CONFIG_ARCH_THUNDER is not set
+# CONFIG_ARCH_EXYNOS7 is not set
+# CONFIG_ARCH_FSL_LS2085A is not set
+# CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_TEGRA is not set
+
+# Erratum
+CONFIG_ARM64_ERRATUM_826319=y
+CONFIG_ARM64_ERRATUM_827319=y
+CONFIG_ARM64_ERRATUM_824069=y
+CONFIG_ARM64_ERRATUM_819472=y
+CONFIG_ARM64_ERRATUM_832075=y
 
-# CONFIG_ALWAYS_USE_PERSISTENT_CLOCK is not set
 # CONFIG_AMBA_PL08X is not set
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARM64_64K_PAGES=y
-# CONFIG_ARM_DT_BL_CPUFREQ is not set
-CONFIG_ARM_SMMU=y
+# CONFIG_COMPAT is not set
 
 CONFIG_BCMA_POSSIBLE=y
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_BQL=y
 CONFIG_BRCMUTIL=m
 CONFIG_BUG=y
 CONFIG_CLKDEV_LOOKUP=y
@@ -22,29 +37,23 @@ CONFIG_CMDLINE="console=ttyAMA0"
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CONSOLE_TRANSLATIONS=y
 
-CONFIG_FB_ARMCLCD=y
-CONFIG_GENERIC_ACL=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CSUM=y
-CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GPIO_DEVRES=y
 CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y
 CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_HAVE_CLK=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_HAVE_NET_DSA=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_HZ=100
 
-# CONFIG_KVM is not set
-CONFIG_LOG_BUF_SHIFT=14
+CONFIG_KVM=y
+CONFIG_KVM_ARM_MAX_VCPUS=8
 
 CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
@@ -55,26 +64,50 @@ CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_PL330_DMA is not set
 CONFIG_RCU_FANOUT=64
 # CONFIG_RTC_DRV_PL030 is not set
-# CONFIG_RTC_DRV_PL031 is not set
+CONFIG_RTC_DRV_PL031=y
 CONFIG_SERIAL_8250_DMA=y
 # CONFIG_SERIAL_AMBA_PL010 is not set
 CONFIG_SPARSE_IRQ=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 
-CONFIG_SWIOTLB=y
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_THERMAL is not set
 CONFIG_VIRTUALIZATION=y
 CONFIG_VM_EVENT_COUNTERS=y
 
-# not arm64
-# CONFIG_HW_RANDOM_ATMEL is not set
-# CONFIG_HW_RANDOM_EXYNOS is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_ADNP is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+CONFIG_EFI=y
+CONFIG_EFI_VARS=y
+CONFIG_EFIVAR_FS=y
+CONFIG_EFI_VARS_PSTORE=y
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_RTC_DRV_EFI=y
+
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=m
+CONFIG_CRYPTO_SHA2_ARM64_CE=m
+CONFIG_CRYPTO_GHASH_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
+CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
+CONFIG_CRYPTO_CRC32_ARM64=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+
+CONFIG_ARM64_CPUIDLE=y
+
+# APM Xgene
+CONFIG_POWER_RESET_XGENE=y
+CONFIG_COMMON_CLK_XGENE=y
+
+CONFIG_AHCI_XGENE=y
+CONFIG_PHY_XGENE=y
+CONFIG_NET_XGENE=y
+CONFIG_RTC_DRV_XGENE=m
+CONFIG_HW_RANDOM_XGENE=m
+CONFIG_GPIO_XGENE=y
+CONFIG_GPIO_XGENE_SB=m
 
 # busted build for various reasons
 #  uses pci_* for some reason to allocate DMA buffers
@@ -82,3 +115,55 @@ CONFIG_VM_EVENT_COUNTERS=y
 #  weird include chain resulting in missing u64 type
 # CONFIG_USB_SPEEDTOUCH is not set
 #  dma issues in headers
+# CONFIG_PARPORT_PC is not set
+# CONFIG_VGA_CONSOLE is not set
+
+CONFIG_PCI_XGENE=y
+CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+
+# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
+
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+CONFIG_SBSAUART_TTY=y
+CONFIG_I2C_SCMI=m
+CONFIG_SENSORS_ACPI_POWER=m
+
+CONFIG_ACPI=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_EC_DEBUGFS=y
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_IPMI=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_CUSTOM_METHOD=m
+
+CONFIG_NET_SB1000=y
+CONFIG_AMD_XGBE=m
+CONFIG_AMD_XGBE_PHY=m
+# CONFIG_AMD_XGBE_DCB is not set
+
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_EN_VXLAN=y
+
+# CONFIG_IMX_THERMAL is not set
+
+CONFIG_DMI=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+
+CONFIG_SATA_AHCI_PLATFORM=y
+
+# CONFIG_SND_SOC is not set
+
+# CONFIG_PMIC_OPREGION is not set
+# CONFIG_DEBUG_RODATA is not set
+
+CONFIG_DEBUG_SECTION_MISMATCH=y
+
+CONFIG_EDAC_XGENE=y

config-armv7

@@ -1,42 +1,29 @@
 # ARM unified arch kernel
 
-# CONFIG_ARCH_EXYNOS_MULTI is not set
+# CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_KEYSTONE is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_MXC=y
-CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_ARCH_OMAP3=y
+CONFIG_ARCH_OMAP4=y
 CONFIG_ARCH_PICOXCELL=y
-CONFIG_ARCH_ROCKCHIP=y
-CONFIG_ARCH_SOCFPGA=y
-CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_TEGRA=y
-# CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_VIRT is not set
+CONFIG_ARCH_U8500=y
 CONFIG_ARCH_ZYNQ=y
 
 # These are supported in the LPAE kernel
 # CONFIG_ARM_LPAE is not set
 # CONFIG_XEN is not set
-# CONFIG_VIRTIO_CONSOLE is not set
 # CONFIG_ARM_VIRT_EXT is not set
-
-# Generic
-CONFIG_REMOTEPROC=m
-
-# FIXME should be generic (I think it's enabled by default)
-CONFIG_FB=y
-CONFIG_FB_ARMCLCD=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-CONFIG_TOUCHSCREEN_ADS7846=m
-
-CONFIG_OC_ETM=y
+# CONFIG_VIRTUALIZATION is not set
 
 # mvebu
-CONFIG_MACH_ARMADA_370_XP=y
 CONFIG_MACH_ARMADA_370=y
+CONFIG_MACH_ARMADA_375=y
+CONFIG_MACH_ARMADA_38X=y
 CONFIG_MACH_ARMADA_XP=y
+CONFIG_MACH_DOVE=y
 
 CONFIG_MVEBU_DEVBUS=y
 CONFIG_PCI_MVEBU=y
@@ -44,175 +31,159 @@ CONFIG_CACHE_TAUROS2=y
 CONFIG_MV_XOR=y
 CONFIG_CRYPTO_DEV_MV_CESA=m
 CONFIG_MV643XX_ETH=m
-CONFIG_I2C_MV64XXX=m
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_ARMADA_370=y
 CONFIG_PINCTRL_ARMADA_XP=y
+# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
 CONFIG_PINCTRL_DOVE=y
 CONFIG_EDAC_MV64X60=m
 CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_88PM80X=m
+CONFIG_RTC_DRV_ISL12057=m
 CONFIG_RTC_DRV_MV=m
+CONFIG_RTC_DRV_ARMADA38X=m
 CONFIG_MVNETA=m
 CONFIG_GPIO_MVEBU=y
 CONFIG_MVEBU_CLK_CORE=y
-CONFIG_MVEBU_CLK_GATING=y
+CONFIG_MVEBU_CLK_COREDIV=y
 CONFIG_MMC_MVSDIO=m
+CONFIG_MMC_SDHCI_DOVE=m
 CONFIG_SPI_ORION=m
 CONFIG_USB_MV_UDC=m
 CONFIG_MVEBU_MBUS=y
+CONFIG_USB_XHCI_MVEBU=m
+CONFIG_PHY_MVEBU_SATA=y
+CONFIG_AHCI_MVEBU=m
 CONFIG_ARMADA_THERMAL=m
+CONFIG_DOVE_THERMAL=m
+CONFIG_DRM_ARMADA=m
+CONFIG_ORION_WATCHDOG=m
+CONFIG_SND_KIRKWOOD_SOC=m
+CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
+CONFIG_USB_EHCI_HCD_ORION=m
+CONFIG_MMC_SDHCI_PXAV3=m
+CONFIG_MVPP2=m
+CONFIG_COMMON_CLK_SI5351=m
+CONFIG_RTC_DRV_ARMADA38X=m
+# CONFIG_CACHE_FEROCEON_L2 is not set
+# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 
 # omap 
 CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
-# CONFIG_ARCH_OMAP2 is not set
-CONFIG_ARCH_OMAP3=y
-CONFIG_ARCH_OMAP4=y
 CONFIG_SOC_OMAP5=y
-# CONFIG_SOC_OMAP2420 is not set
-# CONFIG_SOC_OMAP2430 is not set
+# CONFIG_SOC_DRA7XX is not set
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_TI81XX=y
-CONFIG_SOC_AM33XX=y
-CONFIG_SOC_AM43XX=y
-CONFIG_MACH_OMAP_GENERIC=y
-CONFIG_MACH_OMAP3_BEAGLE=y
-CONFIG_MACH_DEVKIT8000=y
-CONFIG_MACH_OMAP_LDP=y
-CONFIG_MACH_OMAP3530_LV_SOM=y
-CONFIG_MACH_OMAP3_TORPEDO=y
-CONFIG_MACH_OVERO=y
-CONFIG_MACH_OMAP3EVM=y
-CONFIG_MACH_OMAP3517EVM=y
-CONFIG_MACH_CRANEBOARD=y
-CONFIG_MACH_OMAP3_PANDORA=y
-CONFIG_MACH_TOUCHBOOK=y
-CONFIG_MACH_OMAP_3430SDP=y
-# CONFIG_MACH_NOKIA_N8X0 is not set
-# CONFIG_MACH_NOKIA_RM680 is not set
+# CONFIG_MACH_CM_T35 is not set
+# CONFIG_MACH_DEVKIT8000 is not set
 # CONFIG_MACH_NOKIA_RX51 is not set
-CONFIG_MACH_OMAP_ZOOM2=y
-CONFIG_MACH_OMAP_ZOOM3=y
-CONFIG_MACH_CM_T35=y
-CONFIG_MACH_CM_T3517=y
-CONFIG_MACH_IGEP0030=y
-CONFIG_MACH_SBC3530=y
-CONFIG_MACH_OMAP_3630SDP=y
-CONFIG_MACH_TI8168EVM=y
-CONFIG_MACH_TI8148EVM=y
-CONFIG_MACH_OMAP_4430SDP=y
-CONFIG_MACH_OMAP4_PANDA=y
+# CONFIG_MACH_OMAP_LDP is not set
+# CONFIG_MACH_OMAP3_BEAGLE is not set
+# CONFIG_MACH_OMAP3517EVM is not set
+# CONFIG_MACH_OMAP3530_LV_SOM is not set
+# CONFIG_MACH_OMAP3_PANDORA is not set
+# CONFIG_MACH_OMAP3_TORPEDO is not set
+# CONFIG_MACH_OVERO is not set
+# CONFIG_MACH_SBC3530 is not set
+# CONFIG_MACH_TOUCHBOOK is not set
 
 CONFIG_SOC_HAS_REALTIME_COUNTER=y
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_MUX=y
 CONFIG_OMAP_MUX_WARNINGS=y
 CONFIG_OMAP_32K_TIMER=y
-CONFIG_OMAP_32K_TIMER_HZ=128
+CONFIG_OMAP_PACKAGE_CBB=y
+CONFIG_OMAP_PACKAGE_CUS=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
 
-CONFIG_OMAP_MCBSP=y
 CONFIG_OMAP2PLUS_MBOX=m
-CONFIG_OMAP_MBOX_FWK=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
-CONFIG_OMAP_DM_TIMER=y
-CONFIG_OMAP_PM_NOOP=y
-CONFIG_DMA_OMAP=y
+CONFIG_DMA_OMAP=m
 CONFIG_OMAP_IOMMU=y
-CONFIG_OMAP_IOVMM=m
 CONFIG_HWSPINLOCK_OMAP=m
-CONFIG_OMAP3_EMU=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
-CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
-CONFIG_OMAP_WATCHDOG=m
-CONFIG_TWL4030_WATCHDOG=m
-
-CONFIG_TI_ST=m
-CONFIG_TI_EDMA=y
-CONFIG_TI_SOC_THERMAL=m
-CONFIG_TI_DAC7512=m
-CONFIG_TI_DAVINCI_EMAC=m
-CONFIG_TI_DAVINCI_MDIO=m
-CONFIG_TI_DAVINCI_CPDMA=m
-CONFIG_TI_CPSW=m
-CONFIG_TI_CPTS=y
-CONFIG_TI_EMIF=m
-CONFIG_MFD_TPS65217=m
-CONFIG_REGULATOR_TI_ABB=y
-CONFIG_REGULATOR_TPS65217=m
-CONFIG_BACKLIGHT_TPS65217=m
 
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
+CONFIG_SERIAL_8250_OMAP=m
 
 CONFIG_GPIO_TWL4030=m
 CONFIG_GPIO_TWL6040=m
+CONFIG_GPIO_PCF857X=m
 CONFIG_I2C_OMAP=m
 CONFIG_CHARGER_TWL4030=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_BQ2415X=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_MADC=m
 CONFIG_TWL4030_POWER=y
 CONFIG_TWL4030_WATCHDOG=m
+CONFIG_BATTERY_TWL4030_MADC=m
+CONFIG_OMAP_USB2=m
+CONFIG_OMAP_CONTROL_PHY=m
+CONFIG_TI_PIPE3=m
+CONFIG_PCI_DRA7XX=y
 CONFIG_TWL4030_USB=m
 CONFIG_TWL6030_USB=m
-CONFIG_TWL6030_PWM=m
 CONFIG_TWL6040_CORE=y
 CONFIG_CLK_TWL6040=m
 CONFIG_OMAP_INTERCONNECT=m
-# CONFIG_MFD_TPS80031 is not set
-CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_OMAP_USB_HOST=y
-CONFIG_MTD_ONENAND_OMAP2=m
 CONFIG_HDQ_MASTER_OMAP=m
 CONFIG_REGULATOR_TWL4030=y
 CONFIG_BACKLIGHT_PANDORA=m
 CONFIG_OMAP_OCP2SCP=m
 CONFIG_USB_EHCI_HCD_OMAP=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_OHCI_HCD_OMAP3=y
+CONFIG_USB_OHCI_HCD_OMAP3=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
-CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_GADGET_MUSB_HDRC=m
-# CONFIG_MUSB_PIO_ONLY is not set
-# CONFIG_USB_MUSB_DEBUG is not set
-CONFIG_OMAP_CONTROL_USB=m
-CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_DWC3_OMAP=m
 CONFIG_MMC_OMAP=m
-CONFIG_MMC_OMAP_HS=m
+CONFIG_MMC_OMAP_HS=y
 CONFIG_RTC_DRV_MAX8907=m
 # CONFIG_RTC_DRV_TWL92330 is not set
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RTC_DRV_OMAP=y
 CONFIG_SENSORS_TWL4030_MADC=m
+CONFIG_TWL6030_GPADC=m
+CONFIG_BATTERY_RX51=m
+# CONFIG_IR_RX51 is not set
+
+# OMAP5 (possibly other devices too)
+CONFIG_MFD_PALMAS=y
+CONFIG_EXTCON_PALMAS=m
+CONFIG_GPIO_PALMAS=y
+CONFIG_PINCTRL_PALMAS=y
+CONFIG_REGULATOR_PALMAS=y
+CONFIG_REGULATOR_PBIAS=m
+CONFIG_RTC_DRV_PALMAS=m
+CONFIG_OMAP5_DSS_HDMI=y
+CONFIG_COMMON_CLK_PALMAS=m
+CONFIG_INPUT_PALMAS_PWRBUTTON=m
 
 CONFIG_WL_TI=y
 CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL12XX_SPI=m
-CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_WL18XX=m
 CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_NFC_WILINK=m
 
+CONFIG_MTD_ONENAND_OMAP2=m
 CONFIG_MTD_NAND_OMAP2=m
-CONFIG_SPI_DAVINCI=m
+CONFIG_MTD_NAND_OMAP_BCH=y
 CONFIG_SPI_OMAP24XX=m
-CONFIG_MFD_TI_SSP=m
-CONFIG_SPI_TI_SSP=m
+CONFIG_SPI_TI_QSPI=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_LEDS_TCA6507=m
 
-# 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
+# OMAP thermal temp.
 CONFIG_OMAP4_THERMAL=y
 CONFIG_OMAP5_THERMAL=y
 
@@ -220,8 +191,8 @@ CONFIG_OMAP5_THERMAL=y
 CONFIG_POWER_AVS=y
 CONFIG_POWER_AVS_OMAP=y
 CONFIG_POWER_AVS_OMAP_CLASS3=y
-
-CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+# CPUFREQ_CPU0 is used for scaling on DT OMAP
+# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
 
 CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
@@ -230,19 +201,17 @@ CONFIG_PWM_TWL_LED=m
 
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
+CONFIG_CRYPTO_DEV_OMAP_DES=m
 CONFIG_HW_RANDOM_OMAP=m
+CONFIG_HW_RANDOM_OMAP3_ROM=m
 
-CONFIG_DRM_TILCDC=m
 CONFIG_DRM_OMAP=m
 CONFIG_DRM_OMAP_NUM_CRTCS=2
 CONFIG_OMAP2_VRFB=y
-# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
-# CONFIG_FB_OMAP_LCD_VGA is not set
 # CONFIG_FB_OMAP2 is not set
 # CONFIG_FB_DA8XX 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
@@ -250,22 +219,10 @@ 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_PANEL_GENERIC_DPI=m
-CONFIG_PANEL_TFP410=m
-CONFIG_PANEL_SHARP_LS037V7DW01=m
-CONFIG_PANEL_PICODLP=m
-CONFIG_PANEL_TAAL=m
-CONFIG_PANEL_NEC_NL8048HL11_01B=m
-CONFIG_PANEL_TPO_TD043MTEA1=m
-CONFIG_PANEL_LGPHILIPS_LB035Q02=m
-CONFIG_PANEL_ACX565AKM=m
-# CONFIG_PANEL_N8X0 is not set
-
+CONFIG_DISPLAY_ENCODER_OPA362=m
 CONFIG_DISPLAY_ENCODER_TFP410=m
 CONFIG_DISPLAY_ENCODER_TPD12S015=m
 CONFIG_DISPLAY_CONNECTOR_DVI=m
@@ -278,113 +235,222 @@ CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02=m
 CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m
 CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1=m
 CONFIG_DISPLAY_PANEL_NEC_NL8048HL11=m
+CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m
 
 # Enable V4L2 drivers for OMAP2+
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_OMAP2_VOUT is not set
-# CONFIG_VIDEO_OMAP3 is not set
-# CONFIG_VIDEO_VPFE_CAPTURE is not set
+CONFIG_VIDEO_OMAP3=m
+CONFIG_VIDEO_ADP1653=m
+# CONFIG_VIDEO_OMAP4 is not set
 # 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_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
-CONFIG_SND_OMAP_SOC_OMAP_HDMI=m
-CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
-CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
 
 CONFIG_SND_OMAP_SOC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_OMAP_SOC_AM3517EVM=m
 CONFIG_SND_OMAP_SOC_DMIC=m
-CONFIG_SND_OMAP_SOC_IGEP0020=m
+CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m
 CONFIG_SND_OMAP_SOC_MCBSP=m
 CONFIG_SND_OMAP_SOC_MCPDM=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_OMAP_SOC_OMAP3EVM=m
-CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
-CONFIG_SND_OMAP_SOC_OVERO=m
-# CONFIG_SND_OMAP_SOC_RX51 is not set
-CONFIG_SND_OMAP_SOC_SDP4430=m
+CONFIG_SND_OMAP_SOC_RX51=m
 CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
 CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
+CONFIG_SND_SOC_PCM1792A=m
 CONFIG_RADIO_WL128X=m
 
 CONFIG_OMAP_REMOTEPROC=m
 
-# CONFIG_TIDSPBRIDGE is not set
-# CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000
-# CONFIG_TIDSPBRIDGE_DEBUG is not set
-# CONFIG_TIDSPBRIDGE_RECOVERY=y
-# CONFIG_TIDSPBRIDGE_CACHE_LINE_CHECK is not set
-# CONFIG_TIDSPBRIDGE_WDT3=y
-# CONFIG_TIDSPBRIDGE_WDT_TIMEOUT=5
-# CONFIG_TIDSPBRIDGE_NTFY_PWRERR is not set
-# CONFIG_TIDSPBRIDGE_BACKTRACE is not set
-
 # CONFIG_OMAP2_DSS_DEBUGFS is not set
 # CONFIG_OMAP_IOMMU_DEBUG is not set
 # CONFIG_OMAP_MUX_DEBUG is not set
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
 
-# Allwinner a1x
-CONFIG_PINCTRL_SUNXI=y
-CONFIG_MDIO_SUN4I=m
-CONFIG_NET_VENDOR_ALLWINNER=y
-CONFIG_SUN4I_EMAC=m
+# AM33xx/43xx
+CONFIG_SOC_AM33XX=y
+CONFIG_SOC_AM43XX=y
+CONFIG_AM335X_CONTROL_USB=m
+CONFIG_AM335X_PHY_USB=m
+CONFIG_USB_MUSB_AM335X_CHILD=m
+CONFIG_TI_CPPI41=m
+CONFIG_USB_TI_CPPI41_DMA=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_TI_ST=m
+CONFIG_TI_DAC7512=m
+CONFIG_TI_DAVINCI_CPDMA=m
+CONFIG_TI_DAVINCI_EMAC=m
+CONFIG_TI_DAVINCI_MDIO=m
+CONFIG_TI_CPSW=m
+CONFIG_TI_CPSW_PHY_SEL=y
+CONFIG_TI_CPSW_ALE=m
+CONFIG_TI_CPTS=y
+# Builtin needed for BBone White
+CONFIG_REGULATOR_TPS65217=y
+CONFIG_INPUT_TPS65218_PWRBUTTON=m
+CONFIG_TI_EMIF=m
+CONFIG_DRM_TILCDC=m
+CONFIG_SPI_DAVINCI=m
+CONFIG_SND_DAVINCI_SOC=m
+CONFIG_SND_DAVINCI_SOC_I2S=m
+CONFIG_SND_DAVINCI_SOC_MCASP=m
+CONFIG_SND_DAVINCI_SOC_VCIF=m
+CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
+CONFIG_SND_EDMA_SOC=m
+CONFIG_SND_AM33XX_SOC_EVM=m
+CONFIG_REGULATOR_TI_ABB=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_AM335X_ADC=m
+CONFIG_PWM_TIPWMSS=y
+CONFIG_MFD_TPS65218=m
+CONFIG_REGULATOR_TPS65218=m
+CONFIG_VIDEO_AM437X_VPFE=m
 
-# imx 
-CONFIG_MXC_IRQ_PRIOR=y
+# QCom
+CONFIG_ARCH_MSM8X60=y
+CONFIG_ARCH_MSM8960=y
+CONFIG_ARCH_MSM8974=y
+CONFIG_SERIAL_MSM=y
+CONFIG_SERIAL_MSM_CONSOLE=y
+CONFIG_SERIAL_MSM_HS=m
+CONFIG_PINCTRL_APQ8064=m
+CONFIG_PINCTRL_APQ8084=m
+CONFIG_PINCTRL_IPQ8064=m
+CONFIG_PINCTRL_MSM8960=m
+CONFIG_PINCTRL_MSM8X74=m
+CONFIG_PINCTRL_MSM8916=m
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+CONFIG_COMMON_CLK_QCOM=m
+# CONFIG_IPQ_LCC_806X is not set
+# CONFIG_MSM_LCC_8960 is not set
+CONFIG_MFD_QCOM_RPM=m
+CONFIG_MFD_PM8921_CORE=m
+CONFIG_REGULATOR_QCOM_RPM=m
+CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_MMCC_8084=m
+CONFIG_IPQ_GCC_806X=m
+CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_MMCC_8960=m
+CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_MMCC_8974=m
+CONFIG_HW_RANDOM_MSM=m
+CONFIG_I2C_QUP=m
+CONFIG_SPI_QUP=m
+CONFIG_GPIO_MSM_V2=m
+CONFIG_POWER_RESET_MSM=y
+CONFIG_USB_MSM_OTG=m
+CONFIG_MMC_SDHCI_MSM=m
+CONFIG_MMC_QCOM_DML=m
+CONFIG_QCOM_BAM_DMA=m
+CONFIG_QCOM_GSBI=m
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_QCOM_IPQ806X_SATA=m
+CONFIG_USB_DWC3_QCOM=m
+CONFIG_CRYPTO_DEV_QCE=m
+# CONFIG_MSM_IOMMU is not set
+CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM_FBDEV=y
+CONFIG_USB_EHCI_MSM=m
+CONFIG_MFD_PM8XXX=m
+CONFIG_KEYBOARD_PMIC8XXX=m
+CONFIG_INPUT_PM8XXX_VIBRATOR=m
+CONFIG_INPUT_PMIC8XXX_PWRKEY=m
+CONFIG_RTC_DRV_PM8XXX=m
+# CONFIG_DRM_MSM_REGISTER_LOGGING is not set 
+CONFIG_QCOM_WDT=m
+CONFIG_MFD_SPMI_PMIC=m
+CONFIG_SPMI=m
+CONFIG_SPMI_MSM_PMIC_ARB=m
+CONFIG_QCOM_SPMI_IADC=m
+CONFIG_QCOM_SPMI_VADC=m
+
+# i.MX
 # CONFIG_MXC_DEBUG_BOARD is not set
-CONFIG_MACH_IMX51_DT=y
-# CONFIG_MACH_MX51_BABBAGE is not set
-# CONFIG_MACH_EUKREA_CPUIMX51SD is not set
+CONFIG_SOC_IMX50=y
+CONFIG_SOC_IMX51=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_IMX6SX=y
+# CONFIG_SOC_LS1021A is not set
+# CONFIG_SOC_VF610 is not set
+CONFIG_ARM_IMX6Q_CPUFREQ=m
+CONFIG_POWER_RESET_IMX=y
+CONFIG_PCI_IMX6=y
+CONFIG_IMX_THERMAL=m
+CONFIG_IMX_SDMA=m
+CONFIG_IMX_DMA=m
+CONFIG_MXS_DMA=y
+CONFIG_AHCI_IMX=m
 CONFIG_PATA_IMX=m
+CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
 # CONFIG_USB_CHIPIDEA_DEBUG is not set
+CONFIG_USB_FSL_USB2=m
 CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_FEC=m
 CONFIG_KEYBOARD_IMX=m
+CONFIG_KEYBOARD_STMPE=m
+CONFIG_TOUCHSCREEN_STMPE=m
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_PINCTRL_IMX6SL=y
 CONFIG_I2C_IMX=m
+CONFIG_STMPE_I2C=y
 CONFIG_SPI_IMX=m
-CONFIG_MFD_MC13783=m
+CONFIG_SPI_FSL_QUADSPI=m
+CONFIG_STMPE_SPI=y
 CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_STMPE=y
+CONFIG_MTD_NAND_GPMI_NAND=m
 CONFIG_W1_MASTER_MXC=m
 CONFIG_IMX_WEIM=y
 CONFIG_IMX2_WDT=m
+CONFIG_HW_RANDOM_MXC_RNGA=m
 CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_RTC_DRV_SNVS=m
 # CONFIG_FB_MX3 is not set
+# CONFIG_FB_IMX is not set
+# CONFIG_FB_MXS is not set
+
 CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_FSL_ASOC_CARD=m
+CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_UTILS=m
 CONFIG_SND_SOC_IMX_SSI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_PCM_FIQ=m
 CONFIG_SND_SOC_IMX_PCM_DMA=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_WM8962=m
 CONFIG_SND_SOC_IMX_MC13783=m
-CONFIG_USB_EHCI_MXC=m
+CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+CONFIG_SND_SOC_EUKREA_TLV320=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8962=m
+
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_MXS_PHY=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
@@ -394,44 +460,71 @@ CONFIG_RTC_DRV_IMXDI=m
 CONFIG_RTC_DRV_MXC=m
 # CONFIG_MX3_IPU is not set
 # CONFIG_MX3_IPU_IRQS is not set
-CONFIG_IMX_SDMA=m
-CONFIG_IMX_DMA=m
-CONFIG_AHCI_IMX=m
-# CONFIG_MXS_DMA is not set
+
 CONFIG_PWM_IMX=m
-CONFIG_BACKLIGHT_PWM=m
 CONFIG_DRM_IMX=m
 CONFIG_DRM_IMX_FB_HELPER=m
-CONFIG_DRM_IMX_IPUV3_CORE=m
+CONFIG_DRM_IMX_HDMI=m
+CONFIG_IMX_IPUV3_CORE=m
 CONFIG_DRM_IMX_IPUV3=m
-# CONFIG_DRM_IMX_LDB is not set
+CONFIG_DRM_IMX_LDB=m
 CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
 CONFIG_DRM_IMX_TVE=m
 CONFIG_VIDEO_CODA=m
+
 CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_REGULATOR_ANATOP=m
 CONFIG_REGULATOR_MC13783=m
 CONFIG_REGULATOR_MC13892=m
 CONFIG_LEDS_MC13783=m
 CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_CAN_FLEXCAN=m
 
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_88PM80X_ONKEY=m
 
-# exynos
-# CONFIG_DRM_EXYNOS is not set
-# CONFIG_PINCTRL_EXYNOS5440 is not set
-# CONFIG_PINCTRL_EXYNOS is not set
+# i.MX6Q (and likely Samsung among others) 
+CONFIG_MFD_DA9052_I2C=y
+CONFIG_MFD_DA9052_SPI=y
+CONFIG_MFD_DA9055=y
+CONFIG_TOUCHSCREEN_DA9052=m
+CONFIG_INPUT_DA9052_ONKEY=m
+CONFIG_INPUT_DA9055_ONKEY=m
+CONFIG_GPIO_DA9052=m
+CONFIG_GPIO_DA9055=m
+CONFIG_GPIO_STMPE=y
+CONFIG_BATTERY_DA9052=m
+CONFIG_SENSORS_DA9052_ADC=m
+CONFIG_SENSORS_DA9055=m
+CONFIG_DA9052_WATCHDOG=m
+CONFIG_DA9055_WATCHDOG=m
+CONFIG_BACKLIGHT_DA9052=m
+CONFIG_LEDS_DA9052=m
+CONFIG_RTC_DRV_DA9052=m
+CONFIG_RTC_DRV_DA9055=m
+CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9055=m
 
 # picoxcell
-CONFIG_CRYPTO_DEV_PICOXCELL=m
-CONFIG_HW_RANDOM_PICOXCELL=m
+# CONFIG_CRYPTO_DEV_PICOXCELL is not set
+
+# Exynos 4
+CONFIG_ARCH_EXYNOS4=y
+CONFIG_SOC_EXYNOS4212=y
+CONFIG_SOC_EXYNOS4412=y
+CONFIG_SOC_EXYNOS4415=y
+CONFIG_ARM_EXYNOS4210_CPUFREQ=y
+CONFIG_ARM_EXYNOS4X12_CPUFREQ=y
+CONFIG_AK8975=m
+CONFIG_CM36651=m
+CONFIG_KEYBOARD_SAMSUNG=m
 
 # ST Ericsson
 CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y
-CONFIG_MACH_UX500_DT=y
 
 CONFIG_ABX500_CORE=y
+# CONFIG_ARM_U8500_CPUIDLE is not set
 CONFIG_UX500_DEBUG_UART=2
 CONFIG_AB8500_CORE=y
 CONFIG_STE_DMA40=y
@@ -443,9 +536,12 @@ CONFIG_KEYBOARD_NOMADIK=m
 CONFIG_DB8500_CPUFREQ_COOLING=m
 CONFIG_DB8500_THERMAL=y
 CONFIG_UX500_WATCHDOG=m
+CONFIG_AHCI_ST=m
 CONFIG_INPUT_AB8500_PONKEY=m
 CONFIG_REGULATOR_AB8500=y
 CONFIG_AB8500_USB=m
+CONFIG_USB_MUSB_UX500=m
+# CONFIG_USB_UX500_DMA is not set
 CONFIG_RTC_DRV_AB8500=m
 CONFIG_PWM_AB8500=m
 CONFIG_SND_SOC_UX500=m
@@ -461,53 +557,39 @@ CONFIG_AB8500_BM=y
 CONFIG_AB8500_GPADC=y
 CONFIG_SENSORS_AB8500=m
 CONFIG_STE_MODEM_RPROC=m
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CW1200_WLAN_SPI=m
-CONFIG_UX500_WATCHDOG=m
+CONFIG_STIH415_RESET=y
 
-# tegra
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+# Allwinner
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+
+# Tegra (non A15)
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
-# CONFIG_ARCH_TEGRA_114_SOC is not set
-CONFIG_ARM_TEGRA_CPUFREQ=y
 CONFIG_TEGRA20_MC=y
-CONFIG_TEGRA30_MC=y
-
-CONFIG_SERIAL_TEGRA=y
-
-CONFIG_TEGRA_PCI=y
 CONFIG_TEGRA_IOMMU_GART=y
-CONFIG_TEGRA_IOMMU_SMMU=y
-CONFIG_MMC_SDHCI_TEGRA=m
-
-CONFIG_I2C_TEGRA=m
-
-CONFIG_TEGRA_SYSTEM_DMA=y
-CONFIG_TEGRA_EMC_SCALING_ENABLE=y
-CONFIG_TEGRA_AHB=y
-CONFIG_TEGRA20_APB_DMA=y
-# CONFIG_SPI_TEGRA114 is not set
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_TEGRA20_SLINK=m
-
-CONFIG_KEYBOARD_TEGRA=m
-CONFIG_PINCTRL_TEGRA=y
-CONFIG_PINCTRL_TEGRA20=y
-CONFIG_PINCTRL_TEGRA30=y
-CONFIG_USB_EHCI_TEGRA=m
-CONFIG_RTC_DRV_TEGRA=m
-
-CONFIG_SND_SOC_TEGRA=m
+CONFIG_MFD_MAX8907=m
 CONFIG_SND_SOC_TEGRA_ALC5632=m
-CONFIG_SND_SOC_TEGRA_RT5640=m
 CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
 CONFIG_SND_SOC_TEGRA_WM8753=m
 CONFIG_SND_SOC_TEGRA_WM8903=m
 CONFIG_SND_SOC_TEGRA_WM9712=m
 CONFIG_SND_SOC_TEGRA20_AC97=m
-CONFIG_SND_SOC_TEGRA30_AHUB=m
-CONFIG_SND_SOC_TEGRA30_I2S=m
+CONFIG_SND_SOC_TEGRA20_DAS=m
+CONFIG_SND_SOC_TEGRA20_SPDIF=m
 
 # AC100 (PAZ00)
 CONFIG_MFD_NVEC=y
@@ -515,47 +597,49 @@ 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=y
 CONFIG_GPIO_TPS6586X=y
-CONFIG_REGULATOR_TPS6586X=m
 CONFIG_RTC_DRV_TPS6586X=m
 
-CONFIG_PWM_TEGRA=m
-
-CONFIG_TEGRA_HOST1X=m
-CONFIG_TEGRA_HOST1X_FIREWALL=y
-
-CONFIG_DRM_TEGRA=y
-# CONFIG_DRM_TEGRA_STAGING is not set
-# CONFIG_DRM_TEGRA_DEBUG is not set
-
-CONFIG_CRYPTO_DEV_TEGRA_AES=m
-
-CONFIG_LEDS_RENESAS_TPU=y
-
 # OLPC XO
 CONFIG_SERIO_OLPC_APSP=m
 
 # Zynq-7xxx
-# likely needs usb/mmc still
+CONFIG_SERIAL_UARTLITE=y
+CONFIG_SERIAL_UARTLITE_CONSOLE=y
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_COMMON_CLK_AXI_CLKGEN=m
-CONFIG_CPU_IDLE_ZYNQ=y
+CONFIG_COMMON_CLK_SI570=m
+CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
+CONFIG_ARM_ZYNQ_CPUIDLE=y
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=m
 CONFIG_GPIO_XILINX=y
+CONFIG_GPIO_ZYNQ=m
 CONFIG_I2C_XILINX=m
 CONFIG_SPI_XILINX=m
-
-# MMC/SD
-CONFIG_MMC_TMIO=m
-CONFIG_MMC_SDHCI_PXAV3=m
-CONFIG_MMC_SDHCI_PXAV2=m
+CONFIG_SPI_CADENCE=m
+CONFIG_MMC_SDHCI_OF_ARASAN=m
+CONFIG_I2C_CADENCE=m
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_XILINX_XADC=m
+CONFIG_XILINX_VDMA=m
+CONFIG_SND_SOC_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=m
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+CONFIG_XILLYBUS_OF=m
+CONFIG_GS_FPGABOOT=m
+CONFIG_USB_GADGET_XILINX=m
+CONFIG_PCIE_XILINX=y
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_EDAC_SYNOPSYS=m
+CONFIG_PINCTRL_ZYNQ=y
 
 # Multi function devices
 CONFIG_MFD_88PM800=m
@@ -563,121 +647,21 @@ CONFIG_MFD_88PM805=m
 CONFIG_MFD_T7L66XB=y
 CONFIG_MFD_TC6387XB=y
 
+# Generic drivers
+CONFIG_REMOTEPROC=m
+
 # Regulator drivers
 CONFIG_REGULATOR_FAN53555=m
-# CONFIG_CHARGER_MANAGER is not set
-# CONFIG_REGULATOR_DUMMY is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_88PM800 is not set
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=y
+CONFIG_REGULATOR_LP8755=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8907=m
 CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_MAX8973=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_TPS51632=m
-CONFIG_REGULATOR_TPS62360=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6524X=m
-CONFIG_REGULATOR_TPS6507X=m
-CONFIG_REGULATOR_TPS65912=m
-CONFIG_REGULATOR_MAX8907=m
-CONFIG_REGULATOR_LP872X=y
-CONFIG_REGULATOR_LP8755=m
-
-# usb gadget 
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_VBUS_DRAW=100
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-# CONFIG_USB_FSL_USB2 is not set
-# CONFIG_USB_FUSB300 is not set
-# CONFIG_USB_RENESAS_USBHS 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_GADGET_VBUS_DRAW is not set
-# CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS 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
-# CONFIG_USB_ETH_RNDIS is not set
-# CONFIG_USB_ETH_EEM 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_PID_IN_CONTEXTIDR is not set
-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
-
-# CONFIG_ARM_KPROBES_TEST is not set
-
-# Defined config options we don't use yet
-# CONFIG_PINCTRL_IMX35 is not set
-# CONFIG_DRM_IMX_FB_HELPER is not set
-# CONFIG_DRM_IMX_PARALLEL_DISPLAY is not set
-# CONFIG_DRM_IMX_IPUV3_CORE is not set
-# CONFIG_DRM_IMX_IPUV3 is not set
-# CONFIG_REGULATOR_ANATOP is not set
-
-# CONFIG_BATTERY_RX51 is not set
-# CONFIG_IR_RX51 is not set
-# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
-# CONFIG_MFD_SMSC is not set
-# CONFIG_MFD_SEC_CORE is not set
-# CONFIG_MFD_DA9055 is not set
-# CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_DA9052_I2C is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8997 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_MFD_DA9055 is not set
-# CONFIG_MFD_SMSC is not set
-# CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_AS3711 is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_REGULATOR_LP3972 is not set
-# CONFIG_REGULATOR_LP872X is not set
-
-# CONFIG_DVB_USB_PCTV452E is not set
-# We need to fix these as they should be either generic includes or kconfig fixes
-# 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_VIRTUALIZATION is not set
-# CONFIG_CHARGER_MANAGER is not set
-# CONFIG_POWER_RESET_QNAP is not set
-# CONFIG_POWER_RESET_RESTART is not set
-# CONFIG_OMAP2_DSS_DEBUG is not set
-# CONFIG_DRM_TEGRA_DEBUG is not set
-# CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
-# CONFIG_AB8500_DEBUG is not set
-
-# CONFIG_SOC_VF610 is not set
-# CONFIG_ARM_CCI is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_SERIAL_UARTLITE is not set
-

config-armv7-generic

@@ -2,18 +2,19 @@
 # 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_IWMMXT=y
+CONFIG_KERNEL_MODE_NEON=y
 
 CONFIG_ARM_UNWIND=y
 CONFIG_ARM_THUMB=y
@@ -23,7 +24,6 @@ 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
@@ -32,7 +32,8 @@ 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_IRQ_CROSSBAR=y
+CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 
 # CONFIG_MCPM is not set
 # CONFIG_OABI_COMPAT is not set
@@ -47,23 +48,30 @@ CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y
 # CONFIG_ARM_VIRT_EXT is not set
 
 # Platforms enabled/disabled globally on ARMv7
+CONFIG_ARCH_EXYNOS=y
 CONFIG_ARCH_HIGHBANK=y
-CONFIG_ARCH_VEXPRESS_CA9X4=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
+CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_BCM is not set
+# CONFIG_ARCH_BERLIN is not set
+# CONFIG_ARCH_HI3xxx is not set
+# CONFIG_ARCH_HISI is not set
+# CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_MESON is not set
+# CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_SHMOBILE_MULTI is not set
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_STI is not set
-# CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_VEXPRESS_SPC is not set
 # CONFIG_ARCH_WM8850 is not set
-
-# highbank
-# 2013/04/19 - stability issues
-# CONFIG_CPU_IDLE_CALXEDA is not set
-CONFIG_EDAC_HIGHBANK_MC=m
-CONFIG_EDAC_HIGHBANK_L2=m
-CONFIG_SATA_HIGHBANK=m
-CONFIG_ARM_HIGHBANK_CPUFREQ=m
+# CONFIG_ARCH_DIGICOLOR is not set
 
 # errata
 # v5/v6
@@ -93,6 +101,7 @@ 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
@@ -104,39 +113,47 @@ CONFIG_SCHED_SMT=y
 
 CONFIG_RCU_FANOUT=32
 
-# 2013/04/19 - disable due to stability issues in 3.9 for the moment
-# CONFIG_CPU_IDLE is not set
-## CONFIG_CPU_IDLE_GOV_LADDER is not set
-# CONFIG_CPU_IDLE_GOV_MENU is not set
+CONFIG_CHECKPOINT_RESTORE=y
+
+# Power management / thermal / cpu scaling
+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_PM_OPP=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARM_PSCI=y
+CONFIG_THERMAL=y
+CONFIG_CLOCK_THERMAL=y
+CONFIG_CPUFREQ_DT=y
 # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
+CONFIG_PM_DEVFREQ=y
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
 
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_LSM_MMAP_MIN_ADDR=32768
 
 CONFIG_XZ_DEC_ARM=y
 
-CONFIG_ARM_CPU_SUSPEND=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_PCI_HOST_GENERIC=y
+# CONFIG_PCI_LAYERSCAPE is not set
 
 CONFIG_LBDAF=y
 
+# GRR, needed for MFD_AS3722
+CONFIG_I2C=y
+
 # Device tree
 CONFIG_USE_OF=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_APPENDED_DTB=y
-CONFIG_I2C_MUX_PINCTRL=m
 
 # General vexpress ARM drivers
 CONFIG_ARM_TIMER_SP804=y
@@ -144,100 +161,410 @@ 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_ARM_SP805_WATCHDOG=m
 CONFIG_GPIO_PL061=y
-CONFIG_FB_ARMCLCD=m
+CONFIG_PL320_MBOX=y
+CONFIG_SND_ARMAACI=m
+CONFIG_USB_ISP1760=m
+
+# 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
+# CONFIG_MACH_SUN4I is not set
+# CONFIG_MACH_SUN5I is not set
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
+CONFIG_MACH_SUN8I=y
+# CONFIG_MACH_SUN9I is not set
+CONFIG_DMA_SUN6I=m
+CONFIG_SUNXI_WATCHDOG=m
+CONFIG_NET_VENDOR_ALLWINNER=y
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_EEPROM_SUNXI_SID=m
+CONFIG_RTC_DRV_SUNXI=m
+CONFIG_PHY_SUN4I_USB=m
+CONFIG_AHCI_SUNXI=m
+CONFIG_SPI_SUN4I=m
+CONFIG_SPI_SUN6I=m
+CONFIG_MMC_SUNXI=m
+CONFIG_I2C_SUN6I_P2WI=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_TOUCHSCREEN_SUN4I=m
+CONFIG_MFD_AXP20X=y
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_IR_SUNXI=m
+CONFIG_MDIO_SUN4I=m
+CONFIG_SUN4I_EMAC=m
+CONFIG_RTC_DRV_SUN6I=m
+CONFIG_AXP288_ADC=m
+CONFIG_MTD_NAND_SUNXI=m
+CONFIG_SERIO_SUN4I_PS2=m
+CONFIG_KEYBOARD_SUN4I_LRADC=m
+CONFIG_PWM_SUN4I=m
+
+# Exynos
+CONFIG_ARCH_EXYNOS3=y
+# CONFIG_ARCH_EXYNOS4 is not set
+CONFIG_ARCH_EXYNOS5=y
+CONFIG_SOC_EXYNOS3250=y
+CONFIG_SOC_EXYNOS5250=y
+CONFIG_SOC_EXYNOS5420=y
+CONFIG_SOC_EXYNOS5440=y
+CONFIG_SOC_EXYNOS5260=y
+CONFIG_SOC_EXYNOS5410=y
+CONFIG_SOC_EXYNOS5800=y
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_ARM_EXYNOS5250_CPUFREQ=y
+CONFIG_ARM_EXYNOS5440_CPUFREQ=y
+CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW=y
+CONFIG_ARM_EXYNOS_CPUIDLE=y
+CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
+CONFIG_ARM_EXYNOS5_BUS_DEVFREQ=m
+# CONFIG_EXYNOS5420_MCPM not set
+CONFIG_ARM_EXYNOS_CPUFREQ=m
+
+CONFIG_I2C_EXYNOS5=m
+CONFIG_I2C_S3C2410=m
+CONFIG_SPI_S3C64XX=m
+CONFIG_EXYNOS_THERMAL=m
+CONFIG_EXYNOS_ADC=m
+CONFIG_MMC_SDHCI_S3C=m
+CONFIG_MMC_SDHCI_S3C_DMA=y
+CONFIG_MMC_DW_EXYNOS=m
+CONFIG_EXYNOS_IOMMU=y
+CONFIG_PCI_EXYNOS=y
+CONFIG_PHY_EXYNOS5_USBDRD=m
+CONFIG_PHY_SAMSUNG_USB2=m
+CONFIG_USB_EHCI_EXYNOS=m
+CONFIG_USB_OHCI_EXYNOS=m
+CONFIG_USB_DWC3_EXYNOS=m
+CONFIG_PHY_EXYNOS5250_SATA=m
+CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_CRYPTO_DEV_S5P=m
+CONFIG_PWM_SAMSUNG=m
+CONFIG_S3C2410_WATCHDOG=m
+CONFIG_MFD_SEC_CORE=y
+CONFIG_REGULATOR_S2MPS11=m
+CONFIG_REGULATOR_S5M8767=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_RTC_DRV_S5M=m
+CONFIG_RTC_DRV_S3C=m
+CONFIG_MFD_WM8994=m
+CONFIG_GPIO_WM8994=m
+CONFIG_REGULATOR_WM8994=m
+
+CONFIG_EXYNOS_VIDEO=y
+CONFIG_EXYNOS_MIPI_DSI=y
+CONFIG_DRM_EXYNOS=m
+CONFIG_DRM_EXYNOS_DP=y
+CONFIG_DRM_EXYNOS_DPI=y
+CONFIG_DRM_EXYNOS_DSI=y
+CONFIG_DRM_EXYNOS_FIMC=y
+CONFIG_DRM_EXYNOS_FIMD=y
+CONFIG_DRM_EXYNOS7_DECON=y
+CONFIG_DRM_EXYNOS_G2D=y
+CONFIG_DRM_EXYNOS_GSC=y
+CONFIG_DRM_EXYNOS_HDMI=y
+CONFIG_DRM_EXYNOS_IOMMU=y
+CONFIG_DRM_EXYNOS_IPP=y
+CONFIG_DRM_EXYNOS_ROTATOR=y
+CONFIG_DRM_EXYNOS_VIDI=y
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+# CONFIG_FB_S3C is not set
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=y
+CONFIG_VIDEO_EXYNOS_FIMC_LITE=m
+CONFIG_VIDEO_EXYNOS4_FIMC_IS=m
+CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE=y
+CONFIG_VIDEO_S5P_FIMC=m
+CONFIG_VIDEO_S5P_MIPI_CSIS=m
+CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
+CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
+CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
+# CONFIG_VIDEO_SAMSUNG_S5P_TV is not set
+CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+
+CONFIG_SND_SOC_SAMSUNG=m
+CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
+CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
+CONFIG_SND_SOC_SMDK_WM8994_PCM=m
+CONFIG_SND_SOC_SNOW=m
+CONFIG_SND_SOC_ODROIDX2=m
+# CONFIG_EXYNOS_IOMMU_DEBUG is not set
+# CONFIG_SAMSUNG_PM_DEBUG is not set
+# CONFIG_SAMSUNG_PM_CHECK is not set
+
+# Arndale/Origen
+CONFIG_MFD_MAX8997=y
+CONFIG_MFD_MAX77686=y
+CONFIG_REGULATOR_MAX8997=m
+CONFIG_REGULATOR_MAX77686=m
+CONFIG_REGULATOR_S2MPA01=m
+CONFIG_REGULATOR_S5M8767=m
+CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_COMMON_CLK_MAX77802=m
+CONFIG_COMMON_CLK_S2MPS11=m
+CONFIG_INPUT_MAX8997_HAPTIC=m
+CONFIG_CHARGER_MAX8997=m
+CONFIG_LEDS_MAX8997=m
+CONFIG_RTC_DRV_MAX8997=m
+CONFIG_RTC_DRV_MAX77686=m
+CONFIG_RTC_DRV_MAX77802=m
+CONFIG_RTC_DRV_RK808=m
+CONFIG_EXTCON_MAX8997=m
+
+# Rockchips
+CONFIG_I2C_RK3X=m
+CONFIG_SPI_ROCKCHIP=m
+CONFIG_PWM_ROCKCHIP=m
+CONFIG_ROCKCHIP_SARADC=m
+CONFIG_ROCKCHIP_IODOMAIN=m
+CONFIG_MMC_DW_ROCKCHIP=m
+CONFIG_EMAC_ROCKCHIP=m
+CONFIG_MFD_RK808=m
+CONFIG_COMMON_CLK_RK808=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_RTC_DRV_HYM8563=m
+CONFIG_ROCKCHIP_SARADC=m
+CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP_I2S=m
+CONFIG_ROCKCHIP_THERMAL=m
+CONFIG_DRM_ROCKCHIP=m
+CONFIG_ROCKCHIP_DW_HDMI=m
+CONFIG_PHY_ROCKCHIP_USB=m
+
+# Tegra
+CONFIG_ARCH_TEGRA_114_SOC=y
+CONFIG_ARCH_TEGRA_124_SOC=y
+CONFIG_ARM_TEGRA_CPUFREQ=y
+CONFIG_TRUSTED_FOUNDATIONS=y
+CONFIG_SERIAL_TEGRA=y
+CONFIG_PCI_TEGRA=y
+CONFIG_AHCI_TEGRA=m
+CONFIG_TEGRA_IOMMU_SMMU=y
+CONFIG_MMC_SDHCI_TEGRA=m
+CONFIG_TEGRA_WATCHDOG=m
+CONFIG_I2C_TEGRA=m
+CONFIG_TEGRA_AHB=y
+CONFIG_TEGRA20_APB_DMA=y
+CONFIG_SPI_TEGRA114=m
+CONFIG_PWM_TEGRA=m
+CONFIG_KEYBOARD_TEGRA=m
+CONFIG_USB_EHCI_TEGRA=m
+CONFIG_RTC_DRV_TEGRA=m
+CONFIG_SND_SOC_TEGRA=m
+CONFIG_SND_SOC_TEGRA_MAX98090=m
+CONFIG_SND_SOC_TEGRA_RT5640=m
+CONFIG_SND_SOC_TEGRA30_AHUB=m
+CONFIG_SND_SOC_TEGRA30_I2S=m
+CONFIG_SND_SOC_TEGRA_RT5677=m
+CONFIG_SND_HDA_TEGRA=m
+CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HOST1X_FIREWALL=y
+CONFIG_DRM_TEGRA=m
+CONFIG_DRM_TEGRA_FBDEV=y
+# CONFIG_DRM_TEGRA_DEBUG is not set
+CONFIG_DRM_TEGRA_STAGING=y
+CONFIG_NOUVEAU_PLATFORM_DRIVER=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_TEGRA_SOCTHERM=m
+CONFIG_TEGRA_MC=y
+CONFIG_ARM_TEGRA_DEVFREQ=m
+
+# Jetson TK1
+CONFIG_PINCTRL_AS3722=y
+CONFIG_POWER_RESET_AS3722=y
+CONFIG_MFD_AS3722=y
+CONFIG_REGULATOR_AS3722=m
+CONFIG_RTC_DRV_AS3722=y
+
+# TI Generic
+CONFIG_TI_SOC_THERMAL=m
+CONFIG_TI_THERMAL=y
+
+# DRM panels
+CONFIG_DRM_PANEL=y
+CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_LD9040=m
+CONFIG_DRM_PANEL_S6E8AA0=m
+CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
+CONFIG_DRM_DW_HDMI=m
+
+# regmap
+CONFIG_REGMAP_SPI=m
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_MMIO=m
+CONFIG_REGMAP_IRQ=y
 
 # 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_OTG=y
+CONFIG_USB_GADGET=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
+# Use PIO on musb as upstream doesn't support multiple DMA engines yet :-/
+CONFIG_MUSB_PIO_ONLY=y
+# CONFIG_USB_MUSB_TUSB6010 is not set
+# CONFIG_USB_MUSB_UX500 is not set
+CONFIG_USB_GPIO_VBUS=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_F_LB_SS is not set
+# CONFIG_USB_CONFIGFS_F_FS is not set
+# CONFIG_USB_CONFIGFS_F_UAC1 is not set
+# CONFIG_USB_CONFIGFS_F_UAC2 is not set
+# CONFIG_USB_CONFIGFS_F_MIDI is not set
+# CONFIG_USB_CONFIGFS_F_HID is not set
+# CONFIG_USB_CONFIGFS_F_UVC 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_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_BDC_UDC 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_SYSCON=y
+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
+# CONFIG_MFD_PM8921_CORE is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+# 
 
 # Pin stuff
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SINGLE=m
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_SAMSUNG is not set
-# CONFIG_PINCTRL_EXYNOS4 is not set
+# CONFIG_PINCTRL_MSM8X74 is not set
+# CONFIG_PINCTRL_BCM281XX is not set
+# CONFIG_PINCTRL_APQ8064 is not set
+# CONFIG_PINCTRL_APQ8084 is not set
+# CONFIG_PINCTRL_IPQ8064 is not set
+# CONFIG_PINCTRL_MSM8960 is not set
 
 # GPIO
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_EXTCON_GPIO=m
 # CONFIG_GPIO_EM is not set
-CONFIG_GPIO_ADNP=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_POWER_RESET_GPIO=y
-CONFIG_SERIAL_8250_EM=m
-CONFIG_INPUT_GPIO_TILT_POLLED=m
-CONFIG_MDIO_BUS_MUX_GPIO=m
-CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_LEDS_GPIO=m
+CONFIG_GPIO_74X164=m
 CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_74X164=m
+CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TPS65912=m
+# CONFIG_GPIO_ZEVIO is not set
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_REGISTER=y
+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_GPIO_POLLED=m
+CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_GPIO_RCAR is not set
 CONFIG_W1_MASTER_GPIO=m
-CONFIG_CHARGER_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_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_DESIGNWARE=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_XCOMM=m
 # CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_CADENCE 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
+CONFIG_CRYPTO_SHA1_ARM_NEON=m
+CONFIG_CRYPTO_SHA512_ARM_NEON=m
 
-# EDAC
-CONFIG_EDAC=y
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_LEGACY_SYSFS=y
+# DMA
+CONFIG_TI_PRIV_EDMA=y
+CONFIG_TI_EDMA=y
 
 # Watchdog
-CONFIG_MPCORE_WATCHDOG=m
 
-# Thermal / powersaving
-CONFIG_THERMAL=y
-CONFIG_POWER_RESET_RESTART=y
-CONFIG_ARM_PSCI=y
+# Mailbox
+CONFIG_MAILBOX=y
 
 # MTD
 # CONFIG_MG_DISK is not set
@@ -245,89 +572,121 @@ 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_SPI_NOR=m
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
+CONFIG_MTD_SPINAND_MT29F=m
+CONFIG_MTD_SPINAND_ONDIEECC=y
 CONFIG_MTD_SST25L=m
+CONFIG_MTD_ST_SPI_FSM=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=m
-# CONFIG_MMC_DW_EXYNOS is not set
-# CONFIG_MMC_DW_IDMAC is not set
-CONFIG_USB_DWC2=m
-CONFIG_USB_DWC3=m
-# CONFIG_USB_DWC3_DEBUG is not set
-CONFIG_DW_WATCHDOG=m
-
 # Sound
 CONFIG_SND_ARM=y
-CONFIG_SND_ARMAACI=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SPI=y
-CONFIG_SND_DESIGNWARE_I2S=m
-CONFIG_SND_SIMPLE_CARD=m
-CONFIG_SND_SOC_CACHE_LZO=y
-CONFIG_SND_SOC_ALL_CODECS=m
-CONFIG_SND_SOC_DMAENGINE_PCM=y
-CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-# CONFIG_SND_ATMEL_SOC is not set
+CONFIG_SND_SOC_AC97_BUS=y
 
 # Displays
+CONFIG_BACKLIGHT_TPS65217=m
 
 # RTC
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=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_PCF2123=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_PCF2123=m
 CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_TPS65910=m
+CONFIG_RTC_DRV_TPS80031=m
+# CONFIG_RTC_DRV_DS1347 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
+# CONFIG_RTC_DRV_XGENE  is not set
 
 # Regulators
 CONFIG_REGULATOR=y
 CONFIG_RFKILL_REGULATOR=m
-CONFIG_CHARGER_MANAGER=y
-# CONFIG_REGULATOR_DUMMY is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=m
+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_ANATOP=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_LP3971=m
-CONFIG_REGULATOR_LP3972=m
-CONFIG_REGULATOR_LP8755=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_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_MAX77802=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_SENSORS_LTC2978_REGULATOR=y
 
+CONFIG_POWER_AVS=y
+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
+CONFIG_BATTERY_SBS=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_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LM70=m
 CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_LIS3_SPI=m
-CONFIG_SENSORS_GPIO_FAN=m
 
 CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
@@ -346,30 +705,28 @@ CONFIG_LCD_HX8357=m
 CONFIG_INPUT_GP2A=m
 CONFIG_INPUT_ARIZONA_HAPTICS=m
 CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 
 CONFIG_TOUCHSCREEN_ADS7846=m
 CONFIG_TOUCHSCREEN_AD7877=m
 CONFIG_TOUCHSCREEN_MC13783=m
 CONFIG_TOUCHSCREEN_TSC2005=m
 
+CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_DAC124S085=m
 CONFIG_LEDS_PWM=m
+CONFIG_LEDS_SYSCON=y
 CONFIG_BMP085_SPI=m
 
-# Display
+CONFIG_MFD_SYSCON=y
+CONFIG_GPIO_SYSCON=m
+CONFIG_POWER_RESET_SYSCON=y
 
-CONFIG_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_SRAM=y
 
 # Ethernet
 CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
 CONFIG_ENC28J60=m
 CONFIG_LIBERTAS_SPI=m
 CONFIG_P54_SPI=m
@@ -399,63 +756,88 @@ 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
 
-# Should be in generic
-CONFIG_BPF_JIT=y
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
+# Sensors
+CONFIG_SENSORS_HTU21=m
 
-# CONFIG_PATA_PLATFORM is not set
+# Chromebook
+CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_I2C=m
+CONFIG_MFD_CROS_EC_SPI=m
+CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_I2C_CROS_EC_TUNNEL=m
+CONFIG_SND_SOC_TS3A227E=m
 
-# 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
+CONFIG_R8188EU=m
+# CONFIG_88EU_AP_MODE is not set
 
 # Needs work/investigation
-# CONFIG_ARM_CHARLCD is not set
+# CONFIG_ARM_KPROBES_TEST is not set
+
+# HW Enabled in armv7 not lpae
+# CONFIG_DRM_TILCDC is not set
+# CONFIG_DRM_IMX is not set
+# CONFIG_DRM_STI is not set
+# CONFIG_AHCI_IMX is not set
+# CONFIG_IMX_THERMAL is not set
+# CONFIG_TI_DAC7512 is not set
+
+# Not needed on ARMv7
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_DM9000 is not set
 # CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_IP_PNP_RARP is not set
+# CONFIG_SPI_PXA2XX 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
-
-# these modules all fail with missing __bad_udelay
-# http://www.spinics.net/lists/arm/msg15615.html provides some background
+# CONFIG_SERIAL_BCM63XX is not set
+# CONFIG_FB_XILINX is not set
+# CONFIG_USB_GADGET_XILINX is not set
+# CONFIG_BRCMSTB_GISB_ARB is not set
 # 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
+# CONFIG_POWER_RESET_QNAP is not set
+# CONFIG_MMC_TMIO is not set
+# CONFIG_PINCTRL_IMX35 is not set
+# CONFIG_DVB_USB_PCTV452E is not set
+
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_INPUT_REGULATOR_HAPTIC is not set
+# CONFIG_INPUT_AXP20X_PEK is not set
+# CONFIG_POWER_RESET_BRCMSTB is not set
+# CONFIG_INPUT_TPS65218_PWRBUTTON is not set
+# CONFIG_CLK_QORIQ 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_ARM_DT_BL_CPUFREQ is not set
-
-# FIX ME
-# CONFIG_FB_XILINX is not set
+# CONFIG_DMADEVICES_VDEBUG is not set
+# CONFIG_DMADEVICES_DEBUG is not set
+# CONFIG_OMAP2_DSS_DEBUG is not set
+# CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
+# CONFIG_AB8500_DEBUG is not set
+# CONFIG_ARM_KERNMEM_PERMS is not set

config-armv7-lpae

@@ -1,8 +1,5 @@
 # ARM A15 lpae unified arch kernel
-CONFIG_ARCH_EXYNOS_MULTI=y
 CONFIG_ARCH_KEYSTONE=y
-CONFIG_ARCH_VIRT=y
-CONFIG_ARCH_EXYNOS5=y
 
 # CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_MXC is not set
@@ -11,36 +8,30 @@ CONFIG_ARCH_EXYNOS5=y
 # CONFIG_SOC_OMAP5 is not set
 # CONFIG_SOC_AM33XX is not set
 # CONFIG_SOC_AM43XX is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_ARCH_SUNXI is not set
-# CONFIG_ARCH_TEGRA is not set
+# CONFIG_SOC_DRA7XX is not set
 # CONFIG_ARCH_ZYNQ is not set
-
-
-# CONFIG_ARCH_EXYNOS4 is not set
-
-# CONFIG_EXYNOS_ATAGS is not set
+# CONFIG_ARCH_AXXIA is not set
 
 CONFIG_ARM_LPAE=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_VIRTIO_CONSOLE=m
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_VIRTUALIZATION=y
-CONFIG_ARM_SMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+CONFIG_CMA_SIZE_MBYTES=64
+
 # Cortex-A15
 CONFIG_ARM_ERRATA_798181=y
+CONFIG_ARM_ERRATA_773022=y
 
 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=y
+# CONFIG_XEN is not set
 CONFIG_XEN_FBDEV_FRONTEND=y
 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
 CONFIG_XEN_BLKDEV_FRONTEND=m
@@ -57,81 +48,38 @@ 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_MACH_EXYNOS5_DT=y
-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_EXYNOS_CPUFREQ=y
-# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
-CONFIG_EXYNOS_THERMAL=m
-CONFIG_PCI_EXYNOS=y
+# TI Keystone
+CONFIG_KEYSTONE_USB_PHY=m
+CONFIG_USB_DWC3_KEYSTONE=m
+CONFIG_GPIO_DAVINCI=y
+CONFIG_I2C_DAVINCI=m
+CONFIG_TI_AEMIF=m
+CONFIG_POWER_RESET_KEYSTONE=y
+CONFIG_DAVINCI_WATCHDOG=m
+CONFIG_SPI_DAVINCI=m
+CONFIG_TI_DAVINCI_MDIO=m
+CONFIG_KEYSTONE_IRQ=m
+CONFIG_PCI_KEYSTONE=y
+CONFIG_MTD_NAND_DAVINCI=m
+CONFIG_GPIO_SYSCON=m
 
-CONFIG_ARM_CCI=y
-CONFIG_TCG_TIS_I2C_INFINEON=m
-
-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
-
-# Chromebook
-CONFIG_MFD_CROS_EC=m
-CONFIG_MFD_CROS_EC_I2C=m
-CONFIG_MFD_CROS_EC_SPI=m
-CONFIG_KEYBOARD_CROS_EC=m
-
-# 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
+# Tegra (non A15 device options)
+# CONFIG_ARCH_TEGRA_2x_SOC is not set
+# CONFIG_ARCH_TEGRA_3x_SOC is not set
+# CONFIG_TEGRA20_MC is not set
+# CONFIG_TEGRA_IOMMU_GART is not set
+# CONFIG_SPI_TEGRA20_SFLASH is not set
+# CONFIG_SPI_TEGRA20_SLINK is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_NVEC is not set
+# CONFIG_SND_SOC_TEGRA_ALC5632 is not set
+# CONFIG_SND_SOC_TEGRA_TRIMSLICE is not set
+# CONFIG_SND_SOC_TEGRA_WM8753 is not set
+# CONFIG_SND_SOC_TEGRA_WM8903 is not set
+# CONFIG_SND_SOC_TEGRA_WM9712 is not set
+# CONFIG_SND_SOC_TEGRA20_AC97 is not set
+# CONFIG_SND_SOC_TEGRA20_DAS is not set
+# CONFIG_SND_SOC_TEGRA20_SPDIF is not set
+# CONFIG_SND_SOC_TEGRA_RT5677 is not set

config-debug

@@ -5,9 +5,9 @@ CONFIG_SND_PCM_XRUN_DEBUG=y
 CONFIG_DEBUG_ATOMIC_SLEEP=y
 
 CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_LOCK_ALLOC=y
+CONFIG_LOCK_TORTURE_TEST=m
 CONFIG_PROVE_LOCKING=y
 CONFIG_DEBUG_SPINLOCK=y
 CONFIG_PROVE_RCU=y
@@ -26,20 +26,19 @@ 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
 
 CONFIG_ACPI_DEBUG=y
-# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
 
 CONFIG_DEBUG_SG=y
+CONFIG_DEBUG_PI_LIST=y
 
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_PAGE_OWNER is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 
-CONFIG_DEBUG_WRITECOUNT=y
 CONFIG_DEBUG_OBJECTS=y
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
 CONFIG_DEBUG_OBJECTS_FREE=y
@@ -48,12 +47,13 @@ CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 
 CONFIG_X86_PTDUMP=y
+CONFIG_ARM64_PTDUMP=y
+CONFIG_EFI_PGT_DUMP=y
 
 CONFIG_CAN_DEBUG_DEVICES=y
 
 CONFIG_MODULE_FORCE_UNLOAD=y
 
-CONFIG_SYSCTL_SYSCALL_CHECK=y
 
 CONFIG_DEBUG_NOTIFIERS=y
 
@@ -97,13 +97,14 @@ CONFIG_PM_ADVANCED_DEBUG=y
 CONFIG_CEPH_LIB_PRETTYDEBUG=y
 CONFIG_QUOTA_DEBUG=y
 
-CONFIG_PCI_DEFAULT_USE_CRS=y
 
 CONFIG_KGDB_KDB=y
 CONFIG_KDB_KEYBOARD=y
+CONFIG_KDB_DEFAULT_ENABLE=0x1
 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
 
@@ -122,6 +123,8 @@ CONFIG_MAC80211_MESSAGE_TRACING=y
 
 CONFIG_EDAC_DEBUG=y
 
+CONFIG_SPI_DEBUG=y
+
 CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
 CONFIG_LATENCYTOP=y
 CONFIG_SCHEDSTATS=y

config-i686-PAE

@@ -1,6 +1,5 @@
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
-# CONFIG_OLPC_OPENFIRMWARE is not set
 
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_SYS_HYPERVISOR=y

config-no-extra

@@ -0,0 +1,27 @@
+### config-no-extra: only (to a first approximation) modules listed in
+###   mod-extra.list should be listed here. 
+
+# CONFIG_ISDN is not set
+# CONFIG_RDS is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATALK is not set
+# CONFIG_HAMRADIO is not set
+
+# CONFIG_DEV_APPLETALK is not set
+
+# CONFIG_FUSION is not set
+# CONFIG_I2O is not set
+
+# CONFIG_NET_TULIP is not set
+
+# CONFIG_HERMES is not set
+
+# CONFIG_OCFS2_FS is not set
+# CONFIG_CUSE is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set

config-nodebug

@@ -2,118 +2,119 @@ CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-CONFIG_DEBUG_ATOMIC_SLEEP=y
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
 
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_PROVE_RCU=y
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_PROVE_RCU is not set
 # CONFIG_PROVE_RCU_REPEATEDLY is not set
-CONFIG_DEBUG_PER_CPU_MAPS=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_CPUMASK_OFFSTACK=y
 
-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 
-CONFIG_FAULT_INJECTION=y
-CONFIG_FAILSLAB=y
-CONFIG_FAIL_PAGE_ALLOC=y
-CONFIG_FAIL_MAKE_REQUEST=y
-CONFIG_FAULT_INJECTION_DEBUG_FS=y
-CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
-CONFIG_FAIL_IO_TIMEOUT=y
-CONFIG_FAIL_MMC_REQUEST=y
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_FAILSLAB is not set
+# CONFIG_FAIL_PAGE_ALLOC is not set
+# CONFIG_FAIL_MAKE_REQUEST is not set
+# CONFIG_FAULT_INJECTION_DEBUG_FS is not set
+# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set
+# CONFIG_FAIL_IO_TIMEOUT is not set
+# CONFIG_FAIL_MMC_REQUEST is not set
 
-CONFIG_SLUB_DEBUG_ON=y
+# CONFIG_LOCK_STAT is not set
 
-CONFIG_LOCK_STAT=y
+# CONFIG_DEBUG_STACK_USAGE is not set
 
-CONFIG_DEBUG_STACK_USAGE=y
+# CONFIG_ACPI_DEBUG is not set
 
-CONFIG_ACPI_DEBUG=y
-# CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
-
-CONFIG_DEBUG_SG=y
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_PI_LIST is not set
 
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_PAGE_OWNER is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 
-CONFIG_DEBUG_WRITECOUNT=y
-CONFIG_DEBUG_OBJECTS=y
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-CONFIG_DEBUG_OBJECTS_FREE=y
-CONFIG_DEBUG_OBJECTS_TIMERS=y
-CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
+# CONFIG_DEBUG_OBJECTS_FREE is not set
+# CONFIG_DEBUG_OBJECTS_TIMERS is not set
+# CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 
 CONFIG_X86_PTDUMP=y
+# CONFIG_ARM64_PTDUMP is not set
+# CONFIG_EFI_PGT_DUMP is not set
 
-CONFIG_CAN_DEBUG_DEVICES=y
+# CONFIG_CAN_DEBUG_DEVICES is not set
 
-CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
 
-CONFIG_SYSCTL_SYSCALL_CHECK=y
 
-CONFIG_DEBUG_NOTIFIERS=y
+# CONFIG_DEBUG_NOTIFIERS is not set
 
-CONFIG_DMA_API_DEBUG=y
+# CONFIG_DMA_API_DEBUG is not set
 
-CONFIG_MMIOTRACE=y
+# CONFIG_MMIOTRACE is not set
 
-CONFIG_DEBUG_CREDENTIALS=y
+# CONFIG_DEBUG_CREDENTIALS is not set
 
 # off in both production debug and nodebug builds,
 #  on in rawhide nodebug builds
-CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 
-CONFIG_EXT4_DEBUG=y
+# CONFIG_EXT4_DEBUG is not set
 
 # CONFIG_XFS_WARN is not set
 
-CONFIG_DEBUG_PERF_USE_VMALLOC=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 
-CONFIG_JBD2_DEBUG=y
+# CONFIG_JBD2_DEBUG is not set
 
-CONFIG_NFSD_FAULT_INJECTION=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
 
-CONFIG_DEBUG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
 
-CONFIG_DRBD_FAULT_INJECTION=y
+# CONFIG_DRBD_FAULT_INJECTION is not set
 
-CONFIG_ATH_DEBUG=y
-CONFIG_CARL9170_DEBUGFS=y
-CONFIG_IWLWIFI_DEVICE_TRACING=y
+# CONFIG_ATH_DEBUG is not set
+# CONFIG_CARL9170_DEBUGFS is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
 
 # CONFIG_RTLWIFI_DEBUG is not set
 
-CONFIG_DEBUG_OBJECTS_WORK=y
+# CONFIG_DEBUG_OBJECTS_WORK is not set
 
-CONFIG_DMADEVICES_DEBUG=y
-CONFIG_DMADEVICES_VDEBUG=y
+# CONFIG_DMADEVICES_DEBUG is not set
+# CONFIG_DMADEVICES_VDEBUG is not set
 
 CONFIG_PM_ADVANCED_DEBUG=y
 
-CONFIG_CEPH_LIB_PRETTYDEBUG=y
-CONFIG_QUOTA_DEBUG=y
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_QUOTA_DEBUG is not set
 
-CONFIG_PCI_DEFAULT_USE_CRS=y
 
 CONFIG_KGDB_KDB=y
+CONFIG_KDB_DEFAULT_ENABLE=0x0
 CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 
-CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
-CONFIG_TEST_LIST_SORT=y
+# 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=y
+# CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 
-CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 
-CONFIG_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
 CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
 # CONFIG_DEBUG_KMEMLEAK_TEST is not set
 CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
@@ -124,7 +125,7 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 
 # CONFIG_SPI_DEBUG is not set
 
-CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_LATENCYTOP is not set

config-powerpc-generic

@@ -14,7 +14,6 @@ CONFIG_TAU_AVERAGE=y
 # CONFIG_GEN_RTC is not set
 # CONFIG_GEN_RTC_X is not set
 CONFIG_RTC_DRV_GENERIC=y
-CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 
 CONFIG_ADB=y
@@ -50,6 +49,7 @@ CONFIG_SND_AOA_ONYX=m
 CONFIG_SND_AOA_TAS=m
 CONFIG_SND_AOA_TOONIE=m
 CONFIG_SND_AOA_SOUNDBUS_I2S=m
+# CONFIG_SND_SOC is not set
 
 CONFIG_XMON=y
 # CONFIG_XMON_DEFAULT is not set
@@ -61,26 +61,21 @@ CONFIG_CAPI_EICON=y
 
 CONFIG_NVRAM=y
 
-# CONFIG_PCMCIA_M8XX is not set
 # CONFIG_SCSI_AHA1542 is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_SCSI_IPS is not set
-# CONFIG_NI52 is not set
 # CONFIG_NI65 is not set
 # CONFIG_LANCE is not set
 # CONFIG_3C515 is not set
-# CONFIG_ELPLUS is not set
 
 CONFIG_MEMORY_HOTPLUG=y
 
 # Stuff which wants bus_to_virt() or virt_to_bus()
 # CONFIG_BLK_CPQ_DA is not set
-# CONFIG_VIDEO_STRADIS is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_ATM_HORIZON is not set
 # CONFIG_ATM_FIRESTREAM is not set
 # CONFIG_ATM_AMBASSADOR is not set
-# CONFIG_SCSI_DC390T is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 
 
@@ -97,7 +92,6 @@ CONFIG_PPC_MEDIA5200=y
 # CONFIG_PPC_LITE5200 is not set
 CONFIG_PPC_BESTCOMM=y
 CONFIG_PMAC_RACKMETER=m
-CONFIG_USB_OHCI_HCD_PPC_SOC=y
 CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_HCD_PPC_OF=y
 CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
@@ -186,7 +180,6 @@ CONFIG_PATA_OF_PLATFORM=m
 CONFIG_USB_EHCI_HCD_PPC_OF=y
 
 # CONFIG_MPC5121_ADS is not set
-# CONFIG_MPC5121_GENERIC is not set
 CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_NAND_FSL_ELBC is not set
 CONFIG_THERMAL=y
@@ -216,6 +209,10 @@ CONFIG_EXTRA_TARGETS=""
 
 CONFIG_NET_VENDOR_IBM=y
 
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_EN_VXLAN=y
+
 # CONFIG_SERIO_XILINX_XPS_PS2 is not set
 
 # CONFIG_PPC_SMLPAR is not set
@@ -227,7 +224,6 @@ CONFIG_NET_VENDOR_IBM=y
 
 # CONFIG_QUICC_ENGINE is not set
 # CONFIG_QE_GPIO is not set
-# CONFIG_MPC8xxx_GPIO is not set
 
 CONFIG_IDE_GD=y
 CONFIG_IDE_GD_ATA=y
@@ -278,7 +274,6 @@ CONFIG_MMC_SDHCI_OF=m
 
 # CONFIG_CONSISTENT_SIZE_BOOL is not set
 
-CONFIG_CAN_SJA1000_OF_PLATFORM=m
 
 CONFIG_PPC_EMULATED_STATS=y
 
@@ -292,7 +287,6 @@ CONFIG_PPC_DISABLE_WERROR=y
 # CONFIG_XILINX_EMACLITE is not set
 
 CONFIG_GPIO_WM831X=m
-# CONFIG_GPIO_LANGWELL is not set
 # CONFIG_GPIO_UCB1400 is not set
 # CONFIG_EDAC_MPC85XX is not set
 
@@ -305,7 +299,6 @@ CONFIG_SPARSE_IRQ=y
 CONFIG_PATA_MACIO=y
 CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_88PM8607 is not set
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
@@ -314,10 +307,10 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_MMC_SDHCI_OF_ESDHC is not set
 # CONFIG_MMC_SDHCI_OF_HLWD is not set
 
-# CONFIG_MFD_TC35892 is not set
 # CONFIG_MFD_AAT2870_CORE is not set
 
 # CONFIG_GPIO_SCH is not set
+# CONFIG_GPIO_74XX_MMIO is not set
 
 # CONFIG_PPC_MPC512x is not set
 # CONFIG_RTC_DRV_MPC5121 is not set
@@ -331,14 +324,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
 # CONFIG_NET_VENDOR_XILINX is not set
 # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
@@ -347,7 +335,8 @@ CONFIG_RFKILL_GPIO=m
 # CONFIG_NET_VENDOR_TOSHIBA is not set
 
 # CONFIG_CPU_IDLE is not set
-# CONFIG_OF_SELFTEST is not set
+# CONFIG_OF_UNITTEST is not set
+# CONFIG_OF_OVERLAY is not set
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_INPUT_GP2A is not set
 # CONFIG_INPUT_GPIO_TILT_POLLED is not set
@@ -363,22 +352,21 @@ CONFIG_RCU_FANOUT_LEAF=16
 # 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
-# CONFIG_RTC_DRV_SNVS is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 
-# 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_POWER_RESET_GPIO_RESTART=y
 CONFIG_FB_SSD1307=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=n
 
 CONFIG_XZ_DEC_POWERPC=y
+
+CONFIG_CRASH=m

config-powerpc32-generic

@@ -138,7 +138,6 @@ CONFIG_VIRTUALIZATION=y
 # PPC gets sad with debug alloc (bz 448598)
 # CONFIG_DEBUG_PAGEALLOC is not set
 
-CONFIG_SND_ISA=y
 CONFIG_CRYPTO_DEV_TALITOS=m
 
 # CONFIG_FSL_EMB_PERFMON is not set

config-powerpc64

@@ -8,12 +8,15 @@ CONFIG_PPC_PMAC64=y
 CONFIG_PPC_MAPLE=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_IBM_CELL_BLADE is not set
-# CONFIG_PPC_ISERIES is not set
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_PMAC=y
 CONFIG_PPC_POWERNV=y
-CONFIG_POWERNV_MSI=y
 CONFIG_PPC_POWERNV_RTAS=y
+CONFIG_SENSORS_IBMPOWERNV=y
+CONFIG_HW_RANDOM_POWERNV=m
+CONFIG_POWERNV_CPUFREQ=m
+CONFIG_IPMI_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
@@ -31,7 +34,6 @@ CONFIG_HVCS=m
 CONFIG_HVC_CONSOLE=y
 # CONFIG_HVC_OLD_HVSI is not set
 CONFIG_HOTPLUG_PCI=y
-CONFIG_THERM_PM72=y
 CONFIG_IBMVETH=m
 CONFIG_SCSI_IBMVSCSI=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
@@ -47,15 +49,10 @@ CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 CONFIG_SCSI_IPR_DUMP=y
 CONFIG_HVC_RTAS=y
-# CONFIG_HVC_ISERIES is not set
 CONFIG_HVC_OPAL=y
 
 # iSeries device drivers
 #
-# CONFIG_ISERIES_VETH is not set
-CONFIG_VIODASD=m
-CONFIG_VIOCD=m
-CONFIG_VIOTAPE=m
 
 CONFIG_PASEMI_MAC=m
 CONFIG_SERIAL_OF_PLATFORM=m
@@ -82,11 +79,11 @@ CONFIG_NR_CPUS=1024
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_ATY is not set
 
-# CONFIG_POWER4_ONLY is not set
 
 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
@@ -97,6 +94,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
@@ -109,17 +110,14 @@ CONFIG_INFINIBAND_EHCA=m
 
 CONFIG_XMON_DISASSEMBLY=y
 
-CONFIG_SCSI_IBMVSCSIS=m
 
 # CONFIG_TUNE_CELL is not set
 # CONFIG_BLK_DEV_PLATFORM is not set
 
-# CONFIG_VIRQ_DEBUG is not set
 
 CONFIG_EDAC_CPC925=m
 CONFIG_FRAME_WARN=2048
 
-CONFIG_PHYP_DUMP=y
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_VIRTUALIZATION=y
 
@@ -130,12 +128,17 @@ CONFIG_SCSI_IBMVFC=m
 CONFIG_IBM_BSR=m
 
 CONFIG_CRASH_DUMP=y
+CONFIG_FA_DUMP=y
 CONFIG_RELOCATABLE=y
 
 CONFIG_RCU_FANOUT=64
 
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_AREAS=7
 CONFIG_KVM_BOOK3S_64=m
-CONFIG_KVM_BOOK3S_64_HV=y
+CONFIG_KVM_BOOK3S_64_HV=m
+CONFIG_KVM_BOOK3S_64_PR=m
 # CONFIG_KVM_EXIT_TIMING is not set
 CONFIG_KVM_XICS=y
 
@@ -143,6 +146,7 @@ CONFIG_KVM_XICS=y
 #-- active memory sharing
 CONFIG_PPC_SMLPAR=y
 CONFIG_CMM=y
+CONFIG_HV_PERF_CTRS=y
 #-- DLPAR memory remove
 CONFIG_SPARSEMEM_VMEMMAP=y
 
@@ -152,7 +156,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
@@ -160,17 +165,22 @@ CONFIG_HW_RANDOM_AMD=m
 
 CONFIG_UIO_PDRV=m
 
+CONFIG_I2C_OPAL=m
+CONFIG_RTC_DRV_OPAL=m
+
 CONFIG_HW_RANDOM_PSERIES=m
 CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 
+CONFIG_CXL=m
 
-CONFIG_BPF_JIT=y
 # CONFIG_PPC_ICSWX_PID is not set
 # CONFIG_PPC_ICSWX_USE_SIGILL 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_PPC_TRANSACTIONAL_MEM=y
+
+# CONFIG_CARL9170 is not set

config-powerpc64le

@@ -0,0 +1 @@
+CONFIG_CPU_LITTLE_ENDIAN=y

config-powerpc64p7

@@ -3,13 +3,15 @@ CONFIG_POWER7_CPU=y
 # CONFIG_PPC_MAPLE is not set
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_IBM_CELL_BLADE is not set
-# CONFIG_PPC_ISERIES is not set
-# CONFIG_POWER3 is not set
 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_SENSORS_IBMPOWERNV=y
+CONFIG_POWERNV_CPUFREQ=m
+CONFIG_IPMI_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
@@ -26,7 +28,6 @@ CONFIG_HVCS=m
 CONFIG_HVC_CONSOLE=y
 # CONFIG_HVC_OLD_HVSI is not set
 CONFIG_HOTPLUG_PCI=y
-CONFIG_THERM_PM72=y
 CONFIG_IBMVETH=m
 CONFIG_SCSI_IBMVSCSI=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
@@ -39,15 +40,10 @@ CONFIG_SCSI_IPR=m
 CONFIG_SCSI_IPR_TRACE=y
 CONFIG_SCSI_IPR_DUMP=y
 CONFIG_HVC_RTAS=y
-# CONFIG_HVC_ISERIES is not set
 CONFIG_HVC_OPAL=y
 
 # iSeries device drivers
 #
-# CONFIG_ISERIES_VETH is not set
-CONFIG_VIODASD=m
-CONFIG_VIOCD=m
-CONFIG_VIOTAPE=m
 
 CONFIG_SERIAL_OF_PLATFORM=m
 
@@ -73,11 +69,11 @@ CONFIG_NR_CPUS=1024
 # CONFIG_FB_ATY128 is not set
 # CONFIG_FB_ATY is not set
 
-# CONFIG_POWER4_ONLY is not set
 
 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
@@ -88,6 +84,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
@@ -100,17 +100,14 @@ CONFIG_INFINIBAND_EHCA=m
 
 CONFIG_XMON_DISASSEMBLY=y
 
-CONFIG_SCSI_IBMVSCSIS=m
 
 # CONFIG_TUNE_CELL is not set
 # CONFIG_BLK_DEV_PLATFORM is not set
 
-# CONFIG_VIRQ_DEBUG is not set
 
 CONFIG_EDAC_CPC925=m
 CONFIG_FRAME_WARN=2048
 
-CONFIG_PHYP_DUMP=y
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_VIRTUALIZATION=y
 
@@ -121,12 +118,17 @@ CONFIG_SCSI_IBMVFC=m
 CONFIG_IBM_BSR=m
 
 CONFIG_CRASH_DUMP=y
+CONFIG_FA_DUMP=y
 CONFIG_RELOCATABLE=y
 
 CONFIG_RCU_FANOUT=64
 
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_AREAS=7
 CONFIG_KVM_BOOK3S_64=m
-CONFIG_KVM_BOOK3S_64_HV=y
+CONFIG_KVM_BOOK3S_64_HV=m
+CONFIG_KVM_BOOK3S_64_PR=m
 # CONFIG_KVM_EXIT_TIMING is not set
 CONFIG_KVM_XICS=y
 
@@ -134,6 +136,7 @@ CONFIG_KVM_XICS=y
 #-- active memory sharing
 CONFIG_PPC_SMLPAR=y
 CONFIG_CMM=y
+CONFIG_HV_PERF_CTRS=y
 #-- DLPAR memory remove
 CONFIG_SPARSEMEM_VMEMMAP=y
 
@@ -143,7 +146,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
@@ -151,16 +155,20 @@ CONFIG_HW_RANDOM_AMD=m
 
 CONFIG_UIO_PDRV=m
 
+CONFIG_I2C_OPAL=m
+CONFIG_RTC_DRV_OPAL=m
+
 CONFIG_HW_RANDOM_PSERIES=m
 CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 
+CONFIG_CXL=m
 
-CONFIG_BPF_JIT=y
 # CONFIG_PPC_ICSWX_PID is not set
 # CONFIG_PPC_ICSWX_USE_SIGILL is not set
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_SND_HDA_INTEL is not set
 CONFIG_BLK_DEV_RSXX=m
+CONFIG_PPC_TRANSACTIONAL_MEM=y

config-s390x

@@ -14,7 +14,6 @@ CONFIG_HZ_100=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 
 CONFIG_LOG_BUF_SHIFT=16
-CONFIG_NO_IDLE_HZ=y
 
 #
 # I/O subsystem configuration
@@ -25,13 +24,9 @@ CONFIG_QDIO=m
 # Misc
 #
 CONFIG_IPL=y
-# CONFIG_IPL_TAPE is not set
-CONFIG_IPL_VM=y
-# CONFIG_PROCESS_DEBUG is not set
 CONFIG_PFAULT=y
 CONFIG_SHARED_KERNEL=y
 CONFIG_CMM=m
-CONFIG_CMM_PROC=y
 # CONFIG_NETIUCV is not set
 CONFIG_SMSGIUCV=m
 CONFIG_CRASH_DUMP=y
@@ -40,7 +35,6 @@ CONFIG_CRASH_DUMP=y
 # SCSI low-level drivers
 #
 CONFIG_ZFCP=m
-CONFIG_ZFCPDUMP=y
 CONFIG_CCW=y
 
 #
@@ -69,6 +63,7 @@ CONFIG_SCLP_VT220_TTY=y
 CONFIG_SCLP_VT220_CONSOLE=y
 CONFIG_SCLP_CPI=m
 CONFIG_SCLP_ASYNC=m
+CONFIG_SCLP_ASYNC_ID="000000000"
 CONFIG_S390_TAPE=m
 CONFIG_S390_TAPE_3590=m
 
@@ -83,14 +78,12 @@ CONFIG_TN3270_FS=m
 #
 # S/390 tape interface support
 #
-CONFIG_S390_TAPE_BLOCK=y
 
 #
 # S/390 tape hardware support
 #
 CONFIG_S390_TAPE_34XX=m
 
-# CONFIG_PPP is not set
 # CONFIG_SLIP is not set
 
 #
@@ -149,10 +142,8 @@ CONFIG_CRYPTO_AES_S390=m
 #
 CONFIG_PACK_STACK=y
 CONFIG_CHECK_STACK=y
-# CONFIG_WARN_STACK is not set
-# CONFIG_SMALL_STACK is not set
 
-CONFIG_ZVM_WATCHDOG=m
+CONFIG_DIAG288_WATCHDOG=m
 CONFIG_VMLOGRDR=m
 CONFIG_MONREADER=m
 
@@ -160,8 +151,6 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
 
 # CONFIG_CLAW is not set
 
-# CONFIG_ATMEL is not set
-
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MII is not set
@@ -170,15 +159,12 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_STACK_GUARD=256
 CONFIG_CMM_IUCV=y
 
-# CONFIG_DETECT_SOFTLOCKUP is not set
 
 CONFIG_S390_HYPFS_FS=y
 
 CONFIG_MONWRITER=m
 CONFIG_ZCRYPT=m
-CONFIG_ZCRYPT_MONOLITHIC=y
 
-CONFIG_S390_EXEC_PROTECT=y
 CONFIG_AFIUCV=m
 CONFIG_S390_PRNG=m
 
@@ -194,6 +180,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
@@ -216,16 +203,15 @@ CONFIG_SMSGIUCV_EVENT=m
 
 CONFIG_VMCP=y
 
-CONFIG_ZFCP_DIF=y
 
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_BOOK=y
+CONFIG_SCHED_TOPOLOGY=y
 
 # CONFIG_WARN_DYNAMIC_STACK is not set
 
 CONFIG_CRYPTO_GHASH_S390=m
 
-CONFIG_BPF_JIT=y
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 CONFIG_SCM_BUS=y
 CONFIG_EADM_SCH=m
@@ -233,12 +219,31 @@ CONFIG_SCM_BLOCK=m
 CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 # CONFIG_S390_PTDUMP is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
-# CONFIG_PCI is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_MCP23S08 is not set
+
+CONFIG_PCI=y
+CONFIG_PCI_NR_FUNCTIONS=64
+CONFIG_PCI_NR_MSI=256
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_SHPC=y
+CONFIG_HOTPLUG_PCI_S390=y
 
 # CONFIG_NEW_LEDS is not set
 # CONFIG_HID is not set
+# CONFIG_MTD is not set
+
+# CONFIG_SERIAL_8250 is not set
+# CONFIG_PARPORT is not set
+# CONFIG_UWB is not set
+# CONFIG_MMC is not set
+# CONFIG_FB is not set
+# CONFIG_MFD_CORE is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_CB710_CORE is not set
+# CONFIG_FCOE is not set
+# CONFIG_FUSION is not set
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
 
 # CONFIG_INPUT is not set
 # CONFIG_INPUT_JOYDEV is not set
@@ -248,6 +253,9 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
+# CONFIG_GAMEPORT_EMU10K1 is not set
+# CONFIG_GAMEPORT_FM801 is not set
+# CONFIG_SERIO is not set
 
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_AUXDISPLAY is not set
@@ -266,6 +274,19 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 # 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_W1 is not set
+# CONFIG_HWMON is not set
+# CONFIG_SSB is not set
+# CONFIG_BCMA is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_LCD_CLASS_DEVICE is not set
+# CONFIG_LCD_PLATFORM is not set
+# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
+# CONFIG_MFD_RTSX_PCI is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_VX855 is not set
 
 # CONFIG_PHYLIB is not set
 # CONFIG_ATM_DRIVERS is not set
@@ -278,3 +299,16 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 # CONFIG_IEEE802154_DRIVERS is not set
 
 # CONFIG_FMC is not set
+
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_EN_VXLAN=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+CONFIG_IRQ_DOMAIN_DEBUG=y
+
+CONFIG_CRASH=m

config-x86-32-generic

@@ -2,15 +2,9 @@
 
 # CONFIG_X86_32_NON_STANDARD is not set
 
-# CONFIG_X86_ELAN is not set
 # CONFIG_X86_GOLDFISH is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_SUMMIT is not set
 CONFIG_X86_BIGSMP=y
-# CONFIG_X86_VISWS is not set
 # CONFIG_X86_RDC321X is not set
-# CONFIG_X86_ES7000 is not set
-# CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
@@ -73,8 +67,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
@@ -90,7 +82,6 @@ CONFIG_X86_LONGRUN=y
 # CONFIG_X86_E_POWERSAVER is not set
 
 CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
 
 
 # CONFIG_4KSTACKS is not set
@@ -114,12 +105,8 @@ CONFIG_SCx200_ACB=m
 
 CONFIG_PC8736x_GPIO=m
 # CONFIG_NSC_GPIO is not set
-CONFIG_CS5535_GPIO=m
 CONFIG_GPIO_SCH=m
 
-CONFIG_SND_ISA=y
-CONFIG_SND_ES18XX=m
-
 CONFIG_HW_RANDOM_GEODE=m
 
 CONFIG_TC1100_WMI=m
@@ -147,7 +134,6 @@ CONFIG_LBDAF=y
 
 
 CONFIG_OLPC=y
-CONFIG_OLPC_OPENFIRMWARE=y
 CONFIG_BATTERY_OLPC=y
 CONFIG_MOUSE_PS2_OLPC=y
 CONFIG_OLPC_XO1_PM=y
@@ -164,10 +150,8 @@ CONFIG_RCU_FANOUT=32
 
 # CONFIG_X86_ANCIENT_MCE is not set
 
-# CONFIG_X86_MRST is not set
 
 CONFIG_I2C_PXA=m
-# CONFIG_GPIO_LANGWELL is not set
 
 # CONFIG_INTEL_TXT is not set
 
@@ -183,17 +167,18 @@ CONFIG_XO1_RFKILL=m
 CONFIG_X86_32_IRIS=m
 
 CONFIG_POWER_RESET_GPIO=y
+# CONFIG_POWER_RESET_GPIO_RESTART is not set
 
 
 
 CONFIG_MTD_OF_PARTS=y
 CONFIG_MTD_PHYSMAP_OF=m
-CONFIG_PROC_DEVICETREE=y
 CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 # CONFIG_MMC_SDHCI_OF is not set
 
 # CONFIG_X86_INTEL_MID is not set
+# CONFIG_X86_INTEL_QUARK is not set
 
 CONFIG_MFD_CS5535=m
 # CONFIG_MFD_SYSCON is not set
@@ -213,8 +198,8 @@ CONFIG_BACKLIGHT_PWM=m
 
 # CONFIG_EDAC_SBRIDGE is not set
 
-# CONFIG_X86_WANT_INTEL_MID is not set
-# CONFIG_OF_SELFTEST is not set
+# CONFIG_OF_UNITTEST is not set
+# CONFIG_OF_OVERLAY is not set
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_INPUT_GP2A is not set
 # CONFIG_INPUT_GPIO_TILT_POLLED is not set
@@ -223,10 +208,14 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_GPIO_SODAVILLE is not set
-# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_74XX_MMIO is not set
 # CONFIG_BACKLIGHT_OT200 is not set
-# CONFIG_RTC_DRV_SNVS 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_BCM281XX is not set
+# CONFIG_PINCTRL_APQ8064 is not set
+# CONFIG_PINCTRL_IPQ8064 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_QCOM is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set

config-x86-generic

@@ -10,10 +10,12 @@ CONFIG_HPET_TIMER=y
 
 CONFIG_I8K=m
 CONFIG_SONYPI_COMPAT=y
-CONFIG_MICROCODE=m
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_EARLY=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_INTEL_EARLY=y
 CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_AMD_EARLY=y
 
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
@@ -32,6 +34,10 @@ CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
 CONFIG_X86_PAT=y
 CONFIG_X86_PM_TIMER=y
 
+# This requires changes to binutils and the compiler.  Plus you can't actually
+# buy hardware with MPX yet.  So... leave it off until all of that seems set.
+# CONFIG_X86_INTEL_MPX is not set
+
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_VARS=y
@@ -40,12 +46,15 @@ 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
 
 CONFIG_INTEL_IOMMU=y
-CONFIG_DMAR_BROKEN_GFX_WA=y
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_SCSI_ADVANSYS=m
@@ -64,7 +73,6 @@ CONFIG_DEBUG_STACKOVERFLOW=y
 
 CONFIG_ACPI=y
 CONFIG_ACPI_AC=y
-# CONFIG_ACPI_ASUS is not set
 CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_CONTAINER=y
@@ -81,7 +89,6 @@ CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
 # FIXME: Next two are deprecated. Remove them when they disappear upstream
 # CONFIG_ACPI_PROCFS_POWER is not set
-# CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_PNPACPI=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_HED=m
@@ -93,6 +100,9 @@ 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_PMIC_OPREGION is not set
 
 CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_ACPI_CPUFREQ=m
@@ -110,12 +120,15 @@ 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_CRYPTO_DEV_QAT_DH895xCC=m
 
 CONFIG_GENERIC_ISA_DMA=y
 
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_BIOS=y
-CONFIG_PCI_IOAPIC=y
 
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m
@@ -133,6 +146,9 @@ CONFIG_IPW2200_QOS=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 
+# I2C_ACPI casues I2C to be built in.  This should probably be fixed.
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
@@ -145,6 +161,8 @@ 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
 
 #rhbz 997149
 # CONFIG_DELL_RBU is not set
@@ -152,6 +170,8 @@ CONFIG_DCDBAS=m
 
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=m
+# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
+CONFIG_EDAC_AMD64=m
 CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_AMD8111=m
 CONFIG_EDAC_AMD8131=m
@@ -172,13 +192,12 @@ CONFIG_EDAC_X38=m
 CONFIG_EDAC_MCE_INJ=m
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_LEGACY_SYSFS=y
+CONFIG_EDAC_IE31200=m
 
 CONFIG_SCHED_MC=y
 
-CONFIG_SND_ISA=y
-CONFIG_SND_ES18XX=m
-
 CONFIG_TCG_INFINEON=m
+CONFIG_TCG_CRB=m
 
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
@@ -192,7 +211,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
@@ -207,12 +228,15 @@ CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_WMI=m
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
+CONFIG_ALIENWARE_WMI=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
 CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_SMO8800=m
 CONFIG_EEEPC_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
 CONFIG_SAMSUNG_Q10=m
@@ -223,9 +247,9 @@ CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_PVPANIC=m
 
 # CONFIG_TOUCHSCREEN_INTEL_MID is not set
+CONFIG_TOUCHSCREEN_GOODIX=m
 
 # CONFIG_SMSC37B787_WDT is not set
-CONFIG_W83697HF_WDT=m
 CONFIG_VIA_WDT=m
 CONFIG_IE6XX_WDT=m
 
@@ -249,9 +273,9 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 # PARAVIRT_SPINLOCKS has a 5% perf hit on native hw (see kconfig)
 # CONFIG_PARAVIRT_SPINLOCKS is not set
 
-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
@@ -272,12 +296,13 @@ CONFIG_XEN_COMPAT_XENFS=y
 CONFIG_XEN_BACKEND=y
 CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_XEN_DEBUG_FS=y
-CONFIG_XEN_PLATFORM_PCI=y
 CONFIG_XEN_GNTDEV=m
 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
 CONFIG_XEN_SELFBALLOONING=y
 CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_XEN_ACPI_PROCESSOR=m
+# CONFIG_XEN_SCSI_FRONTEND is not set
+# CONFIG_XEN_SCSI_BACKEND is not set
 
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
@@ -309,6 +334,7 @@ CONFIG_INTEL_IOATDMA=m
 CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_FAM15H_POWER=m
 CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_I5500=m
 
 # CONFIG_CPA_DEBUG is not set
 
@@ -320,7 +346,7 @@ CONFIG_SP5100_TCO=m
 
 # CONFIG_MEMTEST is not set
 # CONFIG_DEBUG_TLBFLUSH is not set
-CONFIG_MAXSMP=y
+# CONFIG_MAXSMP is not set
 
 
 CONFIG_HP_ILO=m
@@ -353,6 +379,7 @@ CONFIG_X86_DECODER_SELFTEST=y
 CONFIG_ACPI_CMPC=m
 CONFIG_MSI_WMI=m
 CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
 
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_LPC_SCH=m
@@ -360,12 +387,39 @@ CONFIG_LPC_ICH=m
 
 CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_LYNXPOINT is not set
+# CONFIG_GPIO_F7188X is not set
+
+# These should all go away with IC2_ACPI is fixed
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_AXP20X is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
 
 CONFIG_PCI_CNB20LE_QUIRK=y
 
 CONFIG_ACPI_EC_DEBUGFS=m
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
-# CONFIG_ACPI_QUICKSTART is not set
 
 CONFIG_INTEL_IDLE=y
 
@@ -374,6 +428,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
@@ -396,12 +451,11 @@ 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_RANDOMIZE_BASE is not set # revisit this
 
 CONFIG_HYPERV=m
 CONFIG_HYPERV_UTILS=m
@@ -410,6 +464,7 @@ 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
@@ -422,6 +477,7 @@ CONFIG_RCU_FANOUT_LEAF=16
 
 CONFIG_INTEL_MEI=m
 CONFIG_INTEL_MEI_ME=m
+CONFIG_INTEL_MEI_TXE=m
 
 CONFIG_NFC_MEI_PHY=m
 CONFIG_NFC_PN544_MEI=m
@@ -430,10 +486,42 @@ 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_GOLDFISH is not set
+
+CONFIG_X86_INTEL_LPSS=y
+
+# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
+
+CONFIG_IOSF_MBI=m
+# CONFIG_IOSF_MBI_DEBUG is not set
+CONFIG_PWM_LPSS=m
+CONFIG_PWM_LPSS_PCI=m
+CONFIG_PWM_LPSS_PLATFORM=m
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=m
+
+#baytrail/cherrytrail stuff
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_SST_ACPI=m
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BAYTRAIL=m
+CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
+
+
 
 # CONFIG_INTEL_POWERCLAMP is not set
 CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_THERMAL=m
+CONFIG_INT340X_THERMAL=m
+CONFIG_INTEL_RAPL=m
 
 CONFIG_VMWARE_VMCI=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
@@ -442,15 +530,24 @@ CONFIG_XZ_DEC_X86=y
 
 CONFIG_MPILIB=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
-CONFIG_PE_FILE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+CONFIG_SIGNED_PE_FILE_VERIFICATION=y
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_MODULE_SIG=y
 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_KEXEC_FILE is not set
+# CONFIG_KEXEC_VERIFY_SIG is not set
 
 CONFIG_MODULE_SIG_UEFI=y
 
 CONFIG_VMXNET3=m
 CONFIG_VFIO_PCI_VGA=y
+
+# CONFIG_NTB is not set

config-x86_64-generic

@@ -6,9 +6,9 @@ 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
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
@@ -16,8 +16,16 @@ 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
+
+# enable the 32-bit entry point for Baytrail
+CONFIG_EFI_MIXED=y
 
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
@@ -28,20 +36,31 @@ 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_KEXEC_FILE=y
+CONFIG_KEXEC_VERIFY_SIG=y
+CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
 
-CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_HOTPLUG_MEMORY=y
 
 # CONFIG_INTEL_SCU_IPC is not set
 
+CONFIG_INTEL_MIC_HOST=m
+CONFIG_INTEL_MIC_CARD=m
+CONFIG_INTEL_MIC_BUS=m
+CONFIG_INTEL_MIC_X100_DMA=m
+
 # SHPC has half-arsed PCI probing, which makes it load on too many systems
 CONFIG_HOTPLUG_PCI_SHPC=m
 
+# CONFIG_CRYPTO_SHA1_MB is not set
 CONFIG_CRYPTO_AES_X86_64=y
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
@@ -51,7 +70,6 @@ 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
@@ -62,7 +80,9 @@ 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_TWOFISH_AVX2_X86_64=m
+CONFIG_CRYPTO_DES3_EDE_X86_64=m
+# staging crypto
+# CONFIG_CRYPTO_SKEIN is not set
 
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
@@ -83,7 +103,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
@@ -106,6 +127,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
 
@@ -128,40 +150,40 @@ CONFIG_RCU_FANOUT=64
 
 CONFIG_INTEL_TXT=y
 
-CONFIG_GPIO_LANGWELL=y
 
 CONFIG_FUNCTION_GRAPH_TRACER=y
 
 CONFIG_I7300_IDLE=m
 
-CONFIG_BPF_JIT=y
-
 # https://fedoraproject.org/wiki/Features/Checkpoint_Restore
 CONFIG_CHECKPOINT_RESTORE=y
 
 # Should be 32bit only, but lacks KConfig depends
 # CONFIG_XO15_EBOOK is not set
 
+CONFIG_THUNDERBOLT=m
+
 CONFIG_NTB=m
 CONFIG_NTB_NETDEV=m
 
-CONFIG_SFC=m
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFC_PTP=y
-
 # 10GigE
 #
 CONFIG_IP1000=m
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_EN_VXLAN=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
 
+CONFIG_HSA_AMD=m
+
+CONFIG_NO_HZ_FULL=y
+# CONFIG_NO_HZ_IDLE is not set
+# CONFIG_NO_HZ_FULL_ALL is not set
+# CONFIG_NO_HZ_FULL_SYSIDLE is not set
+# CONFIG_CONTEXT_TRACKING_FORCE is not set

crash-driver.patch

@@ -1,32 +1,67 @@
-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: Dave Anderson <anderson@redhat.com>
+Date: Tue, 26 Nov 2013 12:42:46 -0500
+Subject: [PATCH] crash-driver
 
+Bugzilla: N/A
+Upstream-status: Fedora mustard
 ---
- arch/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(-)
- create mode 100644 arch/ia64/include/asm/crash.h
- create mode 100644 arch/x86/include/asm/crash.h
+ arch/arm/include/asm/crash-driver.h     |   6 ++
+ arch/arm64/include/asm/crash-driver.h   |   6 ++
+ arch/ia64/include/asm/crash-driver.h    |  90 ++++++++++++++++++++++
+ arch/ia64/kernel/ia64_ksyms.c           |   3 +
+ arch/powerpc/include/asm/crash-driver.h |   6 ++
+ arch/s390/include/asm/crash-driver.h    |  60 +++++++++++++++
+ arch/s390/mm/maccess.c                  |   2 +
+ arch/x86/include/asm/crash-driver.h     |   6 ++
+ drivers/char/Kconfig                    |   3 +
+ drivers/char/Makefile                   |   2 +
+ drivers/char/crash.c                    | 128 ++++++++++++++++++++++++++++++++
+ include/asm-generic/crash-driver.h      |  72 ++++++++++++++++++
+ 12 files changed, 384 insertions(+)
+ create mode 100644 arch/arm/include/asm/crash-driver.h
+ create mode 100644 arch/arm64/include/asm/crash-driver.h
+ create mode 100644 arch/ia64/include/asm/crash-driver.h
+ create mode 100644 arch/powerpc/include/asm/crash-driver.h
+ create mode 100644 arch/s390/include/asm/crash-driver.h
+ create mode 100644 arch/x86/include/asm/crash-driver.h
  create mode 100644 drivers/char/crash.c
+ create mode 100644 include/asm-generic/crash-driver.h
 
-diff --git a/arch/ia64/include/asm/crash.h b/arch/ia64/include/asm/crash.h
+diff --git a/arch/arm/include/asm/crash-driver.h b/arch/arm/include/asm/crash-driver.h
 new file mode 100644
-index 0000000..541af84
+index 000000000000..06e7ae916601
 --- /dev/null
-+++ b/arch/ia64/include/asm/crash.h
++++ b/arch/arm/include/asm/crash-driver.h
+@@ -0,0 +1,6 @@
++#ifndef _ARM_CRASH_H
++#define _ARM_CRASH_H
++
++#include <asm-generic/crash-driver.h>
++
++#endif /* _ARM_CRASH_H */
+diff --git a/arch/arm64/include/asm/crash-driver.h b/arch/arm64/include/asm/crash-driver.h
+new file mode 100644
+index 000000000000..43b26da0c5d6
+--- /dev/null
++++ b/arch/arm64/include/asm/crash-driver.h
+@@ -0,0 +1,6 @@
++#ifndef _ARM64_CRASH_H
++#define _ARM64_CRASH_H
++
++#include <asm-generic/crash-driver.h>
++
++#endif /* _ARM64_CRASH_H */
+diff --git a/arch/ia64/include/asm/crash-driver.h b/arch/ia64/include/asm/crash-driver.h
+new file mode 100644
+index 000000000000..404bcb93c112
+--- /dev/null
++++ b/arch/ia64/include/asm/crash-driver.h
 @@ -0,0 +1,90 @@
 +#ifndef _ASM_IA64_CRASH_H
 +#define _ASM_IA64_CRASH_H
 +
 +/*
-+ * linux/include/asm-ia64/crash.h
++ * linux/include/asm-ia64/crash-driver.h
 + *
 + * Copyright (c) 2004 Red Hat, Inc. All rights reserved.
 + *
@@ -68,7 +103,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 +114,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 +131,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 +139,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 +148,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 5b7791dd3965..aee4b870c763 100644
 --- a/arch/ia64/kernel/ia64_ksyms.c
 +++ b/arch/ia64/kernel/ia64_ksyms.c
 @@ -84,6 +84,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
@@ -126,50 +161,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-driver.h b/arch/powerpc/include/asm/crash-driver.h
 new file mode 100644
-index 0000000..dfcc006
+index 000000000000..50092d965dc5
 --- /dev/null
-+++ b/arch/x86/include/asm/crash.h
-@@ -0,0 +1,73 @@
-+#ifndef _ASM_I386_CRASH_H
-+#define _ASM_I386_CRASH_H
++++ b/arch/powerpc/include/asm/crash-driver.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-driver.h>
++
++#endif /* _PPC64_CRASH_H */
+diff --git a/arch/s390/include/asm/crash-driver.h b/arch/s390/include/asm/crash-driver.h
+new file mode 100644
+index 000000000000..552be5e2c571
+--- /dev/null
++++ b/arch/s390/include/asm/crash-driver.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>
 +
-+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
@@ -183,30 +215,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 */
++#endif /* _S390_CRASH_H */
+diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
+index 2a2e35416d2f..a529181429bb 100644
+--- a/arch/s390/mm/maccess.c
++++ b/arch/s390/mm/maccess.c
+@@ -193,6 +193,7 @@ void *xlate_dev_mem_ptr(unsigned long addr)
+ 	put_online_cpus();
+ 	return bounce;
+ }
++EXPORT_SYMBOL_GPL(xlate_dev_mem_ptr);
+ 
+ /*
+  * Free converted buffer for /dev/mem access (if necessary)
+@@ -202,3 +203,4 @@ void unxlate_dev_mem_ptr(unsigned long addr, void *buf)
+ 	if ((void *) addr != buf)
+ 		free_page((unsigned long) buf);
+ }
++EXPORT_SYMBOL_GPL(unxlate_dev_mem_ptr);
+diff --git a/arch/x86/include/asm/crash-driver.h b/arch/x86/include/asm/crash-driver.h
+new file mode 100644
+index 000000000000..fd4736ec99f5
+--- /dev/null
++++ b/arch/x86/include/asm/crash-driver.h
+@@ -0,0 +1,6 @@
++#ifndef _X86_CRASH_H
++#define _X86_CRASH_H
++
++#include <asm-generic/crash-driver.h>
++
++#endif /* _X86_CRASH_H */
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 423fd56..e04a561 100644
+index efefd12a0f7b..6a318132b7ee 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
 @@ -4,6 +4,9 @@
@@ -220,18 +283,18 @@ index 423fd56..e04a561 100644
  
  config DEVKMEM
 diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index 32762ba..3d5d525 100644
+index d06cde26031b..0832636fd9bc 100644
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
-@@ -65,3 +65,5 @@ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
- js-rtc-y = rtc.o
+@@ -62,3 +62,5 @@ js-rtc-y = rtc.o
  
  obj-$(CONFIG_TILE_SROM)		+= tile-srom.o
+ obj-$(CONFIG_XILLYBUS)		+= xillybus/
 +
 +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 000000000000..085378a1d539
 --- /dev/null
 +++ b/drivers/char/crash.c
 @@ -0,0 +1,128 @@
@@ -267,7 +330,7 @@ index 0000000..e5437de
 +#include <asm/io.h>
 +#include <asm/uaccess.h>
 +#include <asm/types.h>
-+#include <asm/crash.h>
++#include <asm/crash-driver.h>
 +
 +#define CRASH_VERSION   "1.0"
 +
@@ -276,7 +339,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) {
@@ -292,7 +355,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.
 + */
@@ -305,7 +368,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);
@@ -342,11 +405,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:
@@ -363,6 +426,84 @@ index 0000000..e5437de
 +module_exit(crash_cleanup_module);
 +
 +MODULE_LICENSE("GPL");
+diff --git a/include/asm-generic/crash-driver.h b/include/asm-generic/crash-driver.h
+new file mode 100644
+index 000000000000..25ab9869d566
+--- /dev/null
++++ b/include/asm-generic/crash-driver.h
+@@ -0,0 +1,72 @@
++#ifndef __CRASH_H__
++#define __CRASH_H__
++
++/*
++ * include/linux/crash-driver.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
+2.1.0
 

cve-2013-2147-ciss-info-leak.patch

@@ -1,27 +0,0 @@
-diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
-index 639d26b..2b94403 100644
---- a/drivers/block/cpqarray.c
-+++ b/drivers/block/cpqarray.c
-@@ -1193,6 +1193,7 @@ out_passthru:
- 		ida_pci_info_struct pciinfo;
- 
- 		if (!arg) return -EINVAL;
-+		memset(&pciinfo, 0, sizeof(pciinfo));
- 		pciinfo.bus = host->pci_dev->bus->number;
- 		pciinfo.dev_fn = host->pci_dev->devfn;
- 		pciinfo.board_id = host->board_id;
-
-  diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
-index 6374dc1..34971aa 100644
---- a/drivers/block/cciss.c
-+++ b/drivers/block/cciss.c
-@@ -1201,6 +1201,7 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
- 	int err;
- 	u32 cp;
- 
-+	memset(&arg64, 0, sizeof(arg64));
- 	err = 0;
- 	err |=
- 	    copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
-
-  

debug-bad-pte-dmi.patch

@@ -1,71 +0,0 @@
-Occasionally we see reports of page table corruption, and it's not clear why.
-By printing out the hardware name, we could potentially see some patterns.
-
-Signed-off-by: Dave Jones <davej@redhat.com>
-
---- linux.orig/include/asm-generic/bug.h
-+++ linux/include/asm-generic/bug.h
-@@ -55,6 +55,8 @@ struct bug_entry {
- #define BUG_ON(condition) do { if (unlikely(condition)) BUG(); } while(0)
- #endif
- 
-+void print_hardware_dmi_name(void);
-+
- /*
-  * WARN(), WARN_ON(), WARN_ON_ONCE, and so on can be used to report
-  * significant issues that need prompt attention if they should ever
---- linux.orig/kernel/panic.c
-+++ linux/kernel/panic.c
-@@ -391,6 +391,15 @@ void oops_exit(void)
- 	kmsg_dump(KMSG_DUMP_OOPS);
- }
- 
-+void print_hardware_dmi_name(void)
-+{
-+	const char *board;
-+
-+	board = dmi_get_system_info(DMI_PRODUCT_NAME);
-+	if (board)
-+		printk(KERN_WARNING "Hardware name: %s\n", board);
-+}
-+
- #ifdef WANT_WARN_ON_SLOWPATH
- struct slowpath_args {
- 	const char *fmt;
-@@ -400,13 +409,10 @@ struct slowpath_args {
- static void warn_slowpath_common(const char *file, int line, void *caller,
- 				 unsigned taint, struct slowpath_args *args)
- {
--	const char *board;
--
- 	printk(KERN_WARNING "------------[ cut here ]------------\n");
- 	printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
--	board = dmi_get_system_info(DMI_PRODUCT_NAME);
--	if (board)
--		printk(KERN_WARNING "Hardware name: %s\n", board);
-+
-+	print_hardware_dmi_name();
- 
- 	if (args)
- 		vprintk(args->fmt, args->args);
---- linux.orig/mm/memory.c
-+++ linux/mm/memory.c
-@@ -706,6 +706,8 @@ static void print_bad_pte(struct vm_area
- 		"BUG: Bad page map in process %s  pte:%08llx pmd:%08llx\n",
- 		current->comm,
- 		(long long)pte_val(pte), (long long)pmd_val(*pmd));
-+	print_hardware_dmi_name();
-+
- 	if (page)
- 		dump_page(page);
- 	printk(KERN_ALERT
---- linux.orig/mm/page_alloc.c
-+++ linux/mm/page_alloc.c
-@@ -321,6 +321,7 @@ static void bad_page(struct page *page)
- 		current->comm, page_to_pfn(page));
- 	dump_page(page);
- 
-+	print_hardware_dmi_name();
- 	print_modules();
- 	dump_stack();
- out:

debug-bad-pte-modules.patch

@@ -1,34 +0,0 @@
-From 3cd4fefa1d614debf75f059def34ac1aaaf96501 Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@redhat.com>
-Date: Tue, 30 Apr 2013 14:01:57 -0400
-Subject: [PATCH] When we encounter a bad PTE, print out what modules were
- loaded, so we can see if there is a common driver potentially at fault.
-
-Signed-off-by: Dave Jones <davej@redhat.com>
----
- mm/memory.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/mm/memory.c b/mm/memory.c
-index 6dc1882..99564df 100644
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -57,6 +57,7 @@
- #include <linux/swapops.h>
- #include <linux/elf.h>
- #include <linux/gfp.h>
-+#include <linux/module.h>
- #include <linux/migrate.h>
- #include <linux/string.h>
- 
-@@ -720,6 +721,7 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
- 	if (vma->vm_file && vma->vm_file->f_op)
- 		printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
- 		       vma->vm_file->f_op->mmap);
-+	print_modules();
- 	dump_stack();
- 	add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
- }
--- 
-1.8.1.4
-

defaults-acpi-video.patch

@@ -1,13 +0,0 @@
-diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index eaef02a..2029819 100644
---- a/drivers/acpi/video.c
-+++ b/drivers/acpi/video.c
-@@ -69,7 +69,7 @@ MODULE_AUTHOR("Bruno Ducrot");
- MODULE_DESCRIPTION("ACPI Video Driver");
- MODULE_LICENSE("GPL");
- 
--static bool brightness_switch_enabled = 1;
-+static bool brightness_switch_enabled = 0;
- module_param(brightness_switch_enabled, bool, 0644);
- 
- /*

drm-edid-try-harder-to-fix-up-broken-headers.patch

@@ -1,47 +0,0 @@
-From 115cb7ab7d3b87fe43b1fe9b05ec894b1fcfb5cf Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 7 Dec 2011 18:26:23 -0500
-Subject: [PATCH] drm/edid: Try harder to fix up broken headers
-
-There's no reason to force the first byte to be correct if we're already
-scoring how correct the header is.
-
-See also: https://bugzilla.redhat.com/show_bug.cgi?id=722909
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- drivers/gpu/drm/drm_edid.c |   18 ++++++++----------
- 1 files changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
-index 7425e5c..8b16a49 100644
---- a/drivers/gpu/drm/drm_edid.c
-+++ b/drivers/gpu/drm/drm_edid.c
-@@ -154,16 +154,14 @@ drm_edid_block_valid(u8 *raw_edid)
- 	int i;
- 	u8 csum = 0;
- 	struct edid *edid = (struct edid *)raw_edid;
--
--	if (raw_edid[0] == 0x00) {
--		int score = drm_edid_header_is_valid(raw_edid);
--		if (score == 8) ;
--		else if (score >= 6) {
--			DRM_DEBUG("Fixing EDID header, your hardware may be failing\n");
--			memcpy(raw_edid, edid_header, sizeof(edid_header));
--		} else {
--			goto bad;
--		}
-+	int score = drm_edid_header_is_valid(raw_edid);
-+
-+	if (score == 8) ;
-+	else if (score >= 6) {
-+		DRM_DEBUG("Fixing EDID header, your hardware may be failing\n");
-+		memcpy(raw_edid, edid_header, sizeof(edid_header));
-+	} else {
-+		goto bad;
- 	}
- 
- 	for (i = 0; i < EDID_LENGTH; i++)
--- 
-1.7.7.3
-

drm-i915-Disable-verbose-state-checks.patch

@@ -0,0 +1,28 @@
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Thu, 29 Jan 2015 14:03:17 -0500
+Subject: [PATCH] drm/i915: Disable verbose state checks
+
+For stable releases, we disable the verbose state checks in the i915 driver.
+They are mostly for development purposes and they fill the retrace server
+to the point of uselessness.  We leave these enabled in rawhide kernels,
+where they are both more likely to get attention from upstream and more
+likely to be fixable.
+
+Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
+---
+ drivers/gpu/drm/i915/i915_params.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
+index 44f2262a5553..09566acd995d 100644
+--- a/drivers/gpu/drm/i915/i915_params.c
++++ b/drivers/gpu/drm/i915/i915_params.c
+@@ -51,7 +51,7 @@ struct i915_params i915 __read_mostly = {
+ 	.disable_vtd_wa = 0,
+ 	.use_mmio_flip = 0,
+ 	.mmio_debug = 0,
+-	.verbose_state_checks = 1,
++	.verbose_state_checks = 0,
+ 	.nuclear_pageflip = 0,
+ };
+ 

drm-i915-Fix-ilk-watermarks-calculation-when-primary.patch

@@ -0,0 +1,100 @@
+From: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
+Date: Wed, 20 May 2015 16:32:34 +0300
+Subject: [PATCH] drm/i915: Fix ilk watermarks calculation when primary plane
+ is disabled
+
+On Fedora 21 or 22, when the transition from the X server to the wayland
+compositor is done, the CRTC with the login screen is left active with a
+disabled fb. A cursor ioctl after the transition causes the watermarks
+to be updated, but due to the logic in intel_crtc_active() checking for
+the primary plane fb, the update considers all planes to be disabled,
+untimately setting the wrong watermark values and causing screen
+flicker. Since the crtc is active, a modeset done later is skipped and
+replaced with a flip, which doesn't update the watermarks.
+
+This regression was introduced somewhere between v3.16 and v3.17.
+Another issue prevented me from doing a full bisect, but the issue was
+introduced in one of the following skipped commits:
+
+    commit 7707e6535f43328e05e4729ac96eee864b90e8a4
+    Author: Rob Clark <robdclark@gmail.com>
+    Date:   Thu Jul 17 23:30:04 2014 -0400
+
+        drm/i915: use helpers
+
+    commit ca5a1b9ba0fb5291b555a23b76dbe5f6c30bfd7a
+    Merge: c7dbc6c 3488229
+    Author: Dave Airlie <airlied@redhat.com>
+    Date:   Wed Jul 9 10:38:42 2014 +1000
+
+        Merge tag 'drm-intel-next-2014-06-20' of git://anongit.freedesktop.org/drm-intel into drm-next
+
+    commit c51f71679042a5f388d9580ffbede14c897f1e86
+    Merge: b957f45 7b3c29f
+    Author: Dave Airlie <airlied@redhat.com>
+    Date:   Sat Jul 19 16:43:41 2014 +1000
+
+        Merge tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next
+
+This patch is a simplified version of the following commits:
+
+    commit 3dd512fbda0d87d1c3fb44bf878b262baee98fb6
+    Author: Matt Roper <matthew.d.roper@intel.com>
+    Date:   Fri Feb 27 10:12:00 2015 -0800
+
+        drm/i915: Kill intel_crtc->cursor_{width, height} (v2)
+
+    commit 54da691deb123c045259ebf4f5c67381244f58f1
+    Author: Thomas Gummerer <t.gummerer@gmail.com>
+    Date:   Thu May 14 09:16:39 2015 +0200
+
+        drm/i915: fix screen flickering
+
+    commit 3ef00284e6a48f7deb0784ccca0478ebb7d4bcfc
+    Author: Matt Roper <matthew.d.roper@intel.com>
+    Date:   Mon Mar 9 10:19:24 2015 -0700
+
+        drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3)
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90508
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1218688
+Cc: stable@vger.kernel.org
+Cc: Dave Airlie <airlied@gmail.com>
+Cc: Jani Nikula <jani.nikula@intel.com>
+Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
+---
+ drivers/gpu/drm/i915/intel_pm.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
+index 24d77ddcc5f4..3d67f8e496de 100644
+--- a/drivers/gpu/drm/i915/intel_pm.c
++++ b/drivers/gpu/drm/i915/intel_pm.c
+@@ -1898,16 +1898,24 @@ static void ilk_compute_wm_parameters(struct drm_crtc *crtc,
+ 	enum pipe pipe = intel_crtc->pipe;
+ 	struct drm_plane *plane;
+ 
+-	if (!intel_crtc_active(crtc))
++	if (!intel_crtc->active)
+ 		return;
+ 
+ 	p->active = true;
+ 	p->pipe_htotal = intel_crtc->config->base.adjusted_mode.crtc_htotal;
+ 	p->pixel_rate = ilk_pipe_pixel_rate(dev, crtc);
+-	p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
++
++
++	if (crtc->primary->fb)
++		p->pri.bytes_per_pixel = crtc->primary->fb->bits_per_pixel / 8;
++	else
++		p->pri.bytes_per_pixel = 4;
++
+ 	p->cur.bytes_per_pixel = 4;
++
+ 	p->pri.horiz_pixels = intel_crtc->config->pipe_src_w;
+-	p->cur.horiz_pixels = intel_crtc->cursor_width;
++	p->cur.horiz_pixels = intel_crtc->base.cursor->state->crtc_w;
++
+ 	/* TODO: for now, assume primary and cursor planes are always enabled. */
+ 	p->pri.enabled = true;
+ 	p->cur.enabled = true;

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 fb2fbc1..0aaf67d 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -283,7 +283,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)
- 	pp_ctrl_reg = IS_VALLEYVIEW(dev) ? PIPEA_PP_CONTROL : PCH_PP_CONTROL;
- 
- 	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(pp_stat_reg),
- 				I915_READ(pp_ctrl_reg));
-@@ -376,7 +376,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;
-@@ -995,8 +995,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;
- 
-@@ -1070,7 +1070,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;
- 
-@@ -1144,7 +1145,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(intel_dp);
- 	/* We need to switch off panel power _and_ force vdd, for otherwise some

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

@@ -0,0 +1,28 @@
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 13 Nov 2013 10:17:24 -0500
+Subject: [PATCH] drm/i915: hush check crtc state
+
+This is _by far_ the most common backtrace for i915 on retrace.fp.o, and
+it's mostly useless noise.  There's not enough context when it's generated
+to know if something actually went wrong.  Downgrade the message to
+KMS debugging so we can still get it if we want it.
+
+Bugzilla: 1027037 1028785
+Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/035948.html
+---
+ drivers/gpu/drm/i915/intel_display.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index f75173c20f47..1003782a38c4 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -10917,7 +10917,7 @@ check_crtc_state(struct drm_device *dev)
+ 
+ 		if (active &&
+ 		    !intel_pipe_config_compare(dev, crtc->config, &pipe_config)) {
+-			I915_STATE_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-i915-turn-off-wc-mmaps.patch

@@ -0,0 +1,21 @@
+From: Dave Airlie <airlied@redhat.com>
+Date: Thu, 4 Jun 2015 07:12:20 -0400
+Subject: [PATCH] drm: i915: turn off wc mmaps
+
+---
+ drivers/gpu/drm/i915/i915_dma.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
+index 1a46787129e7..e41096ea77f1 100644
+--- a/drivers/gpu/drm/i915/i915_dma.c
++++ b/drivers/gpu/drm/i915/i915_dma.c
+@@ -147,7 +147,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
+ 		value = 1;
+ 		break;
+ 	case I915_PARAM_MMAP_VERSION:
+-		value = 1;
++		value = 0;
+ 		break;
+ 	default:
+ 		DRM_DEBUG("Unknown parameter %d\n", param->param);

drm-intel-next.patch

@@ -1 +0,0 @@
-empty