Refresh patches from f21 branch in the git tree

2015-01-29 16:06:31 -05:00 · 2015-01-29 16:06:31 -05:00 · f046ab9c33
parent 8821eb3824
commit f046ab9c33
37 changed files with 104 additions and 105 deletions
--- a/Add-EFI-signature-data-types.patch
+++ b/Add-EFI-signature-data-types.patch
@ -14,10 +14,10 @@ Signed-off-by: David Howells <dhowells@redhat.com>
 1 file changed, 20 insertions(+)

 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index ebe6a24cc1e1..5ce40e215f15 100644
+index 130ba866a24a..58d7feadd149 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -581,6 +581,12 @@ void efi_native_runtime_setup(void);
+@@ -586,6 +586,12 @@ void efi_native_runtime_setup(void);
 #define DEVICE_TREE_GUID \
     EFI_GUID(  0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 )
 
@ -30,7 +30,7 @@ index ebe6a24cc1e1..5ce40e215f15 100644
 typedef struct {
 	efi_guid_t guid;
 	u64 table;
-@@ -796,6 +802,20 @@ typedef struct _efi_file_io_interface {
+@@ -801,6 +807,20 @@ typedef struct _efi_file_io_interface {
 
 #define EFI_INVALID_TABLE_ADDR		(~0UL)
 
--- a/Add-option-to-automatically-enforce-module-signature.patch
+++ b/Add-option-to-automatically-enforce-module-signature.patch
@ -33,10 +33,10 @@ index 199f453cb4de..ec38acf00b40 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 36327438caf0..61542c282e70 100644
+index 41a503c15862..7b8969db8398 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -1566,6 +1566,16 @@ config EFI_MIXED
+@@ -1611,6 +1611,16 @@ config EFI_MIXED
 
 	   If unsure, say N.
 
@ -54,7 +54,7 @@ index 36327438caf0..61542c282e70 100644
 	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 de8eebd6f67c..975d11bfaf5b 100644
+index 1acf605a646d..6da2da7ac9c3 100644
 --- a/arch/x86/boot/compressed/eboot.c
 +++ b/arch/x86/boot/compressed/eboot.c
@@ -12,6 +12,7 @@
@ -65,7 +65,7 @@ index de8eebd6f67c..975d11bfaf5b 100644
 
 #undef memcpy			/* Use memcpy from misc.c */
 
-@@ -814,6 +815,37 @@ out:
+@@ -828,6 +829,37 @@ out:
 	return status;
 }
 
@ -103,7 +103,7 @@ index de8eebd6f67c..975d11bfaf5b 100644
 /*
  * See if we have Graphics Output Protocol
  */
-@@ -1389,6 +1421,10 @@ struct boot_params *efi_main(struct efi_config *c,
+@@ -1407,6 +1439,10 @@ struct boot_params *efi_main(struct efi_config *c,
 	else
 		setup_boot_services32(efi_early);
 
@ -129,10 +129,10 @@ index 225b0988043a..90dbfb73e11f 100644
 	 * The sentinel is set to a nonzero value (0xff) in header.S.
 	 *
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 41ead8d3bc0b..5a5cf7395724 100644
+index ab08aa2276fb..f4eb99432db1 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
-@@ -1142,6 +1142,12 @@ void __init setup_arch(char **cmdline_p)
+@@ -1150,6 +1150,12 @@ void __init setup_arch(char **cmdline_p)
 
 	io_delay_init();
 
@ -163,7 +163,7 @@ index 341a73ecea2e..cca08ac450e2 100644
 
 extern int modules_disabled; /* for sysctl */
 diff --git a/kernel/module.c b/kernel/module.c
-index f1d78afbe29f..ec12c156ea61 100644
+index 6507ffcb5445..cace4bd04956 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
@@ -3845,6 +3845,13 @@ void module_layout(struct module *mod,
--- a/Add-secure_modules-call.patch
+++ b/Add-secure_modules-call.patch
@ -41,7 +41,7 @@ index 71f282a4e307..341a73ecea2e 100644
 
 #ifdef CONFIG_SYSFS
 diff --git a/kernel/module.c b/kernel/module.c
-index 1c47139d161c..f1d78afbe29f 100644
+index 88cec1ddb1e3..6507ffcb5445 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
@@ -3844,3 +3844,13 @@ void module_layout(struct module *mod,
--- a/Add-sysrq-option-to-disable-secure-boot-mode.patch
+++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch
@ -15,7 +15,7 @@ Upstream-status: Fedora mustard
 7 files changed, 65 insertions(+), 10 deletions(-)

 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index fb282ff6a802..d291d16ba257 100644
+index bc31a43b31a0..5f80d12a55cb 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
@@ -70,6 +70,11 @@
@ -30,7 +30,7 @@ index fb282ff6a802..d291d16ba257 100644
 #include <video/edid.h>
 
 #include <asm/mtrr.h>
-@@ -1268,6 +1273,37 @@ void __init i386_reserve_resources(void)
+@@ -1277,6 +1282,37 @@ void __init i386_reserve_resources(void)
 
 #endif /* CONFIG_X86_32 */
 
@ -228,7 +228,7 @@ index 379650b984f8..070f29fefdc2 100644
 
 	return 0;
 diff --git a/kernel/module.c b/kernel/module.c
-index ec12c156ea61..1db033284ad3 100644
+index cace4bd04956..a33be993df25 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
@@ -108,9 +108,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */
--- a/HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch
+++ b/HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch
@ -19,7 +19,7 @@ Signed-off-by: Jiri Kosina <jkosina@suse.cz>
 4 files changed, 10 insertions(+)

 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index 12b6e67d9de0..bcf13015409c 100644
+index dfaccfca0688..84e15038b2f9 100644
 --- a/drivers/hid/hid-core.c
 +++ b/drivers/hid/hid-core.c
@@ -702,6 +702,11 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
@ -34,7 +34,7 @@ index 12b6e67d9de0..bcf13015409c 100644
 }
 
 static int hid_scan_main(struct hid_parser *parser, struct hid_item *item)
-@@ -1857,6 +1862,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
+@@ -1863,6 +1868,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },
@ -43,10 +43,10 @@ index 12b6e67d9de0..bcf13015409c 100644
 	{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
 diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index c3a712c8c915..ac6c46c169a5 100644
+index 0e28190480d7..4b7e06fc35c5 100644
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
-@@ -647,6 +647,7 @@
+@@ -651,6 +651,7 @@
 #define USB_DEVICE_ID_MS_SURFACE_PRO_2   0x0799
 #define USB_DEVICE_ID_MS_TOUCH_COVER_2   0x07a7
 #define USB_DEVICE_ID_MS_TYPE_COVER_2    0x07a9
@ -68,10 +68,10 @@ index 8ba17a946f2a..cacda43f6a6f 100644
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),
 		.driver_data = MS_PRESENTER },
 diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
-index 5014bb567b29..cebfaf288bd3 100644
+index 4477eb7457de..b27b3d33ebab 100644
 --- a/drivers/hid/usbhid/hid-quirks.c
 +++ b/drivers/hid/usbhid/hid-quirks.c
-@@ -77,6 +77,7 @@ static const struct hid_blacklist {
+@@ -79,6 +79,7 @@ static const struct hid_blacklist {
 	{ USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },
 	{ USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
 	{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET },
--- 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 80a6907f91c5..dfdd7f738247 100644
+index 2081a4d3d917..d99a519bb9ae 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1723,6 +1723,15 @@ config SYSTEM_TRUSTED_KEYRING
+@@ -1747,6 +1747,15 @@ config SYSTEM_TRUSTED_KEYRING
 
 	  Keys in this keyring are used by module signature checking.
 
--- a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
+++ b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
@ -43,10 +43,10 @@ Signed-off-by: Josh Stone <jistone@redhat.com>
 2 files changed, 21 insertions(+), 1 deletion(-)

 diff --git a/Makefile b/Makefile
-index 656f0b0cff53..130c09c7bc55 100644
+index 4e9328491c1e..2c2886edc16d 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -709,7 +709,11 @@ KBUILD_CFLAGS	+= -fomit-frame-pointer
+@@ -704,7 +704,11 @@ KBUILD_CFLAGS	+= -fomit-frame-pointer
 endif
 endif
 
@ -59,7 +59,7 @@ index 656f0b0cff53..130c09c7bc55 100644
 ifdef CONFIG_DEBUG_INFO
 ifdef CONFIG_DEBUG_INFO_SPLIT
 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index a28590083622..ce1107439d7d 100644
+index 4e35a5d767ed..27410417de1d 100644
 --- a/lib/Kconfig.debug
 +++ b/lib/Kconfig.debug
@@ -165,7 +165,23 @@ config DEBUG_INFO_DWARF4
--- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
+++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch
@ -25,10 +25,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
 create mode 100644 kernel/modsign_uefi.c

 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 41359e548bcb..db9e6118575e 100644
+index b1d686e9175e..4d41f4532127 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -587,6 +587,12 @@ void efi_native_runtime_setup(void);
+@@ -592,6 +592,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 )
 
@ -42,10 +42,10 @@ index 41359e548bcb..db9e6118575e 100644
 	efi_guid_t guid;
 	u64 table;
 diff --git a/init/Kconfig b/init/Kconfig
-index dfdd7f738247..3c866db603a7 100644
+index d99a519bb9ae..9ef459bb44b2 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1877,6 +1877,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
 
@ -62,7 +62,7 @@ index dfdd7f738247..3c866db603a7 100644
 	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
+index 17ea6d4a9a24..381fe2d56ed1 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_UID16) += uid16.o
--- a/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
+++ b/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
@ -16,7 +16,7 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
 3 files changed, 19 insertions(+), 2 deletions(-)

 diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
-index 6d04771e4903..f8886fe74b9d 100644
+index 2c6643fdc0cf..56333630ab77 100644
 --- a/drivers/pci/pci-sysfs.c
 +++ b/drivers/pci/pci-sysfs.c
@@ -30,6 +30,7 @@
@ -27,7 +27,7 @@ index 6d04771e4903..f8886fe74b9d 100644
 #include "pci.h"
 
 static int sysfs_initialized;	/* = 0 */
-@@ -704,6 +705,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj,
+@@ -703,6 +704,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj,
 	loff_t init_off = off;
 	u8 *data = (u8 *) buf;
 
@ -37,7 +37,7 @@ index 6d04771e4903..f8886fe74b9d 100644
 	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,
+@@ -997,6 +1001,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
 	resource_size_t start, end;
 	int i;
 
@ -47,7 +47,7 @@ index 6d04771e4903..f8886fe74b9d 100644
 	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,
+@@ -1098,6 +1105,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)
 {
--- 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 cdf839f9defe..c63cf93b00eb 100644
+index c268e2581ed6..fb9ea1172ba8 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,
--- 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 1edd5fdc629d..17a82652ac03 100644
+index f4c71d4a9ba3..37657d6d2433 100644
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
-@@ -3600,7 +3600,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -3720,7 +3720,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 1edd5fdc629d..17a82652ac03 100644
 	virtio_mmio.device=
 			[VMMIO] Memory mapped virtio (platform) device.
 diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index 8e7e18567ae6..a3d293806f96 100644
+index 41322591fb43..8a61e5dd397b 100644
 --- a/drivers/acpi/video.c
 +++ b/drivers/acpi/video.c
@@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot");
--- a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
+++ b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
@ -13,7 +13,7 @@ Signed-off-by: Josh Boyer <jwboyer@redhat.com>
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
-index 3abe9b223ba7..ee8f11cf65da 100644
+index 9964f70be98d..d95d258f606c 100644
 --- a/drivers/acpi/osl.c
 +++ b/drivers/acpi/osl.c
@@ -44,6 +44,7 @@
@ -24,7 +24,7 @@ index 3abe9b223ba7..ee8f11cf65da 100644
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
-@@ -245,7 +246,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
+@@ -255,7 +256,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
 acpi_physical_address __init acpi_os_get_root_pointer(void)
 {
 #ifdef CONFIG_KEXEC
--- a/acpi-video-Add-disable_native_backlight-quirk-for-De.patch
+++ b/acpi-video-Add-disable_native_backlight-quirk-for-De.patch
@ -9,18 +9,17 @@ backlight control does not work properly when using the native interfaces.
 BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1163574
 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
 ---
- drivers/acpi/video.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
+ drivers/acpi/video.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)

 diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index a3d293806f96..e109b2cfb5b3 100644
+index 8a61e5dd397b..25863442b6ae 100644
 --- a/drivers/acpi/video.c
 +++ b/drivers/acpi/video.c
-@@ -769,6 +769,16 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
- 		DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY 15 Notebook PC"),
+@@ -522,6 +522,15 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+ 		DMI_MATCH(DMI_PRODUCT_NAME, "370R4E/370R4V/370R5E/3570RE/370R5V"),
 		},
 	},
-+
 +	{
 +	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1163574 */
 +	 .callback = video_disable_native_backlight,
--- a/acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
+++ b/acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
@ -13,10 +13,10 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
 1 file changed, 9 insertions(+), 1 deletion(-)

 diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index e109b2cfb5b3..a8b7ee312493 100644
+index 25863442b6ae..5c4e35bebd3b 100644
 --- a/drivers/acpi/video.c
 +++ b/drivers/acpi/video.c
-@@ -769,7 +769,15 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
+@@ -505,7 +505,15 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
 		DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY 15 Notebook PC"),
 		},
 	},
@ -31,8 +31,8 @@ index e109b2cfb5b3..a8b7ee312493 100644
 +		},
 +	},
 	{
- 	 /* https://bugzilla.redhat.com/show_bug.cgi?id=1163574 */
 	 .callback = video_disable_native_backlight,
+ 	 .ident = "SAMSUNG 870Z5E/880Z5E/680Z5E",
 -- 
 2.1.0

--- 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,10 +9,10 @@ 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 86cdb52dbf8a..db4518ef755d 100644
+index 4991a1664773..096ddbe4c4b3 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -105,6 +105,27 @@
+@@ -102,6 +102,27 @@
 		>;
 	};
 
