From 76c11d9b55366c6da11ee821716d56b68110a2c6 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Mon, 29 Jun 2015 11:24:25 -0400
Subject: [PATCH] Linux v4.1-11235-gc63f887bdae8

- Reenable debugging options.
---
 ARM-tegra-usb-no-reset.patch                  |   4 +-
 ...tomatically-enforce-module-signature.patch |  10 +-
 Add-secure_modules-call.patch                 |  23 ++--
 ...q-option-to-disable-secure-boot-mode.patch |  20 ++--
 KEYS-Add-a-system-blacklist-keyring.patch     |   4 +-
 ...t-certificates-from-UEFI-Secure-Boot.patch |   4 +-
 ...PI-video-change-acpi-video-brightnes.patch |   4 +-
 ...one-common-add-uart2_pins-uart4_pins.patch |   2 +-
 ...335x-bone-common-enable-and-use-i2c2.patch |  66 ----------
 ...one-common-setup-default-pinmux-http.patch |  63 +---------
 blk-loop-avoid-too-many-pending-work-IO.patch | 106 ----------------
 config-arm-generic                            |   6 +
 config-arm64                                  |   3 +
 config-armv7                                  |   3 +
 config-armv7-generic                          |  12 ++
 config-generic                                |  33 ++++-
 config-nodebug                                | 112 ++++++++---------
 config-x86-generic                            |   7 +-
 config-x86_64-generic                         |   3 +
 crash-driver.patch                            |   6 +-
 criu-no-expert.patch                          |   8 +-
 drm-i915-hush-check-crtc-state.patch          |   4 +-
 drm-i915-turn-off-wc-mmaps.patch              |   2 +-
 ...ECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch |   4 +-
 filter-modules.sh                             |   2 +-
 ...RN-from-usermodehelper_read_trylock-.patch |   4 +-
 kernel.spec                                   | 113 ++++++++----------
 ...sion-in-some-more-dib0700-based-devi.patch |  53 --------
 silence-fbcon-logo.patch                      |   4 +-
 sources                                       |   2 +-
 ...atform-driver-use-64-bit-or-32-bit-D.patch |   4 +-
 ...-incorrect-bandwidth-with-Chicony-de.patch |  35 ------
 32 files changed, 228 insertions(+), 498 deletions(-)
 delete mode 100644 arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
 delete mode 100644 blk-loop-avoid-too-many-pending-work-IO.patch
 delete mode 100644 media-Fix-regression-in-some-more-dib0700-based-devi.patch
 delete mode 100644 v4l-uvcvideo-Fix-incorrect-bandwidth-with-Chicony-de.patch

diff --git a/ARM-tegra-usb-no-reset.patch b/ARM-tegra-usb-no-reset.patch
index 75e4a3107..8ea4f5174 100644
--- a/ARM-tegra-usb-no-reset.patch
+++ b/ARM-tegra-usb-no-reset.patch
@@ -9,10 +9,10 @@ Patch for disconnect issues with storage attached to a
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 3b7151687776..4b19e7e5bc01 100644
+index 43cb2f2e3b43..7f838ec11c81 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5006,6 +5006,13 @@ static void hub_event(struct work_struct *work)
+@@ -4996,6 +4996,13 @@ static void hub_event(struct work_struct *work)
  			(u16) hub->change_bits[0],
  			(u16) hub->event_bits[0]);
  
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch
index 8f3fcab9c..b45244897 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 8e0b76ad8350..39645abe44e3 100644
+index 4fcf0ade7e91..0ea05e5528c9 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -1697,6 +1697,16 @@ config EFI_MIXED
+@@ -1692,6 +1692,16 @@ config EFI_MIXED
  
  	   If unsure, say N.
  
@@ -146,7 +146,7 @@ index d3b95b89e9b2..d3071ca120eb 100644
  	 * Parse the ACPI tables for possible boot-time SMP configuration.
  	 */
 diff --git a/include/linux/module.h b/include/linux/module.h
-index 6b99261cbb4b..7117d03cbfe8 100644
+index 3da68fd1f657..ec76d890c9f2 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 6b99261cbb4b..7117d03cbfe8 100644
  
  extern int modules_disabled; /* for sysctl */
 diff --git a/kernel/module.c b/kernel/module.c
-index 17738285d7a2..e7065d683640 100644
+index 5d3e6c6191fa..4c682ab7e640 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -3916,6 +3916,13 @@ void module_layout(struct module *mod,
+@@ -3926,6 +3926,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 bc9b9b6ad..1d7ddcb98 100644
--- a/Add-secure_modules-call.patch
+++ b/Add-secure_modules-call.patch
@@ -11,28 +11,27 @@ 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 +++++++
+ include/linux/module.h |  6 ++++++
  kernel/module.c        | 10 ++++++++++
- 2 files changed, 17 insertions(+)
+ 2 files changed, 16 insertions(+)
 
 diff --git a/include/linux/module.h b/include/linux/module.h
-index 1e5436042eb0..6b99261cbb4b 100644
+index 7ffe0851d244..3da68fd1f657 100644
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
-@@ -508,6 +508,8 @@ int unregister_module_notifier(struct notifier_block *nb);
- 
- extern void print_modules(void);
+@@ -515,6 +515,8 @@ static inline bool module_requested_async_probing(struct module *module)
+ 	return module && module->async_probe_requested;
+ }
  
 +extern bool secure_modules(void);
 +
  #else /* !CONFIG_MODULES... */
  
  /* Given an address, look for it in the exception tables. */
-@@ -618,6 +620,11 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
- static inline void print_modules(void)
- {
+@@ -631,6 +633,10 @@ static inline bool module_requested_async_probing(struct module *module)
+ 	return false;
  }
