diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch index 4cce7b623..9bf38ea02 100644 --- 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 e4b1f431c7ed..e12033b15d25 100644 +index 3eb8a41509b3..e46dc01f5904 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1578,6 +1578,16 @@ config EFI_MIXED +@@ -1577,6 +1577,16 @@ config EFI_MIXED If unsure, say N. diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch index 7bbda8d5e..98df75570 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 e25a82a291a6..2d90498c77d7 100644 +index d2355812ba48..4fcd7dd882c2 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1733,6 +1733,15 @@ config SYSTEM_TRUSTED_KEYRING +@@ -1722,6 +1722,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 d0e8c1d86..c2b5de2f3 100644 --- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch +++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch @@ -42,10 +42,10 @@ index 41359e548bcb..db9e6118575e 100644 efi_guid_t guid; u64 table; diff --git a/init/Kconfig b/init/Kconfig -index 2d90498c77d7..5e701ec1be55 100644 +index 4fcd7dd882c2..65ea201f38af 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1887,6 +1887,15 @@ config MODULE_SIG_ALL +@@ -1876,6 +1876,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/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch b/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch index 2fc17c0b4..01af607ea 100644 --- 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 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c -index 9ff0a901ecf7..8d0d5d92b8d9 100644 +index 92b6d9ab00e4..f77f893114a4 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -30,6 +30,7 @@ @@ -27,7 +27,7 @@ index 9ff0a901ecf7..8d0d5d92b8d9 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 9ff0a901ecf7..8d0d5d92b8d9 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 9ff0a901ecf7..8d0d5d92b8d9 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) { diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch index f728b9342..8d400c7a1 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 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index d9a452e8fb9b..b3400aafe446 100644 +index 41f7ec1fcf61..c79eb60a7869 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -3618,7 +3618,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. +@@ -3625,7 +3625,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 d9a452e8fb9b..b3400aafe446 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 807a88a0f394..b8a441713e86 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot"); diff --git a/Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch b/Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch index 8ac29de0e..643894e56 100644 --- a/Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch +++ b/Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch @@ -9,7 +9,7 @@ This reverts commit cf1fc187628913070c3e418ce0e205732435aa2f. 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c -index d30dddd21323..d5ed1272b928 100644 +index e730935fa457..c57ca10bed20 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -27,7 +27,8 @@ @@ -79,8 +79,8 @@ index d30dddd21323..d5ed1272b928 100644 int msm_pinctrl_probe(struct platform_device *pdev, const struct msm_pinctrl_soc_data *soc_data) -@@ -946,8 +943,6 @@ int msm_pinctrl_remove(struct platform_device *pdev) - +@@ -940,8 +937,6 @@ int msm_pinctrl_remove(struct platform_device *pdev) + gpiochip_remove(&pctrl->chip); pinctrl_unregister(pctrl->pctrl); - unregister_restart_handler(&pctrl->restart_nb); diff --git a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch index cea06c30f..986bce9cb 100644 --- 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 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 #include -@@ -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 diff --git a/acpi-video-Add-4-new-models-to-the-use_native_backli.patch b/acpi-video-Add-4-new-models-to-the-use_native_backli.patch deleted file mode 100644 index 4411248f3..000000000 --- a/acpi-video-Add-4-new-models-to-the-use_native_backli.patch +++ /dev/null @@ -1,88 +0,0 @@ -From: Hans de Goede -Date: Wed, 30 Apr 2014 15:24:19 +0200 -Subject: [PATCH] acpi-video: Add 4 new models to the use_native_backlight dmi - list - -Acer Aspire V5-171 -https://bugzilla.redhat.com/show_bug.cgi?id=983342 - -Acer Aspire V5-471G -Lenovo Yoga 2 11 -Reported-and-tested-by: Vincent Gerris - -HP EliteBook 8470p -https://bugzilla.redhat.com/show_bug.cgi?id=1093120 - -Cc: stable@vger.kernel.org -Signed-off-by: Hans de Goede ---- - drivers/acpi/video.c | 32 ++++++++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c -index a3d293806f96..5c8ce8c699fc 100644 ---- a/drivers/acpi/video.c -+++ b/drivers/acpi/video.c -@@ -556,6 +556,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = { - }, - }, - { -+ .callback = video_set_use_native_backlight, -+ .ident = "Lenovo Yoga 2 11", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2 11"), -+ }, -+ }, -+ { - .callback = video_set_use_native_backlight, - .ident = "Thinkpad Helix", - .matches = { -@@ -597,6 +605,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = { - }, - { - .callback = video_set_use_native_backlight, -+ .ident = "Acer Aspire V5-171", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "Acer"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "V5-171"), -+ }, -+ }, -+ { -+ .callback = video_set_use_native_backlight, - .ident = "Acer Aspire V5-431", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), -@@ -644,6 +660,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = { - }, - }, - { -+ .callback = video_set_use_native_backlight, -+ .ident = "Acer Aspire V5-471G", -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "Acer"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-471G"), -+ }, -+ }, -+ { - .callback = video_set_use_native_backlight, - .ident = "HP ProBook 4340s", - .matches = { -@@ -720,6 +744,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = { - }, - { - .callback = video_set_use_native_backlight, -+ .ident = "HP EliteBook 8470p", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook 8470p"), -+ }, -+ }, -+ { -+ .callback = video_set_use_native_backlight, - .ident = "HP EliteBook 8780w", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), --- -1.9.3 - diff --git a/acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch b/acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch deleted file mode 100644 index fb77e5641..000000000 --- a/acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Hans de Goede -Date: Mon, 2 Jun 2014 17:41:10 +0200 -Subject: [PATCH] acpi-video: Add use native backlight quirk for the ThinkPad - W530 - -Like all of the other *30 ThinkPad models, the W530 has a broken acpi-video -backlight control. Note in order for this to actually fix things on the -ThinkPad W530 the commit titled: -"nouveau: Don't check acpi_video_backlight_support() before registering backlight" -is also needed. - -https://bugzilla.redhat.com/show_bug.cgi?id=1093171 - -Bugzilla: 1093171 -Upstream-status: Queued for 3.16 - -Cc: stable@vger.kernel.org -Signed-off-by: Hans de Goede ---- - drivers/acpi/video.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c -index 5c8ce8c699fc..d8a6ecb0b2b2 100644 ---- a/drivers/acpi/video.c -+++ b/drivers/acpi/video.c -@@ -469,6 +469,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = { - }, - { - .callback = video_set_use_native_backlight, -+ .ident = "ThinkPad W530", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W530"), -+ }, -+ }, -+ { -+ .callback = video_set_use_native_backlight, - .ident = "ThinkPad X230", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), --- -1.9.3 - diff --git a/acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch b/acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch deleted file mode 100644 index 33a26383b..000000000 --- a/acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Hans de Goede -Date: Mon, 2 Jun 2014 17:41:11 +0200 -Subject: [PATCH] acpi-video: Add use_native_backlight quirk for HP ProBook - 4540s - -As reported here: -https://bugzilla.redhat.com/show_bug.cgi?id=1025690 -This is yet another model which needs this quirk. - -Bugzilla: 1025690 -Upstream-status: Waiting for feedback from reporter - -Cc: stable@vger.kernel.org -Signed-off-by: Hans de Goede ---- - drivers/acpi/video.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c -index d8a6ecb0b2b2..8dbf009521c7 100644 ---- a/drivers/acpi/video.c -+++ b/drivers/acpi/video.c -@@ -693,6 +693,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = { - }, - { - .callback = video_set_use_native_backlight, -+ .ident = "HP ProBook 4540s", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), -+ DMI_MATCH(DMI_PRODUCT_VERSION, "HP ProBook 4540s"), -+ }, -+ }, -+ { -+ .callback = video_set_use_native_backlight, - .ident = "HP ProBook 2013 models", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), --- -1.9.3 - diff --git a/config-arm64 b/config-arm64 index bb584bd57..bff77a21b 100644 --- a/config-arm64 +++ b/config-arm64 @@ -94,6 +94,7 @@ CONFIG_NET_XGENE=y CONFIG_RTC_DRV_XGENE=m CONFIG_RTC_DRV_EFI=y CONFIG_HW_RANDOM_XGENE=m +CONFIG_GPIO_XGENE=y # not arm64 # CONFIG_GPIO_ADNP is not set diff --git a/config-armv7 b/config-armv7 index d6dfd043b..abb02c1ea 100644 --- a/config-armv7 +++ b/config-armv7 @@ -488,6 +488,7 @@ CONFIG_SPI_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP=m CONFIG_PWM_ROCKCHIP=m CONFIG_ROCKCHIP_SARADC=m +# CONFIG_ROCKCHIP_IODOMAIN is not set # ST Ericsson CONFIG_MACH_HREFV60=y @@ -602,6 +603,7 @@ CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m CONFIG_GS_FPGABOOT=m +# CONFIG_PCIE_XILINX is not set # Multi function devices CONFIG_MFD_88PM800=m diff --git a/config-armv7-lpae b/config-armv7-lpae index 3b5b7cf57..935abd805 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -64,6 +64,7 @@ CONFIG_SPI_DAVINCI=m CONFIG_TI_DAVINCI_MDIO=m # CONFIG_TI_SOC_THERMAL is not set CONFIG_KEYSTONE_IRQ=m +CONFIG_PCI_KEYSTONE=y # Tegra (non A15 device options) # CONFIG_ARCH_TEGRA_2x_SOC is not set diff --git a/config-generic b/config-generic index 2ce3c61e1..a24062221 100644 --- a/config-generic +++ b/config-generic @@ -5241,6 +5241,8 @@ CONFIG_FMC_CHARDEV=m # CONFIG_DEVFREQ_GOV_POWERSAVE is not set # CONFIG_DEVFREQ_GOV_USERSPACE is not set +# CONFIG_CPUFREQ_DT is not set + # CONFIG_MODULE_SIG is not set # FIXME: Revisit this to see if we can use it instead of the spec file stuff # CONFIG_MODULE_COMPRESS is not set diff --git a/criu-no-expert.patch b/criu-no-expert.patch index 7583f7418..d6e3bb0e1 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 5e701ec1be55..abb2fc8f1b7a 100644 +index 65ea201f38af..adfc3ba98571 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1149,7 +1149,7 @@ config DEBUG_BLK_CGROUP +@@ -1138,7 +1138,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -21,7 +21,7 @@ index 5e701ec1be55..abb2fc8f1b7a 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. -@@ -1160,7 +1160,7 @@ config CHECKPOINT_RESTORE +@@ -1149,7 +1149,7 @@ config CHECKPOINT_RESTORE If unsure, say N here. menuconfig NAMESPACES 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 e781fdcd5..0f1082cbe 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 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index e12033b15d25..05a5303d1857 100644 +index e46dc01f5904..738c295ac3c3 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1579,7 +1579,8 @@ config EFI_MIXED +@@ -1578,7 +1578,8 @@ config EFI_MIXED If unsure, say N. config EFI_SECURE_BOOT_SIG_ENFORCE diff --git a/input-silence-i8042-noise.patch b/input-silence-i8042-noise.patch index 0872bc3d3..1431a5476 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 b67d9aef9fe4..dd58b0fdaafd 100644 +index 44973196d3fd..0179281a2517 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -122,8 +122,6 @@ void device_pm_unlock(void) diff --git a/kernel.spec b/kernel.spec index 89f91af97..884cdc288 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -599,15 +599,10 @@ Patch22000: weird-root-dentry-name-debug.patch #rhbz 1025603 Patch25063: disable-libdw-unwind-on-non-x86.patch -#rhbz 983342 1093120 -Patch25069: acpi-video-Add-4-new-models-to-the-use_native_backli.patch - Patch26000: perf-install-trace-event-plugins.patch # Patch series from Hans for various backlight and platform driver fixes Patch26002: samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch -Patch26013: acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch -Patch26014: acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch #rhbz 1138759 Patch26021: drm-vmwgfx-Fix-drm.h-include.patch @@ -617,8 +612,6 @@ Patch26029: KEYS-Reinstate-EPERM-for-a-key-type-name-beginning-w.patch Patch26030: GFS2-Make-rename-not-save-dirent-location.patch -Patch26031: libata-Un-break-ATA-blacklist.patch - Patch26032: Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel @@ -1332,15 +1325,10 @@ ApplyPatch ath9k-rx-dma-stop-check.patch #rhbz 1025603 ApplyPatch disable-libdw-unwind-on-non-x86.patch -#rhbz 983342 1093120 -ApplyPatch acpi-video-Add-4-new-models-to-the-use_native_backli.patch - ApplyPatch perf-install-trace-event-plugins.patch # Patch series from Hans for various backlight and platform driver fixes ApplyPatch samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch -ApplyPatch acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch -ApplyPatch acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch #rhbz 1138759 ApplyPatch drm-vmwgfx-Fix-drm.h-include.patch @@ -1350,8 +1338,6 @@ ApplyPatch KEYS-Reinstate-EPERM-for-a-key-type-name-beginning-w.patch ApplyPatch GFS2-Make-rename-not-save-dirent-location.patch -ApplyPatch libata-Un-break-ATA-blacklist.patch - ApplyPatch Revert-pinctrl-qcom-use-restart_notifier-mechanism-f.patch %if 0%{?aarch64patches} @@ -2222,6 +2208,9 @@ fi # ||----w | # || || %changelog +* Fri Oct 10 2014 Josh Boyer - 3.18.0-0.rc0.git4.1 +- Linux v3.17-6136-gc798360cd143 + * Thu Oct 09 2014 Josh Boyer - 3.18.0-0.rc0.git3.1 - Linux v3.17-5585-g782d59c5dfc5 diff --git a/libata-Un-break-ATA-blacklist.patch b/libata-Un-break-ATA-blacklist.patch deleted file mode 100644 index e8d70ba66..000000000 --- a/libata-Un-break-ATA-blacklist.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: George Spelvin -Date: Tue, 7 Oct 2014 07:26:38 -0400 -Subject: [PATCH] libata: Un-break ATA blacklist - -lib/glob.c provides a new glob_match() function, with arguments in -(pattern, string) order. It replaced a private function with arguments -in (string, pattern) order, but I didn't swap the call site... - -The result was the entire ATA blacklist was effectively disabled. - -The lesson for today is "I f***ed up *how* badly *how* many months ago?", -er, I mean "Nobody Tests RC Kernels On Legacy Hardware". - -This was not a subtle break, but it made it through an entire RC -cycle unreported, presumably because all the people doing testing -have full-featured hardware. - -(FWIW, the reason for the argument swap was because fnmatch() does it that -way, and for a while implementing a full fnmatch() was being considered.) - -Fixes: 428ac5fc056e0 (libata: Use glob_match from lib/glob.c) -Reported-by: Steven Honeyman -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=71371#c21 -Signed-off-by: George Spelvin -Cc: # 3.17 -Tested-by: Steven Honeyman -Signed-off-by: Tejun Heo ---- - drivers/ata/libata-core.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c -index f3e7b9f894cd..6f674906c64c 100644 ---- a/drivers/ata/libata-core.c -+++ b/drivers/ata/libata-core.c -@@ -4261,10 +4261,10 @@ static unsigned long ata_dev_blacklisted(const struct ata_device *dev) - ata_id_c_string(dev->id, model_rev, ATA_ID_FW_REV, sizeof(model_rev)); - - while (ad->model_num) { -- if (glob_match(model_num, ad->model_num)) { -+ if (glob_match(ad->model_num, model_num)) { - if (ad->model_rev == NULL) - return ad->horkage; -- if (glob_match(model_rev, ad->model_rev)) -+ if (glob_match(ad->model_rev, model_rev)) - return ad->horkage; - } - ad++; --- -1.9.3 - diff --git a/sources b/sources index d6dde0bc2..ef5521bd5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ fb30d0f29214d75cddd2faa94f73d5cf linux-3.17.tar.xz 159e969cbc27201d8e2fa0f609dc722f perf-man-3.17.tar.gz -6a3656608dd827db531c0c2f5f15f38d patch-3.17-git3.xz +c8c1f5cd8b311eab3514df85827d23a8 patch-3.17-git4.xz diff --git a/watchdog-Disable-watchdog-on-virtual-machines.patch b/watchdog-Disable-watchdog-on-virtual-machines.patch index 23a17c054..6d8bdf616 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 1 file changed, 29 insertions(+) diff --git a/kernel/watchdog.c b/kernel/watchdog.c -index a8d6914030fe..d0a8c308170d 100644 +index 7b223b212683..4757d7410087 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -24,6 +24,7 @@ @@ -31,7 +31,7 @@ index a8d6914030fe..d0a8c308170d 100644 #include #include -@@ -112,6 +113,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str) +@@ -113,6 +114,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: +@@ -660,6 +687,8 @@ out: void __init lockup_detector_init(void) {