--- a/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
+++ b/arm-dts-am335x-bone-common-enable-and-use-i2c2.patch
@ -8,10 +8,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 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
+index 6cc25ed912ee..754b96c5dbb1 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -84,6 +84,13 @@
+@@ -81,6 +81,13 @@
 		>;
 	};
 
@ -25,7 +25,7 @@ index bde1777b62be..c7357bcc7d5c 100644
 	uart0_pins: pinmux_uart0_pins {
 		pinctrl-single,pins = <
 			0x170 (PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */
-@@ -220,6 +227,38 @@
+@@ -217,6 +224,38 @@
 		reg = <0x24>;
 	};
 
--- a/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
+++ b/arm-dts-am335x-bone-common-setup-default-pinmux-http.patch
@ -9,10 +9,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 1 file changed, 130 insertions(+)

 diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index c7357bcc7d5c..86cdb52dbf8a 100644
+index 754b96c5dbb1..4991a1664773 100644
 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -98,6 +98,13 @@
+@@ -95,6 +95,13 @@
 		>;
 	};
 
@ -26,7 +26,7 @@ index c7357bcc7d5c..86cdb52dbf8a 100644
 	clkout2_pin: pinmux_clkout2_pin {
 		pinctrl-single,pins = <
 			0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3)	/* xdma_event_intr1.clkout2 */