-+
+ 
 +static inline bool secure_modules(void)
 +{
 +	return false;
@@ -41,10 +40,10 @@ index 1e5436042eb0..6b99261cbb4b 100644
  
  #ifdef CONFIG_SYSFS
 diff --git a/kernel/module.c b/kernel/module.c
-index cfc9e843a924..17738285d7a2 100644
+index f80a97f7da1f..5d3e6c6191fa 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -3915,3 +3915,13 @@ void module_layout(struct module *mod,
+@@ -3925,3 +3925,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 18c145132..af76163f6 100644
--- a/Add-sysrq-option-to-disable-secure-boot-mode.patch
+++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch
@@ -81,18 +81,18 @@ index 421e29e4cd81..61c1eb97806c 100644
  	input_set_drvdata(udev->dev, udev);
  
 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
-index 1c4791033b72..04d5f0033564 100644
+index 2847108cc8dd..e8225c68dbc5 100644
 --- a/drivers/tty/sysrq.c
 +++ b/drivers/tty/sysrq.c
-@@ -464,6 +464,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
- 	&sysrq_showstate_blocked_op,	/* w */
+@@ -465,6 +465,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
+ 	/* x: May be registered on mips for TLB dump */
  	/* x: May be registered on ppc/powerpc for xmon */
  	/* x: May be registered on sparc64 for global PMU dump */
 +	/* x: May be registered on x86_64 for disabling secure boot */
  	NULL,				/* x */
  	/* y: May be registered on sparc64 for global register dump */
  	NULL,				/* y */
-@@ -507,7 +508,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
+@@ -508,7 +509,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p)
                  sysrq_key_table[i] = op_p;
  }
  
