Linux v4.0-3843-gbb0fd7ab0986

30 files changed, 84 insertions, 267 deletions

diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch
index c86a03912..36dbd3e4e 100644
--- a/Add-option-to-automatically-enforce-module-signature.patch
+++ b/Add-option-to-automatically-enforce-module-signature.patch
@@ -33,10 +33,10 @@ index 82fbdbc1e0b0..a811210ad486 100644
  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 faff6934c05a..4accc52523b4 100644
+index d43e7e1c784b..3e9129a79646 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -1690,6 +1690,16 @@ config EFI_MIXED
+@@ -1686,6 +1686,16 @@ config EFI_MIXED
  
  	   If unsure, say N.
  
@@ -146,7 +146,7 @@ index d74ac33290ae..88dad730e858 100644
  	 * 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
+index cdc46a791b9d..0c1edd33a42c 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);
@@ -163,10 +163,10 @@ index b033dab5c8bf..f526b6e02f59 100644
  
  extern int modules_disabled; /* for sysctl */
 diff --git a/kernel/module.c b/kernel/module.c
-index 0372c3961016..55dacebb687b 100644
+index 63bdba31cebc..5000dd2cdd18 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -3909,6 +3909,13 @@ void module_layout(struct module *mod,
+@@ -3912,6 +3912,13 @@ void module_layout(struct module *mod,
  EXPORT_SYMBOL(module_layout);
  #endif
  
diff --git a/Add-secure_modules-call.patch b/Add-secure_modules-call.patch
index cd84f8b11..9a6cc9fbc 100644
--- a/Add-secure_modules-call.patch
+++ b/Add-secure_modules-call.patch
@@ -16,10 +16,10 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
  2 files changed, 17 insertions(+)
 
 diff --git a/include/linux/module.h b/include/linux/module.h
-index b03485bcb82a..b033dab5c8bf 100644
+index c883b86ea964..cdc46a791b9d 100644
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
-@@ -506,6 +506,8 @@ int unregister_module_notifier(struct notifier_block *nb);
+@@ -508,6 +508,8 @@ int unregister_module_notifier(struct notifier_block *nb);
  
  extern void print_modules(void);
  
@@ -28,7 +28,7 @@ index b03485bcb82a..b033dab5c8bf 100644
  #else /* !CONFIG_MODULES... */
  
  /* Given an address, look for it in the exception tables. */
-@@ -616,6 +618,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
+@@ -618,6 +620,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
  static inline void print_modules(void)
  {
  }
@@ -41,10 +41,10 @@ index b03485bcb82a..b033dab5c8bf 100644
  
  #ifdef CONFIG_SYSFS
 diff --git a/kernel/module.c b/kernel/module.c
-index ec53f594e9c9..0372c3961016 100644
+index 650b038ae520..63bdba31cebc 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -3908,3 +3908,13 @@ void module_layout(struct module *mod,
+@@ -3911,3 +3911,13 @@ void module_layout(struct module *mod,
  }
  EXPORT_SYMBOL(module_layout);
  #endif
diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch
index 11c226ffe..811406bf4 100644
--- a/Add-sysrq-option-to-disable-secure-boot-mode.patch
+++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch
@@ -228,7 +228,7 @@ index 4121345498e0..0ff3cef5df96 100644
  
  	return 0;
 diff --git a/kernel/module.c b/kernel/module.c
-index 55dacebb687b..9d4deeb9268e 100644
+index 5000dd2cdd18..0a2005132472 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 */
diff --git a/HID-multitouch-add-support-of-clickpads.patch b/HID-multitouch-add-support-of-clickpads.patch
deleted file mode 100644
index 97edb7dd6..000000000
--- a/HID-multitouch-add-support-of-clickpads.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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 f65e78b46999..ef06dc30b9b1 100644
---- a/drivers/hid/hid-multitouch.c
-+++ b/drivers/hid/hid-multitouch.c
-@@ -116,6 +116,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 */
-@@ -379,6 +380,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];
- 
-@@ -728,6 +733,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
-
diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch
index 9feb8e9b4..ced0dec2e 100644
--- a/KEYS-Add-a-system-blacklist-keyring.patch
+++ b/KEYS-Add-a-system-blacklist-keyring.patch
@@ -29,10 +29,10 @@ index 72665eb80692..2c7b80d31366 100644
 +
  #endif /* _KEYS_SYSTEM_KEYRING_H */
 diff --git a/init/Kconfig b/init/Kconfig
-index f5dbc6d4261b..eca8ab59ae7f 100644
+index a905b7301e10..65e1bd0bc995 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1734,6 +1734,15 @@ config SYSTEM_TRUSTED_KEYRING
+@@ -1747,6 +1747,15 @@ config SYSTEM_TRUSTED_KEYRING
  
  	  Keys in this keyring are used by module signature checking.
  
diff --git a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
index 6d71fe2bc..0ac2c66a4 100644
--- a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
+++ b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
@@ -59,7 +59,7 @@ index 9b76ce1e08bb..710c857e6450 100644
  ifdef CONFIG_DEBUG_INFO
  ifdef CONFIG_DEBUG_INFO_SPLIT
 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 36b6fa88ce5b..74cbed113c24 100644
+index 17670573dda8..d23b7c975eb5 100644
 --- a/lib/Kconfig.debug
 +++ b/lib/Kconfig.debug
 @@ -165,7 +165,23 @@ config DEBUG_INFO_DWARF4
diff --git a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
index 4c680c288..f2c19e463 100644
--- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
@@ -42,10 +42,10 @@ index 3dd6f4a51b9b..9cc069579351 100644
  	efi_guid_t guid;
  	u64 table;
 diff --git a/init/Kconfig b/init/Kconfig
-index eca8ab59ae7f..9a782b02e4d5 100644
+index 65e1bd0bc995..98af72b9a002 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1888,6 +1888,15 @@ config MODULE_SIG_ALL
+@@ -1901,6 +1901,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
  
diff --git a/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch b/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
index 0727adee8..fd2faacbd 100644
--- a/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
+++ b/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
@@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index efe38c1bc234..16b8af1188e1 100644
+index aa2fac9086b5..fb88c24ebd01 100644
 --- a/drivers/char/mem.c
 +++ b/drivers/char/mem.c
 @@ -167,6 +167,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
index 2ac273199..b4f8cee39 100644
--- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
+++ b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
@@ -15,10 +15,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 01aa47d3b6ab..e9b48474301b 100644
+index 491bbd104b06..b8c814f44437 100644
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
-@@ -3823,7 +3823,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -3844,7 +3844,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.
@@ -28,7 +28,7 @@ index 01aa47d3b6ab..e9b48474301b 100644
  	virtio_mmio.device=
  			[VMMIO] Memory mapped virtio (platform) device.
 diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index 26eb70c8f518..db70d550f526 100644
+index cc79d3fedfb2..d9bf8ba7d848 100644
 --- a/drivers/acpi/video.c
 +++ b/drivers/acpi/video.c
 @@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot");
diff --git a/acpi-video-Add-force-native-backlight-quirk-for-Leno.patch b/acpi-video-Add-force-native-backlight-quirk-for-Leno.patch
deleted file mode 100644
index d8206ccc6..000000000
--- a/acpi-video-Add-force-native-backlight-quirk-for-Leno.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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 70ea37bea84f..d9bf8ba7d848 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
-@@ -566,6 +572,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
-
diff --git a/acpi-video-Allow-forcing-native-backlight-on-non-win.patch b/acpi-video-Allow-forcing-native-backlight-on-non-win.patch
deleted file mode 100644
index e28a8826d..000000000
--- a/acpi-video-Allow-forcing-native-backlight-on-non-win.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-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 db70d550f526..70ea37bea84f 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
-
diff --git a/config-arm-generic b/config-arm-generic
index 28718efa4..196613adb 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -1,4 +1,5 @@
 CONFIG_KUSER_HELPERS=y
+# CONFIG_VDSO is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 CONFIG_COMMON_CLK=y
 CONFIG_EARLY_PRINTK=y
@@ -205,6 +206,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_CMA=y
 CONFIG_DMA_CMA=y
 # CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_DEBUGFS=y
 CONFIG_CMA_SIZE_MBYTES=16
 CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
@@ -238,6 +240,7 @@ CONFIG_CMA_AREAS=7
 # CONFIG_PATA_PLATFORM is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_BCM is not set
 # CONFIG_PHY_SAMSUNG_USB2 is not set
 
 ### turn off things which make no sense on embedded SoC
diff --git a/config-armv7 b/config-armv7
index 5846a74be..f4dcf75bf 100644
--- a/config-armv7
+++ b/config-armv7
@@ -370,6 +370,7 @@ CONFIG_SPMI=m
 CONFIG_SPMI_MSM_PMIC_ARB=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_VADC=m
+CONFIG_INPUT_PM8941_PWRKEY=m
 
 # i.MX
 # CONFIG_MXC_DEBUG_BOARD is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index 3eb0652ae..ed54f7bf5 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -46,6 +46,7 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # CONFIG_HVC_DCC is not set
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_ARM_VIRT_EXT is not set
+# CONFIG_ARM_CPUIDLE is not set
 
 # Platforms enabled/disabled globally on ARMv7
 CONFIG_ARCH_EXYNOS=y
@@ -497,6 +498,7 @@ CONFIG_PINCONF=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_GENERIC_PINCONF=y
+# CONFIG_PINCTRL_AMD is not set
 # CONFIG_PINCTRL_SAMSUNG is not set
 # CONFIG_PINCTRL_MSM8X74 is not set
 # CONFIG_PINCTRL_BCM281XX is not set
@@ -759,6 +761,9 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 
+# vfio
+# CONFIG_VFIO_PLATFORM is not set
+
 # Sensors
 CONFIG_SENSORS_HTU21=m
 
@@ -832,6 +837,7 @@ CONFIG_R8188EU=m
 # CONFIG_POWER_RESET_BRCMSTB is not set
 # CONFIG_INPUT_TPS65218_PWRBUTTON is not set
 # CONFIG_CLK_QORIQ is not set
+# CONFIG_QORIQ_CPUFREQ is not set
 
 # Debug options. We need to deal with them at some point like x86
 # CONFIG_DEBUG_USER is not set
diff --git a/config-generic b/config-generic
index 650033291..aaf891c81 100644
--- a/config-generic
+++ b/config-generic
@@ -52,6 +52,7 @@ CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
+CONFIG_BPF_SYSCALL=y
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
@@ -2315,6 +2316,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 # CONFIG_TOUCHSCREEN_AR1021_I2C is not set
+# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
+# CONFIG_TOUCHSCREEN_SX8654 is not set
 
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_E3X0_BUTTON=m
@@ -3681,6 +3684,7 @@ CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=m
 CONFIG_HID_PID=y
+CONFIG_HID_LOGITECH=m
 CONFIG_LOGITECH_FF=y
 CONFIG_HID_LOGITECH_DJ=m
 CONFIG_HID_LOGITECH_HIDPP=m
@@ -3691,22 +3695,28 @@ CONFIG_HID_WACOM=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_IDMOUSE=m
+CONFIG_HID_CYPRESS=m
 CONFIG_DRAGONRISE_FF=y
 CONFIG_GREENASIA_FF=y
 CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=y
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=y
 CONFIG_HID_PLANTRONICS=m
 CONFIG_HID_PRIMAX=m
 CONFIG_HID_BETOP_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_DRAGONRISE=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
 CONFIG_HID_PENMOUNT=m
@@ -3733,9 +3743,11 @@ CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
 CONFIG_HID_SENSOR_ALS=m
 # CONFIG_HID_SENSOR_PROX is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
+# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_ACRUX=m
@@ -3753,6 +3765,9 @@ CONFIG_HID_SAITEK=m
 CONFIG_HID_TIVO=m
 CONFIG_HID_GENERIC=y
 CONFIG_HID_AUREAL=m
+CONFIG_HID_A4TECH=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_BELKIN=m
 CONFIG_HID_APPLEIR=m
 # CONFIG_HID_CP2112 is not set
 CONFIG_HID_LENOVO=m
@@ -4085,6 +4100,7 @@ CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_CS5535 is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_WL1273_CORE is not set
@@ -4114,6 +4130,8 @@ CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_SKY81452 is not set
+# CONFIG_MFD_MAX77843 is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 
@@ -4979,6 +4997,7 @@ CONFIG_FUNCTION_PROFILER=y
 # CONFIG_TRACEPOINT_BENCHMARK is not set
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_TRACE_ENUM_MAP_FILE is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_FUNCTION_TRACER=y
@@ -5249,6 +5268,8 @@ CONFIG_RCU_NOCB_CPU=y
 CONFIG_RCU_NOCB_CPU_ALL=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RCU_TORTURE_TEST=m
+# CONFIG_RCU_TORTURE_TEST_SLOW_INIT is not set
+CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_TASKS_RCU is not set
@@ -5374,6 +5395,7 @@ CONFIG_PSTORE_RAM=m
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_TEST_UDELAY is not set
+# CONFIG_MEMTEST is not set
 # CONFIG_TEST_HEXDUMP is not set
 # CONFIG_TEST_RHASHTABLE is not set
 
diff --git a/config-powerpc64 b/config-powerpc64
index e0eebe270..a139271ad 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -135,6 +135,7 @@ CONFIG_RCU_FANOUT=64
 
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
 CONFIG_CMA_AREAS=7
 CONFIG_KVM_BOOK3S_64=m
 CONFIG_KVM_BOOK3S_64_HV=m
diff --git a/config-powerpc64p7 b/config-powerpc64p7
index c3d97065a..a04513d22 100644
--- a/config-powerpc64p7
+++ b/config-powerpc64p7
@@ -125,6 +125,7 @@ CONFIG_RCU_FANOUT=64
 
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
 CONFIG_CMA_AREAS=7
 CONFIG_KVM_BOOK3S_64=m
 CONFIG_KVM_BOOK3S_64_HV=m
diff --git a/config-x86-32-generic b/config-x86-32-generic
index c2b27269c..dfdedf147 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -219,3 +219,4 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_QCOM is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_KEYBOARD_BCM is not set
diff --git a/config-x86-generic b/config-x86-generic
index d174b55bc..bf08af838 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -491,6 +491,7 @@ CONFIG_NFC_MICROREAD_MEI=m
 CONFIG_X86_INTEL_LPSS=y
 
 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set
+# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 
 CONFIG_IOSF_MBI=m
 # CONFIG_IOSF_MBI_DEBUG is not set
@@ -500,6 +501,8 @@ CONFIG_PWM_LPSS_PLATFORM=m
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_CHERRYVIEW=m
+# CONFIG_PINCTRL_AMD is not set
+CONFIG_PINCTRL_SUNRISEPOINT=m
 
 #baytrail/cherrytrail stuff
 CONFIG_KEYBOARD_GPIO=m
diff --git a/crash-driver.patch b/crash-driver.patch
index 9c35b0169..ca77267f6 100644
--- a/crash-driver.patch
+++ b/crash-driver.patch
@@ -240,10 +240,10 @@ index 000000000000..552be5e2c571
 +
 +#endif /* _S390_CRASH_H */
 diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
-index 2eb34bdfc613..11ce5c98462c 100644
+index 8a993a53fcd6..8f511795b52e 100644
 --- a/arch/s390/mm/maccess.c
 +++ b/arch/s390/mm/maccess.c
-@@ -193,6 +193,7 @@ void *xlate_dev_mem_ptr(phys_addr_t addr)
+@@ -197,6 +197,7 @@ void *xlate_dev_mem_ptr(phys_addr_t addr)
  	put_online_cpus();
  	return bounce;
  }
@@ -251,7 +251,7 @@ index 2eb34bdfc613..11ce5c98462c 100644
  
  /*
   * Free converted buffer for /dev/mem access (if necessary)
-@@ -202,3 +203,4 @@ void unxlate_dev_mem_ptr(phys_addr_t addr, void *buf)
+@@ -206,3 +207,4 @@ void unxlate_dev_mem_ptr(phys_addr_t addr, void *buf)
  	if ((void *) addr != buf)
  		free_page((unsigned long) buf);
  }
diff --git a/criu-no-expert.patch b/criu-no-expert.patch
index 6c488570d..5807360f2 100644
--- a/criu-no-expert.patch
+++ b/criu-no-expert.patch
@@ -9,10 +9,10 @@ Upstream-status: Fedora mustard
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/init/Kconfig b/init/Kconfig
-index 9a782b02e4d5..d97b5032d4b0 100644
+index 98af72b9a002..73f60b09ecd1 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1135,7 +1135,7 @@ config DEBUG_BLK_CGROUP
+@@ -1148,7 +1148,7 @@ config DEBUG_BLK_CGROUP
  endif # CGROUPS
  
  config CHECKPOINT_RESTORE
@@ -21,7 +21,7 @@ index 9a782b02e4d5..d97b5032d4b0 100644
  	default n
  	help
  	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1146,7 +1146,7 @@ config CHECKPOINT_RESTORE
+@@ -1159,7 +1159,7 @@ config CHECKPOINT_RESTORE
  	  If unsure, say N here.
  
  menuconfig NAMESPACES
diff --git a/disable-i8042-check-on-apple-mac.patch b/disable-i8042-check-on-apple-mac.patch
index 793bada3d..498c5a441 100644
--- a/disable-i8042-check-on-apple-mac.patch
+++ b/disable-i8042-check-on-apple-mac.patch
@@ -17,10 +17,10 @@ Signed-off-by: Bastien Nocera <hadess@hadess.net>
  1 file changed, 22 insertions(+)
 
 diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
-index bfb0b2280df0..06b10fe7e65b 100644
+index 4022b75eaad7..1aaf06aa7b0f 100644
 --- a/drivers/input/serio/i8042.c
 +++ b/drivers/input/serio/i8042.c
-@@ -1484,6 +1484,22 @@ static struct platform_driver i8042_driver = {
+@@ -1506,6 +1506,22 @@ static struct platform_driver i8042_driver = {
  	.shutdown	= i8042_shutdown,
  };
  
@@ -43,7 +43,7 @@ index bfb0b2280df0..06b10fe7e65b 100644
  static int __init i8042_init(void)
  {
  	struct platform_device *pdev;
-@@ -1491,6 +1507,12 @@ static int __init i8042_init(void)
+@@ -1513,6 +1529,12 @@ static int __init i8042_init(void)
  
  	dbg_init();
  
diff --git a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
index c79491d75..30177b63b 100644
--- a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
+++ b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
@@ -11,10 +11,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 4accc52523b4..7d852306b245 100644
+index 3e9129a79646..acdde2b3be4c 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -1691,7 +1691,8 @@ config EFI_MIXED
+@@ -1687,7 +1687,8 @@ config EFI_MIXED
  	   If unsure, say N.
  
  config EFI_SECURE_BOOT_SIG_ENFORCE
diff --git a/input-kill-stupid-messages.patch b/input-kill-stupid-messages.patch
index ccf42cdf7..66d0793f4 100644
--- a/input-kill-stupid-messages.patch
+++ b/input-kill-stupid-messages.patch
@@ -9,7 +9,7 @@ Upstream-status: Fedora mustard
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
-index 387c51f4b4e4..04a1c7d47aba 100644
+index ec876b5b1382..9d5216e23a09 100644
 --- a/drivers/input/keyboard/atkbd.c
 +++ b/drivers/input/keyboard/atkbd.c
 @@ -436,11 +436,15 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
diff --git a/input-silence-i8042-noise.patch b/input-silence-i8042-noise.patch
index 840fc38de..3b46d5fc9 100644
--- a/input-silence-i8042-noise.patch
+++ b/input-silence-i8042-noise.patch
@@ -16,7 +16,7 @@ Upstream-status: Fedora mustard
  3 files changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
-index 9717d5f20139..a3101d2fd936 100644
+index 3d874eca7104..deab7897b01f 100644
 --- a/drivers/base/power/main.c
 +++ b/drivers/base/power/main.c
 @@ -122,8 +122,6 @@ void device_pm_unlock(void)
@@ -29,7 +29,7 @@ index 9717d5f20139..a3101d2fd936 100644
  	if (dev->parent && dev->parent->power.is_prepared)
  		dev_warn(dev, "parent %s should not be sleeping\n",
 diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
-index 986a71c614b0..bfb0b2280df0 100644
+index cb5ece77fd7d..4022b75eaad7 100644
 --- a/drivers/input/serio/i8042.c
 +++ b/drivers/input/serio/i8042.c
 @@ -871,7 +871,6 @@ static int __init i8042_check_aux(void)
diff --git a/kernel.spec b/kernel.spec
index 02dfbdd62..505f66c98 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -614,13 +614,6 @@ Patch26139: Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch
 #rhbz 1196825
 Patch26140: security-yama-Remove-unnecessary-selects-from-Kconfi.patch
 
-#rhbz 1201532
-Patch26168: HID-multitouch-add-support-of-clickpads.patch
-
-#rhbz 1187004
-Patch26170: acpi-video-Allow-forcing-native-backlight-on-non-win.patch
-Patch26171: acpi-video-Add-force-native-backlight-quirk-for-Leno.patch
-
 #CVE-2015-2150 rhbz 1196266 1200397
 Patch26175: xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
 
@@ -1353,13 +1346,6 @@ ApplyPatch Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch
 #rhbz 1196825
 ApplyPatch security-yama-Remove-unnecessary-selects-from-Kconfi.patch
 
-#rhbz 1201532
-ApplyPatch HID-multitouch-add-support-of-clickpads.patch
-
-#rhbz 1187004
-ApplyPatch acpi-video-Allow-forcing-native-backlight-on-non-win.patch
-ApplyPatch acpi-video-Add-force-native-backlight-quirk-for-Leno.patch
-
 #CVE-2015-2150 rhbz 1196266 1200397
 ApplyPatch xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
 
@@ -2213,6 +2199,9 @@ fi
 #
 # 
 %changelog
+* Wed Apr 15 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git2.1
+- Linux v4.0-3843-gbb0fd7ab0986
+
 * Tue Apr 14 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git1.1
 - Linux v4.0-2620-gb79013b2449c
 - Reenable debugging options.
diff --git a/pinctrl-pinctrl-single-must-be-initialized-early.patch b/pinctrl-pinctrl-single-must-be-initialized-early.patch
index 5aa4bd22f..503798a87 100644
--- a/pinctrl-pinctrl-single-must-be-initialized-early.patch
+++ b/pinctrl-pinctrl-single-must-be-initialized-early.patch
@@ -10,7 +10,7 @@ exercise left to the reader.
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
-index 69e84427f913..f21cf4291476 100644
+index 13b45f297727..f84ce0135c38 100644
 --- a/drivers/pinctrl/pinctrl-single.c
 +++ b/drivers/pinctrl/pinctrl-single.c
 @@ -2025,7 +2025,17 @@ static struct platform_driver pcs_driver = {
diff --git a/sources b/sources
index 2ad0a53ea..682c46600 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 a86916bd12798220da9eb4a1eec3616d  linux-4.0.tar.xz
 d125eecce68ab6fb5f1f23523c2c04b8  perf-man-4.0.tar.gz
-0f72b6741e011d55ce7c9ff8207da113  patch-4.0-git1.xz
+1ec986b59be793609d6ea9b6e7d2e34e  patch-4.0-git2.xz
diff --git a/watchdog-Disable-watchdog-on-virtual-machines.patch b/watchdog-Disable-watchdog-on-virtual-machines.patch
index d15fd84fa..e20011f8e 100644
--- a/watchdog-Disable-watchdog-on-virtual-machines.patch
+++ b/watchdog-Disable-watchdog-on-virtual-machines.patch
@@ -20,7 +20,7 @@ Signed-off-by: Dave Jones <davej@redhat.com>
  1 file changed, 29 insertions(+)
 
 diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index 3174bf8e3538..d0a8abec3df9 100644
+index 2316f50b07a4..da39c565a03e 100644
 --- a/kernel/watchdog.c
 +++ b/kernel/watchdog.c
 @@ -19,6 +19,7 @@
@@ -31,7 +31,7 @@ index 3174bf8e3538..d0a8abec3df9 100644
  
  #include <asm/irq_regs.h>
  #include <linux/kvm_para.h>
-@@ -135,6 +136,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str)
+@@ -146,6 +147,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str)
  __setup("softlockup_all_cpu_backtrace=", softlockup_all_cpu_backtrace_setup);
  #endif
  
@@ -64,7 +64,7 @@ index 3174bf8e3538..d0a8abec3df9 100644
  /*
   * Hard-lockup warnings should be triggered after just a few seconds. Soft-
   * lockups can have false positives under extreme conditions. So we generally
-@@ -704,6 +731,8 @@ out:
+@@ -873,6 +900,8 @@ out:
  
  void __init lockup_detector_init(void)
  {
@@ -72,7 +72,7 @@ index 3174bf8e3538..d0a8abec3df9 100644
 +
  	set_sample_period();
  
- 	if (watchdog_user_enabled)
+ 	if (watchdog_enabled)
 -- 
 2.1.0
 
diff --git a/x86-Lock-down-IO-port-access-when-module-security-is.patch b/x86-Lock-down-IO-port-access-when-module-security-is.patch
index d1f41861b..9307136dd 100644
--- a/x86-Lock-down-IO-port-access-when-module-security-is.patch
+++ b/x86-Lock-down-IO-port-access-when-module-security-is.patch
@@ -44,13 +44,13 @@ index 37dae792dbbe..1ecc03ca3c15 100644
  	}
  	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index 297110c12635..efe38c1bc234 100644
+index 9c4fd7a8e2e5..aa2fac9086b5 100644
 --- a/drivers/char/mem.c
 +++ b/drivers/char/mem.c
 @@ -27,6 +27,7 @@
  #include <linux/export.h>
  #include <linux/io.h>
- #include <linux/aio.h>
+ #include <linux/uio.h>
 +#include <linux/module.h>
  
  #include <linux/uaccess.h>