-@@ -178,6 +185,33 @@
+@@ -175,6 +182,33 @@
 			0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */
 		>;
 	};
@ -60,7 +60,7 @@ index c7357bcc7d5c..86cdb52dbf8a 100644
 };
 
 &uart0 {
-@@ -187,6 +221,13 @@
+@@ -184,6 +218,13 @@
 	status = "okay";
 };
 
@ -74,7 +74,7 @@ index c7357bcc7d5c..86cdb52dbf8a 100644
 &usb {
 	status = "okay";
 };
-@@ -261,6 +302,56 @@
+@@ -258,6 +299,56 @@
 	};
 };
 
@ -131,7 +131,7 @@ index c7357bcc7d5c..86cdb52dbf8a 100644
 /include/ "tps65217.dtsi"
 
 &tps {
-@@ -337,3 +428,42 @@
+@@ -339,3 +430,42 @@
 	cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
 	cd-inverted;
 };
--- a/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
+++ b/arm-dts-am335x-boneblack-add-cpu0-opp-points.patch
@ -8,10 +8,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 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
+index 5dcdcd173572..38439e097b26 100644
 --- a/arch/arm/boot/dts/am335x-boneblack.dts
 +++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -66,6 +66,24 @@
+@@ -71,6 +71,24 @@
 };
 
 / {
--- a/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
+++ b/arm-dts-am335x-boneblack-lcdc-add-panel-info.patch
@ -11,10 +11,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 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
+index 901739fcb85a..5dcdcd173572 100644
 --- a/arch/arm/boot/dts/am335x-boneblack.dts
 +++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -73,5 +73,18 @@
+@@ -78,5 +78,18 @@
 		pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
 		pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
 		status = "okay";
--- a/arm-dts-sun7i-bananapi.patch
+++ b/arm-dts-sun7i-bananapi.patch
@ -14,17 +14,17 @@ Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
 create mode 100644 arch/arm/boot/dts/sun7i-a20-bananapi.dts

 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index e6aa6e77a3ec..0e858ebdad9e 100644
+index 38c89cafa1ab..63422bde3a46 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -414,6 +414,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
+@@ -435,6 +435,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
 	sun6i-a31-hummingbird.dtb \
 	sun6i-a31-m9.dtb
 dtb-$(CONFIG_MACH_SUN7I) += \
 +	sun7i-a20-bananapi.dtb \
 	sun7i-a20-cubieboard2.dtb \
 	sun7i-a20-cubietruck.dtb \
- 	sun7i-a20-i12-tvbox.dtb \
+ 	sun7i-a20-hummingbird.dtb \
 diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
 new file mode 100644
 index 000000000000..7214475a3c36
--- a/arm-highbank-l2-reverts.patch
+++ b/arm-highbank-l2-reverts.patch
@ -9,7 +9,7 @@ Will debug upstream separately, but we need F22/21 running there. (#1139762)
 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
+index 07a09570175d..5db6d14fcd67 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)
--- a/ath9k-rx-dma-stop-check.patch
+++ b/ath9k-rx-dma-stop-check.patch
@ -7,10 +7,10 @@ Subject: [PATCH] ath9k: rx dma stop check
 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
+index 3e58bfa0c1fd..406eea47256e 100644
 --- a/drivers/net/wireless/ath/ath9k/mac.c
 +++ b/drivers/net/wireless/ath/ath9k/mac.c
-@@ -700,7 +700,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
+@@ -693,7 +693,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);
@ -19,7 +19,7 @@ index 275205ab5f15..bb842623bdf6 100644
 	int i;
 
 	/* Enable access to the DMA observation bus */