@@ -101,7 +101,7 @@ index 1c4791033b72..04d5f0033564 100644
  {
  	struct sysrq_key_op *op_p;
  	int orig_log_level;
-@@ -527,11 +528,15 @@ void __handle_sysrq(int key, bool check_mask)
+@@ -528,11 +529,15 @@ void __handle_sysrq(int key, bool check_mask)
  
          op_p = __sysrq_get_key_op(key);
          if (op_p) {
@@ -118,7 +118,7 @@ index 1c4791033b72..04d5f0033564 100644
  			pr_cont("%s\n", op_p->action_msg);
  			console_loglevel = orig_log_level;
  			op_p->handler(key);
-@@ -563,7 +568,7 @@ void __handle_sysrq(int key, bool check_mask)
+@@ -564,7 +569,7 @@ void __handle_sysrq(int key, bool check_mask)
  void handle_sysrq(int key)
  {
  	if (sysrq_on())
@@ -127,7 +127,7 @@ index 1c4791033b72..04d5f0033564 100644
  }
  EXPORT_SYMBOL(handle_sysrq);
  
-@@ -644,7 +649,7 @@ static void sysrq_do_reset(unsigned long _state)
+@@ -645,7 +650,7 @@ static void sysrq_do_reset(unsigned long _state)
  static void sysrq_handle_reset_request(struct sysrq_state *state)
  {
  	if (state->reset_requested)
@@ -136,7 +136,7 @@ index 1c4791033b72..04d5f0033564 100644
  
  	if (sysrq_reset_downtime_ms)
  		mod_timer(&state->keyreset_timer,
-@@ -795,8 +800,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq,
+@@ -796,8 +801,10 @@ static bool sysrq_handle_keypress(struct sysrq_state *sysrq,
  
  	default:
  		if (sysrq->active && value && value != 2) {
@@ -148,7 +148,7 @@ index 1c4791033b72..04d5f0033564 100644
  		}
  		break;
  	}
-@@ -1076,7 +1083,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
+@@ -1077,7 +1084,7 @@ static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
  
  		if (get_user(c, buf))
  			return -EFAULT;
@@ -228,7 +228,7 @@ index 4121345498e0..0ff3cef5df96 100644
  
  	return 0;
 diff --git a/kernel/module.c b/kernel/module.c
-index e7065d683640..731d2653c60d 100644
+index 4c682ab7e640..9be8d9c03c90 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/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch
index 784fe847a..b50b39e6c 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 b999fa381bf9..4e0037c349f6 100644
+index 7d1ffd2ae536..a3f17e13603c 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1744,6 +1744,15 @@ config SYSTEM_TRUSTED_KEYRING
+@@ -1751,6 +1751,15 @@ config SYSTEM_TRUSTED_KEYRING
  
  	  Keys in this keyring are used by module signature checking.
  
diff --git a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
index 95d8a020e..640a9a791 100644
--- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
@@ -42,10 +42,10 @@ index 1ed1fa0ea172..6d392cbf7243 100644
  	efi_guid_t guid;
  	u64 table;
 diff --git a/init/Kconfig b/init/Kconfig
-index 4e0037c349f6..f3e3a0d45d40 100644
+index a3f17e13603c..021d080ecf6c 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1898,6 +1898,15 @@ config MODULE_SIG_ALL
+@@ -1905,6 +1905,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/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
index f7eb3d759..fb9f0eed2 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 fd66d220c115..d5be5fb06be0 100644
+index afe7e2bbbc23..1ddd13bb0942 100644
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
-@@ -3909,7 +3909,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -3923,7 +3923,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.
diff --git a/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch b/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
index 2a161bb77..1db0a2386 100644
--- a/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
+++ b/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  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 853079eb0080..645302a6ada4 100644
+index ab90dc7f00f3..528961b32e92 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
 @@ -109,6 +109,27 @@
diff --git a/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch b/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
deleted file mode 100644
index 7340cd1da..000000000
--- a/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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 dbb3f4d2bf84..b2e14381dd1c 100644
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -81,6 +81,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 */
-@@ -218,6 +225,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"
diff --git a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch b/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
index 9bba4808a..829bd16ef 100644
--- a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
+++ b/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] arm: dts: am335x-bone-common: setup default pinmux
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
- arch/arm/boot/dts/am335x-bone-common.dtsi | 222 ++++++++++++++++++++++++++++++
- 1 file changed, 222 insertions(+)
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 171 ++++++++++++++++++++++++++++++
+ 1 file changed, 171 insertions(+)
 
 diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index b2e14381dd1c..853079eb0080 100644
+index fec78349c1f3..ab90dc7f00f3 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
 @@ -95,6 +95,20 @@
@@ -115,7 +115,7 @@ index b2e14381dd1c..853079eb0080 100644
  &usb {
  	status = "okay";
  };
-@@ -259,6 +341,106 @@
+@@ -285,6 +367,55 @@
  	};
  };
  
@@ -168,61 +168,10 @@ index b2e14381dd1c..853079eb0080 100644
 +		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 {
-@@ -366,4 +548,44 @@
+@@ -393,4 +524,44 @@
  
  &sham {
  	status = "okay";
diff --git a/blk-loop-avoid-too-many-pending-work-IO.patch b/blk-loop-avoid-too-many-pending-work-IO.patch
deleted file mode 100644
index 568fc6b9c..000000000
--- a/blk-loop-avoid-too-many-pending-work-IO.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From: Ming Lei <ming.lei@canonical.com>
-Date: Tue, 28 Apr 2015 14:40:49 -0400
-Subject: [PATCH] blk: loop: avoid too many pending work IO
-
-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 d7173cb1ea76..4db0301420b0 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 32, 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) >= 32)
-+		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 {
-+		cmd->per_work_io = true;
-+		atomic_inc(&lo->pending_per_work_io);
- 		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 301c27f8323f..eb855f57a62d 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;
- };
- 
diff --git a/config-arm-generic b/config-arm-generic
index 740a53d9e..d884c8694 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -47,6 +47,7 @@ CONFIG_KERNEL_MODE_NEON=y
 CONFIG_ARM_CCI=y
 CONFIG_ARM_CCN=y
 CONFIG_ARM_CCI400_PMU=y
+CONFIG_ARM_CCI500_PMU=y
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_GIC=y
@@ -152,6 +153,7 @@ CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_DUAL_ROLE=y
 CONFIG_USB_DWC3_PCI=m
 # CONFIG_USB_DWC3_DEBUG is not set
+CONFIG_USB_DWC3_ULPI=y
 CONFIG_DW_WATCHDOG=m
 CONFIG_PCIE_DW=y
 # CONFIG_MMC_DW_EXYNOS is not set
@@ -330,3 +332,7 @@ CONFIG_CMA_AREAS=7
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_LEGACY_SYSFS=y
+
+CONFIG_VFIO_PLATFORM=m
+# CONFIG_VFIO_AMBA is not set
+# CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set
diff --git a/config-arm64 b/config-arm64
index 9cadaa7ff..557b95eaf 100644
--- a/config-arm64
+++ b/config-arm64
@@ -12,6 +12,7 @@ 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_HISI is not set
 # CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_QCOM is not set
@@ -128,6 +129,7 @@ CONFIG_HOTPLUG_PCI=y
 
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 CONFIG_I2C_SCMI=m
+CONFIG_I2C_XGENE_SLIMPRO=m
 CONFIG_SENSORS_ACPI_POWER=m
 
 CONFIG_ACPI=y
@@ -168,5 +170,6 @@ CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 
 # CONFIG_FSL_MC_BUS is not set
+# CONFIG_ARM_TIMER_SP804 is not set
 
 CONFIG_ARM_SMMU_V3=y
diff --git a/config-armv7 b/config-armv7
index 9934ac8cc..5be807456 100644
--- a/config-armv7
+++ b/config-armv7
@@ -247,6 +247,7 @@ CONFIG_TI_CPTS=y
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_TI_EMIF=m
 CONFIG_DRM_TILCDC=m
+# CONFIG_DRM_TILCDC_SLAVE_COMPAT is not set
 CONFIG_SPI_DAVINCI=m
 CONFIG_SND_DAVINCI_SOC=m
 CONFIG_SND_DAVINCI_SOC_I2S=m
@@ -303,6 +304,7 @@ CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_QCOM_DML=m
 CONFIG_QCOM_BAM_DMA=m
 CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_PM=y
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_USB_DWC3_QCOM=m
@@ -339,6 +341,7 @@ CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_IMX6SX=y
+CONFIG_SOC_IMX7D=y
 # CONFIG_SOC_LS1021A is not set
 # CONFIG_SOC_VF610 is not set
 CONFIG_ARM_IMX6Q_CPUFREQ=m
diff --git a/config-armv7-generic b/config-armv7-generic
index fbdef0244..fb4bb2852 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -73,6 +73,8 @@ CONFIG_ARCH_VIRT=y
 # CONFIG_ARCH_DIGICOLOR is not set
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_UNIPHIER is not set
+# CONFIG_ARCH_ZX is not set
 
 # errata
 # v5/v6
@@ -108,6 +110,7 @@ CONFIG_PJ4B_ERRATA_4742=y
 CONFIG_SMP_ON_UP=y
 CONFIG_HIGHMEM=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ARM_MODULE_PLTS is not set
 
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
@@ -281,6 +284,8 @@ CONFIG_DRM_EXYNOS_DPI=y
 CONFIG_DRM_EXYNOS_DSI=y
 CONFIG_DRM_EXYNOS_FIMC=y
 CONFIG_DRM_EXYNOS_FIMD=y
+CONFIG_DRM_EXYNOS5433_DECON=y
+CONFIG_DRM_EXYNOS_MIC=y
 CONFIG_DRM_EXYNOS7_DECON=y
 CONFIG_DRM_EXYNOS_G2D=y
 CONFIG_DRM_EXYNOS_GSC=y
@@ -393,6 +398,7 @@ CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
 CONFIG_TEGRA_SOCTHERM=m
 CONFIG_TEGRA_MC=y
+CONFIG_TEGRA124_EMC=y
 CONFIG_ARM_TEGRA_DEVFREQ=m
 
 # Jetson TK1
@@ -659,6 +665,7 @@ CONFIG_EEPROM_93XX46=m
 # Sound
 CONFIG_SND_ARM=y
 CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_AC97_CODEC=y
 
 # Displays
 CONFIG_BACKLIGHT_TPS65217=m
@@ -866,6 +873,7 @@ CONFIG_R8188EU=m
 # CONFIG_SERIAL_MAX310X is not set
 # CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_BCM63XX is not set
+# CONFIG_SERIAL_STM32 is not set
 # CONFIG_FB_XILINX is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_BRCMSTB_GISB_ARB is not set
@@ -897,6 +905,10 @@ CONFIG_R8188EU=m
 # CONFIG_INPUT_TPS65218_PWRBUTTON is not set
 # CONFIG_CLK_QORIQ is not set
 # CONFIG_QORIQ_CPUFREQ is not set
+# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
+# CONFIG_SND_SOC_APQ8016_SBC is not set
+# CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_EXTCON_AXP288 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 9f5f61e08..05105b935 100644
--- a/config-generic
+++ b/config-generic
@@ -573,6 +573,7 @@ CONFIG_BLK_DEV_SX8=m
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_AHCI_PLATFORM=m
+# CONFIG_AHCI_CEVA is not set
 CONFIG_SATA_INIC162X=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
@@ -675,6 +676,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_SMQ=m
 CONFIG_DM_CACHE_CLEANER=m
 # CONFIG_DM_ERA is not set
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
@@ -1739,13 +1741,13 @@ CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
 CONFIG_B43_BCMA=y
 CONFIG_B43_BCMA_PIO=y
-# CONFIG_B43_DEBUG is not set
+CONFIG_B43_DEBUG=y
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_HT=y
 CONFIG_B43_PHY_G=y
 CONFIG_B43LEGACY=m
-# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43LEGACY_DMA=y
 CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -2437,6 +2439,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_RSA=y
 # CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_INGENIC is not set
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
 # CONFIG_MOXA_INTELLIO is not set
@@ -2739,6 +2742,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # CONFIG_MCP4725 is not set
 # CONFIG_ITG3200 is not set
 # CONFIG_APDS9300 is not set
+CONFIG_BH1750=m
 CONFIG_CM32181=m
 # CONFIG_CM3232 is not set
 # CONFIG_CM3323 is not set
@@ -2747,6 +2751,7 @@ CONFIG_CM32181=m
 # CONFIG_TSL2583 is not set
 # CONFIG_TSL2x7x is not set
 # CONFIG_LTR501 is not set
+CONFIG_STK3310=m
 # CONFIG_TCS3472 is not set
 # CONFIG_TSL4531 is not set
 # CONFIG_NAU7802 is not set
@@ -2758,9 +2763,11 @@ CONFIG_CM32181=m
 # CONFIG_INV_MPU6050_IIO is not set
 CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
+# CONFIG_BMC150_MAGN is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+CONFIG_ACPI_ALS=m
 # CONFIG_ADJD_S311 is not set
 # CONFIG_AL3320A is not set
 # CONFIG_SENSORS_TSL2563 is not set
@@ -2777,6 +2784,8 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_MMA8452 is not set
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
 # CONFIG_AD7266 is not set
 # CONFIG_AD7298 is not set
 # CONFIG_AD7476 is not set
@@ -2797,6 +2806,7 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_AD5764 is not set
 # CONFIG_AD5791 is not set
 # CONFIG_AD7303 is not set
+# CONFIG_M62332 is not set
 # CONFIG_AD9523 is not set
 # CONFIG_ADF4350 is not set
 # CONFIG_ADIS16080 is not set
@@ -3076,6 +3086,9 @@ CONFIG_DRM_CIRRUS_QEMU=m  # do not enable on f17 or older
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RADEON_UMS is not set
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_I810 is not set
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MGAG200=m  # do not enable on f17 or older
@@ -3099,6 +3112,7 @@ CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_QXL=m
 CONFIG_DRM_BOCHS=m
+CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_DRM_PTN3460=m
 CONFIG_DRM_PS8622=m
 # CONFIG_DRM_PANEL is not set
@@ -3796,6 +3810,7 @@ CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_GYRO_3D=m
 CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+# CONFIG_MMC35240 is not set
 CONFIG_HID_SENSOR_ALS=m
 # CONFIG_HID_SENSOR_PROX is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
@@ -4041,10 +4056,14 @@ CONFIG_USB_APPLEDISPLAY=m
 # Physical Layer USB driver
 CONFIG_USB_PHY=y
 # CONFIG_USB_OTG_FSM is not set
+CONFIG_USB_ULPI_BUS=m
 
 # CONFIG_GENERIC_PHY is not set
 # CONFIG_PHY_ST_SPEAR1310_MIPHY is not set
 # CONFIG_PHY_ST_SPEAR1340_MIPHY is not set
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_TUSB1210 is not set
 # CONFIG_AM335X_PHY_USB is not set
 # CONFIG_SAMSUNG_USBPHY is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
@@ -4280,6 +4299,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
 CONFIG_PROC_VMCORE=y
+CONFIG_PROC_CHILDREN=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
@@ -4366,8 +4386,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m
-# CONFIG_SUNRPC_XPRT_RDMA_SERVER is not set
+CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_SUNRPC_DEBUG=y
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_CIFS=m
@@ -4837,6 +4856,8 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_BANG_BANG is not set
 # CONFIG_THERMAL_EMULATION is not set
 # CONFIG_THERMAL_OF is not set
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 # CONFIG_CPU_THERMAL is not set
 
 CONFIG_INOTIFY=y
@@ -4856,7 +4877,7 @@ CONFIG_PM_DEBUG=y
 # CONFIG_DPM_WATCHDOG is not set # revisit this in debug
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
-# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_TEST_SUSPEND=y
 # CONFIG_PM_OPP is not set
 # CONFIG_PM_AUTOSLEEP is not set
 # CONFIG_PM_WAKELOCKS is not set
@@ -5153,6 +5174,7 @@ CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_MF624 is not set
+# CONFIG_UIO_PRUSS is not set
 
 CONFIG_VFIO=m
 CONFIG_VFIO_IOMMU_TYPE1=m
@@ -5255,6 +5277,7 @@ CONFIG_UWB_I1480U=m
 
 CONFIG_STAGING=y
 # CONFIG_ANDROID is not set
+# CONFIG_STAGING_BOARD is not set
 CONFIG_STAGING_MEDIA=y
 # CONFIG_DVB_AS102 is not set
 # CONFIG_SLICOSS is not set
diff --git a/config-nodebug b/config-nodebug
index 01008d646..6c098422a 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -2,100 +2,100 @@ CONFIG_SND_VERBOSE_PRINTK=y
 CONFIG_SND_DEBUG=y
 CONFIG_SND_PCM_XRUN_DEBUG=y
 
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+CONFIG_DEBUG_ATOMIC_SLEEP=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_DEBUG_MUTEXES=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
 # CONFIG_PROVE_RCU_REPEATEDLY is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_DEBUG_PER_CPU_MAPS=y
 CONFIG_CPUMASK_OFFSTACK=y
 
-# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
+CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
 
-# 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_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_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_DEBUG_SG is not set
-# CONFIG_DEBUG_PI_LIST 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_OBJECTS is not set
+CONFIG_DEBUG_OBJECTS=y
 # CONFIG_DEBUG_OBJECTS_SELFTEST is not set
-# 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_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
+CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
 
 CONFIG_X86_PTDUMP=y
-# CONFIG_ARM64_PTDUMP is not set
-# CONFIG_EFI_PGT_DUMP is not set
+CONFIG_ARM64_PTDUMP=y
+CONFIG_EFI_PGT_DUMP=y
 
-# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_CAN_DEBUG_DEVICES=y
 
-# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODULE_FORCE_UNLOAD=y
 
 
-# CONFIG_DEBUG_NOTIFIERS is not set
+CONFIG_DEBUG_NOTIFIERS=y
 
-# CONFIG_DMA_API_DEBUG is not set
+CONFIG_DMA_API_DEBUG=y
 
-# CONFIG_MMIOTRACE is not set
+CONFIG_MMIOTRACE=y
 
-# CONFIG_DEBUG_CREDENTIALS is not set
+CONFIG_DEBUG_CREDENTIALS=y
 
 # off in both production debug and nodebug builds,
 #  on in rawhide nodebug builds
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 
-# CONFIG_EXT4_DEBUG is not set
+CONFIG_EXT4_DEBUG=y
 
 # CONFIG_XFS_WARN is not set
 
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_DEBUG_PERF_USE_VMALLOC=y
 
-# CONFIG_JBD2_DEBUG is not set
+CONFIG_JBD2_DEBUG=y
 
-# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_NFSD_FAULT_INJECTION=y
 
-# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_DEBUG_BLK_CGROUP=y
 
-# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_DRBD_FAULT_INJECTION=y
 
-# CONFIG_ATH_DEBUG is not set
-# CONFIG_CARL9170_DEBUGFS is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_ATH_DEBUG=y
+CONFIG_CARL9170_DEBUGFS=y
+CONFIG_IWLWIFI_DEVICE_TRACING=y
 
 # CONFIG_RTLWIFI_DEBUG is not set
 
-# CONFIG_DEBUG_OBJECTS_WORK is not set
+CONFIG_DEBUG_OBJECTS_WORK=y
 
-# CONFIG_DMADEVICES_DEBUG is not set
-# CONFIG_DMADEVICES_VDEBUG is not set
+CONFIG_DMADEVICES_DEBUG=y
+CONFIG_DMADEVICES_VDEBUG=y
 
 CONFIG_PM_ADVANCED_DEBUG=y
 
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_QUOTA_DEBUG is not set
+CONFIG_CEPH_LIB_PRETTYDEBUG=y
+CONFIG_QUOTA_DEBUG=y
 
 
 CONFIG_KGDB_KDB=y
@@ -103,18 +103,18 @@ CONFIG_KDB_DEFAULT_ENABLE=0x0
 CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 
-# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set
+CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
 # CONFIG_PERCPU_TEST is not set
-# CONFIG_TEST_LIST_SORT is not set
+CONFIG_TEST_LIST_SORT=y
 # CONFIG_TEST_STRING_HELPERS is not set
 
-# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 
-# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 
-# CONFIG_DEBUG_KMEMLEAK is not set
+CONFIG_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
 # CONFIG_DEBUG_KMEMLEAK_TEST is not set
 CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
@@ -125,7 +125,7 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 
 # CONFIG_SPI_DEBUG is not set
 
-# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
+CONFIG_X86_DEBUG_STATIC_CPU_HAS=y
 
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_LATENCYTOP is not set
diff --git a/config-x86-generic b/config-x86-generic
index ae330b44e..785d27123 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -334,6 +334,7 @@ CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_FAM15H_POWER=m
 CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_DELL_SMM=m
 
 # CONFIG_CPA_DEBUG is not set
 
@@ -345,7 +346,7 @@ CONFIG_SP5100_TCO=m
 
 # CONFIG_MEMTEST is not set
 # CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_MAXSMP is not set
+CONFIG_MAXSMP=y
 
 
 CONFIG_HP_ILO=m
@@ -516,7 +517,9 @@ 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_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_AC97_CODEC=m
+# CONFIG_SND_SOC_TAS571X is not set
 
 
 # CONFIG_INTEL_POWERCLAMP is not set
diff --git a/config-x86_64-generic b/config-x86_64-generic
index f6066c8e0..bb3253fbb 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -52,6 +52,9 @@ CONFIG_ACPI_HOTPLUG_MEMORY=y
 
 # CONFIG_INTEL_SCU_IPC is not set
 
+CONFIG_SCIF_BUS=m
+CONFIG_SCIF=m
+
 CONFIG_INTEL_MIC_HOST=m
 CONFIG_INTEL_MIC_CARD=m
 CONFIG_INTEL_MIC_BUS=m
diff --git a/crash-driver.patch b/crash-driver.patch
index 31aff3680..a897182fe 100644
--- a/crash-driver.patch
+++ b/crash-driver.patch
@@ -269,7 +269,7 @@ index 000000000000..fd4736ec99f5
 +
 +#endif /* _X86_CRASH_H */
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index a4af8221751e..193f1a7c2ce5 100644
+index a043107da2af..b272397f306a 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
 @@ -4,6 +4,9 @@
@@ -283,10 +283,10 @@ index a4af8221751e..193f1a7c2ce5 100644
  
  config DEVMEM
 diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index d06cde26031b..0832636fd9bc 100644
+index d8a7579300d2..31c83630f593 100644
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
-@@ -62,3 +62,5 @@ js-rtc-y = rtc.o
+@@ -60,3 +60,5 @@ js-rtc-y = rtc.o
  
  obj-$(CONFIG_TILE_SROM)		+= tile-srom.o
  obj-$(CONFIG_XILLYBUS)		+= xillybus/
diff --git a/criu-no-expert.patch b/criu-no-expert.patch
index ec6ac62b3..d88f5a13e 100644
--- a/criu-no-expert.patch
+++ b/criu-no-expert.patch
@@ -9,19 +9,19 @@ Upstream-status: Fedora mustard
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/init/Kconfig b/init/Kconfig
-index f3e3a0d45d40..41765c00d633 100644
+index 021d080ecf6c..d760621a625f 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1130,7 +1130,7 @@ config DEBUG_BLK_CGROUP
+@@ -1136,7 +1136,7 @@ config CGROUP_WRITEBACK
  endif # CGROUPS
  
  config CHECKPOINT_RESTORE
 -	bool "Checkpoint/restore support" if EXPERT
 +	bool "Checkpoint/restore support"
+ 	select PROC_CHILDREN
  	default n
  	help
- 	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1141,7 +1141,7 @@ config CHECKPOINT_RESTORE
+@@ -1148,7 +1148,7 @@ config CHECKPOINT_RESTORE
  	  If unsure, say N here.
  
  menuconfig NAMESPACES
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch
index 24a13946d..68646bb7c 100644
--- a/drm-i915-hush-check-crtc-state.patch
+++ b/drm-i915-hush-check-crtc-state.patch
@@ -14,10 +14,10 @@ Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/0
  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 d0f3cbc87474..177016c009c5 100644
+index dcb1d25d6f05..60138a218a11 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -11308,7 +11308,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -12316,7 +12316,7 @@ check_crtc_state(struct drm_device *dev)
  
  		if (active &&
  		    !intel_pipe_config_compare(dev, crtc->config, &pipe_config)) {
diff --git a/drm-i915-turn-off-wc-mmaps.patch b/drm-i915-turn-off-wc-mmaps.patch
index af314cdd1..c81b89226 100644
--- a/drm-i915-turn-off-wc-mmaps.patch
+++ b/drm-i915-turn-off-wc-mmaps.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] drm: i915: turn off wc mmaps
  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 68e0c85a17cf..21118db9aee2 100644
+index d2df321ba634..775a5b11a366 100644
 --- a/drivers/gpu/drm/i915/i915_dma.c
 +++ b/drivers/gpu/drm/i915/i915_dma.c
 @@ -151,7 +151,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
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 475f503a4..c6f735195 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 39645abe44e3..c334ecdc0506 100644
+index 0ea05e5528c9..df0d6d8603fb 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -1698,7 +1698,8 @@ config EFI_MIXED
+@@ -1693,7 +1693,8 @@ config EFI_MIXED
  	   If unsure, say N.
  
  config EFI_SECURE_BOOT_SIG_ENFORCE
diff --git a/filter-modules.sh b/filter-modules.sh
index f02ec47be..4ae5898f3 100755
--- a/filter-modules.sh
+++ b/filter-modules.sh
@@ -32,7 +32,7 @@ netprots="appletalk atm ax25 batman-adv bluetooth dccp dsa ieee802154 irda l2tp
 
 drmdrvs="ast gma500 mgag200 via nouveau"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs iscsi_tcp megaraid pmcraid qla1280 9pnet_rdma svcrdma xprtrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs iscsi_tcp megaraid pmcraid qla1280 9pnet_rdma rpcrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user"
 
 # Grab the arch-specific filter list overrides
 source ./filter-$2.sh
diff --git a/firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch b/firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
index 0b3a70256..48533e206 100644
--- a/firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
+++ b/firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
@@ -75,10 +75,10 @@ Signed-off-by: Laura Abbott <labbott@fedoraproject.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
-index 171841ad1008..48ce9acf04c4 100644
+index 9c4288362a8e..9390c3643f9c 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,
+@@ -1134,7 +1134,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
  		}
  	} else {
  		ret = usermodehelper_read_trylock();
diff --git a/kernel.spec b/kernel.spec
index 2d3277585..cedef2a55 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
@@ -122,7 +122,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
@@ -509,101 +509,93 @@ Patch458: arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
 
 Patch459: arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
 
-Patch460: arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
+Patch460: arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
 
-Patch461: arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
+Patch461: arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
 
-Patch462: arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
+Patch462: pinctrl-pinctrl-single-must-be-initialized-early.patch
 
-Patch463: pinctrl-pinctrl-single-must-be-initialized-early.patch
+Patch463: arm-i.MX6-Utilite-device-dtb.patch
 
-Patch464: arm-i.MX6-Utilite-device-dtb.patch
+Patch464: arm-highbank-l2-reverts.patch
 
-Patch465: arm-highbank-l2-reverts.patch
+Patch465: Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
 
-Patch466: Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
+Patch466: input-kill-stupid-messages.patch
 
-Patch467: input-kill-stupid-messages.patch
+Patch467: die-floppy-die.patch
 
-Patch468: die-floppy-die.patch
+Patch468: no-pcspkr-modalias.patch
 
-Patch469: no-pcspkr-modalias.patch
+Patch469: input-silence-i8042-noise.patch
 
-Patch470: input-silence-i8042-noise.patch
+Patch470: silence-fbcon-logo.patch
 
-Patch471: silence-fbcon-logo.patch
+Patch471: Kbuild-Add-an-option-to-enable-GCC-VTA.patch
 
-Patch472: Kbuild-Add-an-option-to-enable-GCC-VTA.patch
+Patch472: crash-driver.patch
 
-Patch473: crash-driver.patch
+Patch473: Add-secure_modules-call.patch
 
-Patch474: Add-secure_modules-call.patch
+Patch474: PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
 
-Patch475: PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
+Patch475: x86-Lock-down-IO-port-access-when-module-security-is.patch
 
-Patch476: x86-Lock-down-IO-port-access-when-module-security-is.patch
+Patch476: ACPI-Limit-access-to-custom_method.patch
 
-Patch477: ACPI-Limit-access-to-custom_method.patch
+Patch477: asus-wmi-Restrict-debugfs-interface-when-module-load.patch
 
-Patch478: asus-wmi-Restrict-debugfs-interface-when-module-load.patch
+Patch478: Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
 
-Patch479: Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
+Patch479: acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
 
-Patch480: acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
+Patch480: kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
 
-Patch481: kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
+Patch481: x86-Restrict-MSR-access-when-module-loading-is-restr.patch
 
-Patch482: x86-Restrict-MSR-access-when-module-loading-is-restr.patch
+Patch482: Add-option-to-automatically-enforce-module-signature.patch
 
-Patch483: Add-option-to-automatically-enforce-module-signature.patch
+Patch483: efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
 
-Patch484: efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
+Patch484: efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
 
-Patch485: efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
+Patch485: efi-Add-EFI_SECURE_BOOT-bit.patch
 
-Patch486: efi-Add-EFI_SECURE_BOOT-bit.patch
+Patch486: hibernate-Disable-in-a-signed-modules-environment.patch
 
-Patch487: hibernate-Disable-in-a-signed-modules-environment.patch
+Patch487: Add-EFI-signature-data-types.patch
 
-Patch488: Add-EFI-signature-data-types.patch
+Patch488: Add-an-EFI-signature-blob-parser-and-key-loader.patch
 
-Patch489: Add-an-EFI-signature-blob-parser-and-key-loader.patch
+Patch489: KEYS-Add-a-system-blacklist-keyring.patch
 
-Patch490: KEYS-Add-a-system-blacklist-keyring.patch
+Patch490: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
 
-Patch491: MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+Patch491: MODSIGN-Support-not-importing-certs-from-db.patch
 
-Patch492: MODSIGN-Support-not-importing-certs-from-db.patch
+Patch492: Add-sysrq-option-to-disable-secure-boot-mode.patch
 
-Patch493: Add-sysrq-option-to-disable-secure-boot-mode.patch
+Patch493: drm-i915-hush-check-crtc-state.patch
 
-Patch494: drm-i915-hush-check-crtc-state.patch
+Patch494: disable-i8042-check-on-apple-mac.patch
 
-Patch495: disable-i8042-check-on-apple-mac.patch
+Patch495: lis3-improve-handling-of-null-rate.patch
 
-Patch496: lis3-improve-handling-of-null-rate.patch
+Patch496: watchdog-Disable-watchdog-on-virtual-machines.patch
 
-Patch497: watchdog-Disable-watchdog-on-virtual-machines.patch
+Patch497: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 
-Patch498: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
+Patch498: criu-no-expert.patch
 
-Patch499: criu-no-expert.patch
+Patch499: ath9k-rx-dma-stop-check.patch
 
-Patch500: ath9k-rx-dma-stop-check.patch
+Patch500: xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
 
-Patch501: xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
+Patch501: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
 
-Patch502: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
+Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
 
-Patch503: blk-loop-avoid-too-many-pending-work-IO.patch
-
-Patch504: media-Fix-regression-in-some-more-dib0700-based-devi.patch
-
-Patch505: v4l-uvcvideo-Fix-incorrect-bandwidth-with-Chicony-de.patch
-
-Patch506: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
-
-Patch507: drm-i915-turn-off-wc-mmaps.patch
+Patch503: drm-i915-turn-off-wc-mmaps.patch
 
 
 # END OF PATCH DEFINITIONS
@@ -1187,8 +1179,6 @@ ApplyPatch arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
 
 ApplyPatch arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
 
-ApplyPatch arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
-
 ApplyPatch arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
 
 ApplyPatch arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
@@ -1273,12 +1263,6 @@ ApplyPatch xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
 
 ApplyPatch Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
 
-ApplyPatch blk-loop-avoid-too-many-pending-work-IO.patch
-
-ApplyPatch media-Fix-regression-in-some-more-dib0700-based-devi.patch
-
-ApplyPatch v4l-uvcvideo-Fix-incorrect-bandwidth-with-Chicony-de.patch
-
 ApplyPatch firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch
 
 ApplyPatch drm-i915-turn-off-wc-mmaps.patch
@@ -2148,6 +2132,11 @@ fi
 #
 # 
 %changelog
+* Mon Jun 29 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git2.1
+- Linux v4.1-11235-gc63f887bdae8
+- Reenable debugging options.
+
+
 * Fri Jun 26 2015 Peter Robinson <pbrobinson@fedoraproject.org>
 - Reorganisation and cleanup of the powerpc configs
 
diff --git a/media-Fix-regression-in-some-more-dib0700-based-devi.patch b/media-Fix-regression-in-some-more-dib0700-based-devi.patch
deleted file mode 100644
index 590b22588..000000000
--- a/media-Fix-regression-in-some-more-dib0700-based-devi.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Thomas Reitmayr <treitmayr@devbase.at>
-Date: Fri, 1 May 2015 20:18:04 -0300
-Subject: [PATCH] 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 d7d55a20e959..c170523226aa 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),
- 			},
- 		},
- 
diff --git a/silence-fbcon-logo.patch b/silence-fbcon-logo.patch
index e5549546d..9569d2a5b 100644
--- a/silence-fbcon-logo.patch
+++ b/silence-fbcon-logo.patch
@@ -9,7 +9,7 @@ Upstream-status: Fedora mustard
  1 file changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
-index b97210671a81..2d12ad82fe75 100644
+index 658c34bb9076..25ab00980e4c 100644
 --- a/drivers/video/console/fbcon.c
 +++ b/drivers/video/console/fbcon.c
 @@ -634,13 +634,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
@@ -35,7 +35,7 @@ index b97210671a81..2d12ad82fe75 100644
  	}
  }
  #endif /* MODULE */
-@@ -3620,6 +3622,14 @@ static int __init fb_console_init(void)
+@@ -3621,6 +3623,14 @@ static int __init fb_console_init(void)
  	return 0;
  }
  
diff --git a/sources b/sources
index 9d862d14e..b83861875 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 fe9dc0f6729f36400ea81aa41d614c37  linux-4.1.tar.xz
 84e34c2f58901edcc5c840fe9893c02e  perf-man-4.1.tar.gz
-424d9767af06f914a4dccd5421a64f6d  patch-4.1-git1.xz
+537c8b62477152b275fc4bab0fd510bf  patch-4.1-git2.xz
diff --git a/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch b/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
index f02e9b744..79f58f775 100644
--- a/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
+++ b/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
@@ -13,10 +13,10 @@ Signed-off-by: Mark Langsdorf <mlangsdo@redhat.com>
  1 file changed, 7 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
-index 783e819139a7..4f93ef6942d8 100644
+index 890ad9d9d329..122b1fb12b7e 100644
 --- a/drivers/usb/host/xhci-plat.c
 +++ b/drivers/usb/host/xhci-plat.c