-@@ -730,6 +730,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
+@@ -723,6 +723,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
 	}
 
 	if (i == 0) {
--- a/criu-no-expert.patch
+++ b/criu-no-expert.patch
@ -9,7 +9,7 @@ Upstream-status: Fedora mustard
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/init/Kconfig b/init/Kconfig
-index 3c866db603a7..bfb3c54d5286 100644
+index 9ef459bb44b2..cc096e258a4a 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
@@ -1149,7 +1149,7 @@ config DEBUG_BLK_CGROUP
--- 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 9bb95eab6926..4b5015f27f9e 100644
+index 739f57b35fa3..8af45db27310 100644
 --- a/drivers/input/serio/i8042.c
 +++ b/drivers/input/serio/i8042.c
-@@ -1471,6 +1471,22 @@ static struct platform_driver i8042_driver = {
+@@ -1485,6 +1485,22 @@ static struct platform_driver i8042_driver = {
 	.shutdown	= i8042_shutdown,
 };
 
@ -43,7 +43,7 @@ index 9bb95eab6926..4b5015f27f9e 100644
 static int __init i8042_init(void)
 {
 	struct platform_device *pdev;
-@@ -1478,6 +1494,12 @@ static int __init i8042_init(void)
+@@ -1492,6 +1508,12 @@ static int __init i8042_init(void)
 
 	dbg_init();
 
--- a/efi-Add-EFI_SECURE_BOOT-bit.patch
+++ b/efi-Add-EFI_SECURE_BOOT-bit.patch
@ -12,10 +12,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
 2 files changed, 3 insertions(+)

 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 5a5cf7395724..fb282ff6a802 100644
+index f4eb99432db1..bc31a43b31a0 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
-@@ -1144,7 +1144,9 @@ void __init setup_arch(char **cmdline_p)
+@@ -1152,7 +1152,9 @@ void __init setup_arch(char **cmdline_p)
 
 #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE
 	if (boot_params.secure_boot) {
@ -26,10 +26,10 @@ index 5a5cf7395724..fb282ff6a802 100644
 #endif
 
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 45cb4ffdea62..ebe6a24cc1e1 100644
+index 0949f9c7e872..130ba866a24a 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -923,6 +923,7 @@ extern int __init efi_setup_pcdp_console(char *);
+@@ -936,6 +936,7 @@ extern int __init efi_setup_pcdp_console(char *);
 #define EFI_64BIT		5	/* Is the firmware 64-bit? */
 #define EFI_PARAVIRT		6	/* Access is via a paravirt interface */
 #define EFI_ARCH_1		7	/* First arch-specific bit */
--- a/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
+++ b/efi-Disable-secure-boot-if-shim-is-in-insecure-mode.patch
@ -14,10 +14,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
 1 file changed, 19 insertions(+), 1 deletion(-)

 diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
-index 975d11bfaf5b..94bf7819857a 100644
+index 6da2da7ac9c3..ba3cf70c7d5a 100644
 --- a/arch/x86/boot/compressed/eboot.c
 +++ b/arch/x86/boot/compressed/eboot.c
-@@ -817,8 +817,9 @@ out:
+@@ -831,8 +831,9 @@ out:
 
 static int get_secure_boot(void)
 {
@ -28,7 +28,7 @@ index 975d11bfaf5b..94bf7819857a 100644
 	efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID;
 	efi_status_t status;
 
-@@ -842,6 +843,23 @@ static int get_secure_boot(void)
+@@ -856,6 +857,23 @@ static int get_secure_boot(void)
 	if (setup == 1)
 		return 0;
 
--- 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 61542c282e70..e5ee669e87b6 100644
+index 7b8969db8398..d1f4a3d88dfc 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -1567,7 +1567,8 @@ config EFI_MIXED
+@@ -1612,7 +1612,8 @@ config EFI_MIXED
 	   If unsure, say N.
 
 config EFI_SECURE_BOOT_SIG_ENFORCE
--- 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 ebc2f9decdda..d9c029e81a36 100644
+index 9717d5f20139..a3101d2fd936 100644
 --- a/drivers/base/power/main.c
 +++ b/drivers/base/power/main.c
@@ -122,8 +122,6 @@ void device_pm_unlock(void)
@ -29,10 +29,10 @@ index ebc2f9decdda..d9c029e81a36 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 f5a98af3b325..9bb95eab6926 100644
+index 804d2e02010a..739f57b35fa3 100644
 --- a/drivers/input/serio/i8042.c
 +++ b/drivers/input/serio/i8042.c
-@@ -857,7 +857,6 @@ static int __init i8042_check_aux(void)
+@@ -871,7 +871,6 @@ static int __init i8042_check_aux(void)
 static int i8042_controller_check(void)
 {
 	if (i8042_flush()) {
--- a/kbuild-AFTER_LINK.patch
+++ b/kbuild-AFTER_LINK.patch
@ -106,7 +106,7 @@ index 5a4affe025e8..8ff38ce94c8e 100644
 VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
 	$(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
-index 86a4fe75f453..161637ed5611 100644
+index 86a4fe75f453..161637ed5611 100755
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
@@ -65,6 +65,10 @@ vmlinux_link()
--- a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
+++ b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
@ -13,7 +13,7 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
 1 file changed, 8 insertions(+)

 diff --git a/kernel/kexec.c b/kernel/kexec.c
-index 2bee072268d9..891477dbfee0 100644
+index 2abf9f6e9a61..417bd0599024 100644
 --- a/kernel/kexec.c
 +++ b/kernel/kexec.c
@@ -36,6 +36,7 @@
--- a/pinctrl-pinctrl-single-must-be-initialized-early.patch
+++ b/pinctrl-pinctrl-single-must-be-initialized-early.patch
@ -10,10 +10,10 @@ 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 95dd9cf55cb3..800fc34d7ea9 100644
+index fb94b772ad62..99668ad01b54 100644
 --- a/drivers/pinctrl/pinctrl-single.c
 +++ b/drivers/pinctrl/pinctrl-single.c
-@@ -2012,7 +2012,17 @@ static struct platform_driver pcs_driver = {
+@@ -2026,7 +2026,17 @@ static struct platform_driver pcs_driver = {
 #endif
 };
 
--- a/powerpc-powernv-force-all-CPUs-to-be-bootable.patch
+++ b/powerpc-powernv-force-all-CPUs-to-be-bootable.patch
@ -12,7 +12,7 @@ Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
 1 file changed, 12 insertions(+), 1 deletion(-)

 diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c
-index 5fcfcf44e3a9..52552e60df36 100644
+index 4753958cd509..44ecd0925f56 100644
 --- a/arch/powerpc/platforms/powernv/smp.c
 +++ b/arch/powerpc/platforms/powernv/smp.c
@@ -185,13 +185,24 @@ static void pnv_smp_cpu_kill_self(void)
--- a/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
+++ b/scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@ -9,10 +9,10 @@ Upstream-status: Fedora mustard (might be worth dropping...)
 1 file changed, 6 insertions(+), 1 deletion(-)

 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 2c2041ca4b70..e10812d985af 100644
+index cfba74cd8e8b..5127df3cc064 100644
 --- a/drivers/scsi/sd.c
 +++ b/drivers/scsi/sd.c
-@@ -2749,13 +2749,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
+@@ -2768,13 +2768,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
 static int sd_revalidate_disk(struct gendisk *disk)
 {
 	struct scsi_disk *sdkp = scsi_disk(disk);
--- a/silence-fbcon-logo.patch
+++ b/silence-fbcon-logo.patch
@ -9,10 +9,10 @@ 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 57b1d44acbfe..31048a85713d 100644
+index eb976ee3a02f..275f20a643f4 100644
 --- a/drivers/video/console/fbcon.c
 +++ b/drivers/video/console/fbcon.c
-@@ -638,13 +638,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
+@@ -637,13 +637,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
 		kfree(save);
 	}
 
@ -35,7 +35,7 @@ index 57b1d44acbfe..31048a85713d 100644
 	}
 }
 #endif /* MODULE */
-@@ -3625,6 +3627,14 @@ static int __init fb_console_init(void)
+@@ -3624,6 +3626,14 @@ static int __init fb_console_init(void)
 	return 0;
 }
 
--- a/uas-Do-not-blacklist-ASM1153-disk-enclosures.patch
+++ b/uas-Do-not-blacklist-ASM1153-disk-enclosures.patch
@ -71,10 +71,10 @@ index 8a6f371ed6e7..9893d696fc97 100644
 		}
 	}
 diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h
-index 2f0a3d35269a..f8492c1fd0e8 100644
+index 1f430bb02ca1..9ec4561f6c2c 100644
 --- a/drivers/usb/storage/unusual_uas.h
 +++ b/drivers/usb/storage/unusual_uas.h
-@@ -96,14 +96,6 @@ UNUSUAL_DEV(0x152d, 0x0567, 0x0000, 0x9999,
+@@ -110,14 +110,6 @@ UNUSUAL_DEV(0x152d, 0x0567, 0x0000, 0x9999,
 		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
 		US_FL_NO_REPORT_OPCODES),
 
--- a/watchdog-Disable-watchdog-on-virtual-machines.patch
+++ b/watchdog-Disable-watchdog-on-virtual-machines.patch
@ -20,10 +20,10 @@ Signed-off-by: Dave Jones <davej@redhat.com>
 1 file changed, 29 insertions(+)

 diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index a8d6914030fe..d0a8c308170d 100644
+index 70bf11815f84..4eeb9923472b 100644
 --- a/kernel/watchdog.c
 +++ b/kernel/watchdog.c
-@@ -24,6 +24,7 @@
+@@ -19,6 +19,7 @@
 #include <linux/sysctl.h>
 #include <linux/smpboot.h>
 #include <linux/sched/rt.h>
@ -31,7 +31,7 @@ index a8d6914030fe..d0a8c308170d 100644
 
 #include <asm/irq_regs.h>
 #include <linux/kvm_para.h>
-@@ -112,6 +113,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str)
+@@ -135,6 +136,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 a8d6914030fe..d0a8c308170d 100644
 /*
  * Hard-lockup warnings should be triggered after just a few seconds. Soft-
  * lockups can have false positives under extreme conditions. So we generally
-@@ -644,6 +671,8 @@ out:
+@@ -704,6 +731,8 @@ out:
 
 void __init lockup_detector_init(void)
 {
--- 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,7 +44,7 @@ index 4ddaf66ea35f..00b440307419 100644
 	}
 	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index 917403fe10da..cdf839f9defe 100644
+index 524b707894ef..c268e2581ed6 100644
 --- a/drivers/char/mem.c
 +++ b/drivers/char/mem.c
@@ -27,6 +27,7 @@