-@@ -84,14 +84,13 @@ static int xhci_plat_probe(struct platform_device *pdev)
+@@ -93,14 +93,13 @@ static int xhci_plat_probe(struct platform_device *pdev)
  	if (irq < 0)
  		return -ENODEV;
  
diff --git a/v4l-uvcvideo-Fix-incorrect-bandwidth-with-Chicony-de.patch b/v4l-uvcvideo-Fix-incorrect-bandwidth-with-Chicony-de.patch
deleted file mode 100644
index 77b2abb84..000000000
--- a/v4l-uvcvideo-Fix-incorrect-bandwidth-with-Chicony-de.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 18 May 2015 10:53:48 +0300
-Subject: [PATCH] v4l: uvcvideo: Fix incorrect bandwidth with Chicony device
- 04f2:b50b
-
-The "TOSHIBA Web Camera - 5M" Chicony device (04f2:b50b) seems to
-compute the bandwidth on 16 bits and erroneously sign-extend it to
-32 bits, resulting in a huge bandwidth value. Detect and fix that
-condition by setting the 16 MSBs to 0 when they're all equal to 1.
-
-Reported-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
----
- drivers/media/usb/uvc/uvc_video.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
-index 20ccc9d315dc..f839654ea436 100644
---- a/drivers/media/usb/uvc/uvc_video.c
-+++ b/drivers/media/usb/uvc/uvc_video.c
-@@ -119,6 +119,14 @@ static void uvc_fixup_video_ctrl(struct uvc_streaming *stream,
- 		ctrl->dwMaxVideoFrameSize =
- 			frame->dwMaxVideoFrameBufferSize;
- 
-+	/* The "TOSHIBA Web Camera - 5M" Chicony device (04f2:b50b) seems to
-+	 * compute the bandwidth on 16 bits and erroneously sign-extend it to
-+	 * 32 bits, resulting in a huge bandwidth value. Detect and fix that
-+	 * condition by setting the 16 MSBs to 0 when they're all equal to 1.
-+	 */
-+	if ((ctrl->dwMaxPayloadTransferSize & 0xffff0000) == 0xffff0000)
-+		ctrl->dwMaxPayloadTransferSize &= ~0xffff0000;
-+
- 	if (!(format->flags & UVC_FMT_FLAG_COMPRESSED) &&
- 	    stream->dev->quirks & UVC_QUIRK_FIX_BANDWIDTH &&
- 	    stream->intf->num_altsetting > 1) {