Linux v3.15-rc5-270-gfba69f042ad9
This commit is contained in:
parent
6031430eb3
commit
f47e6726e9
@ -1,76 +0,0 @@
|
||||
From fdf69c4a4cfbc24694f58014e536ea5110fff9c1 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Mon, 5 May 2014 10:15:53 +0200
|
||||
Subject: [PATCH] acpi-video: Add use_native_backlight quirks for ThinkPad
|
||||
T430, T530 and Acer Aspire 5742G
|
||||
|
||||
ThinkPad T430: extend the T430s entry to also cover the T430 (note we also
|
||||
have another entry for T430's with a different DMI_PRODUCT_VERSION).
|
||||
|
||||
Reported-and-tested-by: edm <fuffi.il.fuffo@gmail.com>
|
||||
Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=51231
|
||||
|
||||
Thinkpad T530
|
||||
Reported-and-tested-by: Balint Szigeti <balint.szgt@gmail.com>
|
||||
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1089545
|
||||
|
||||
Acer Aspire 5742G
|
||||
Reported-and-tested-by: AnAkkk <anakin.cs@gmail.com>
|
||||
Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=35622
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
drivers/acpi/video.c | 20 ++++++++++++++++++--
|
||||
1 file changed, 18 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
|
||||
index 48146fc..4d14b27 100644
|
||||
--- a/drivers/acpi/video.c
|
||||
+++ b/drivers/acpi/video.c
|
||||
@@ -457,10 +457,10 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
|
||||
},
|
||||
{
|
||||
.callback = video_set_use_native_backlight,
|
||||
- .ident = "ThinkPad T430s",
|
||||
+ .ident = "ThinkPad T430 and T430s",
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T430s"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T430"),
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -472,6 +472,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
|
||||
},
|
||||
},
|
||||
{
|
||||
+ .callback = video_set_use_native_backlight,
|
||||
+ .ident = "ThinkPad T530",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T530"),
|
||||
+ },
|
||||
+ },
|
||||
+ {
|
||||
.callback = video_set_use_native_backlight,
|
||||
.ident = "ThinkPad X1 Carbon",
|
||||
.matches = {
|
||||
@@ -521,6 +529,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
|
||||
},
|
||||
{
|
||||
.callback = video_set_use_native_backlight,
|
||||
+ .ident = "Acer Aspire 5742G",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5742G"),
|
||||
+ },
|
||||
+ },
|
||||
+ {
|
||||
+ .callback = video_set_use_native_backlight,
|
||||
.ident = "Acer Aspire V5-171",
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
|
||||
--
|
||||
1.9.0
|
||||
|
@ -1,67 +0,0 @@
|
||||
Bugzilla: 1090746
|
||||
Upstream-status: Queued for 3.15 and CC'd to stable
|
||||
|
||||
From 2bb09843fc720389082ce7834b2716254bdf6c2d Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <2bb09843fc720389082ce7834b2716254bdf6c2d.1397794898.git.lv.zheng@intel.com>
|
||||
From: Lv Zheng <lv.zheng@intel.com>
|
||||
Date: Fri, 18 Apr 2014 12:21:34 +0800
|
||||
Subject: [PATCH] ACPICA: Tables: Fix a bad pointer issue in
|
||||
acpi_tb_parse_root_table().
|
||||
|
||||
The following is a linuxizing generation of the ACPICA commit to back ports
|
||||
Linux XSDT validation mechanism to ACPICA:
|
||||
Commit: 671cc68dc61f029d44b43a681356078e02d8dab8
|
||||
Subject: ACPICA: Back port and refine validation of the XSDT root table.
|
||||
It triggers a regression that a pointer is still used after unmapping.
|
||||
|
||||
This patch fixes this issue. Lv Zheng.
|
||||
|
||||
Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=73911
|
||||
Buglink: https://bugs.archlinux.org/task/39811
|
||||
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
|
||||
Reported-and-tested-by: Bruce Chiarelli <mano155@gmail.com>
|
||||
Reported-and-tested-by: Spyros Stathopoulos <spystath@gmail.com>
|
||||
Cc: <stable@vger.kernel.org> # 3.14.x: 671cc68: ACPICA: Back port and refine validation of the XSDT root table.
|
||||
---
|
||||
drivers/acpi/acpica/tbutils.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
|
||||
index 6412d3c..7285871 100644
|
||||
--- a/drivers/acpi/acpica/tbutils.c
|
||||
+++ b/drivers/acpi/acpica/tbutils.c
|
||||
@@ -461,6 +461,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
|
||||
u32 table_count;
|
||||
struct acpi_table_header *table;
|
||||
acpi_physical_address address;
|
||||
+ acpi_physical_address rsdt_address;
|
||||
u32 length;
|
||||
u8 *table_entry;
|
||||
acpi_status status;
|
||||
@@ -488,11 +489,13 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
|
||||
* as per the ACPI specification.
|
||||
*/
|
||||
address = (acpi_physical_address) rsdp->xsdt_physical_address;
|
||||
+ rsdt_address = (acpi_physical_address) rsdp->rsdt_physical_address;
|
||||
table_entry_size = ACPI_XSDT_ENTRY_SIZE;
|
||||
} else {
|
||||
/* Root table is an RSDT (32-bit physical addresses) */
|
||||
|
||||
address = (acpi_physical_address) rsdp->rsdt_physical_address;
|
||||
+ rsdt_address = address;
|
||||
table_entry_size = ACPI_RSDT_ENTRY_SIZE;
|
||||
}
|
||||
|
||||
@@ -515,8 +518,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address)
|
||||
|
||||
/* Fall back to the RSDT */
|
||||
|
||||
- address =
|
||||
- (acpi_physical_address) rsdp->rsdt_physical_address;
|
||||
+ address = rsdt_address;
|
||||
table_entry_size = ACPI_RSDT_ENTRY_SIZE;
|
||||
}
|
||||
}
|
||||
--
|
||||
1.7.10
|
||||
|
@ -1,35 +0,0 @@
|
||||
Bugzilla: N/A (Eric Paris reported via IRC)
|
||||
Upstream-status: Sent for 3.15
|
||||
|
||||
From: Vincent Donnefort <vdonnefort@gmail.com>
|
||||
|
||||
This patch fixes kernel NULL pointer BUG introduced by the following commit:
|
||||
b667cf488aa9476b0ab64acd91f2a96f188cfd21
|
||||
gpio: ich: Add support for multiple register addresses.
|
||||
|
||||
Signed-off-by: Vincent Donnefort <vdonnefort@gmail.com>
|
||||
|
||||
diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
|
||||
index e73c675..7030422 100644
|
||||
--- a/drivers/gpio/gpio-ich.c
|
||||
+++ b/drivers/gpio/gpio-ich.c
|
||||
@@ -305,6 +305,8 @@ static struct ichx_desc ich6_desc = {
|
||||
|
||||
.ngpio = 50,
|
||||
.have_blink = true,
|
||||
+ .regs = ichx_regs,
|
||||
+ .reglen = ichx_reglen,
|
||||
};
|
||||
|
||||
/* Intel 3100 */
|
||||
@@ -324,6 +326,8 @@ static struct ichx_desc i3100_desc = {
|
||||
.uses_gpe0 = true,
|
||||
|
||||
.ngpio = 50,
|
||||
+ .regs = ichx_regs,
|
||||
+ .reglen = ichx_reglen,
|
||||
};
|
||||
|
||||
/* ICH7 and ICH8-based */
|
||||
--
|
||||
1.8.3.2
|
21
kernel.spec
21
kernel.spec
@ -67,7 +67,7 @@ Summary: The Linux kernel
|
||||
# The rc snapshot level
|
||||
%define rcrev 5
|
||||
# The git snapshot level
|
||||
%define gitrev 3
|
||||
%define gitrev 4
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 3.%{upstream_sublevel}.0
|
||||
%endif
|
||||
@ -620,8 +620,6 @@ Patch22000: weird-root-dentry-name-debug.patch
|
||||
|
||||
Patch25047: drm-radeon-Disable-writeback-by-default-on-ppc.patch
|
||||
|
||||
Patch25062: gpio-ich-set-regs-and-reglen-for-i3100-and-ich6-chipset.patch
|
||||
|
||||
#rhbz 1025603
|
||||
Patch25063: disable-libdw-unwind-on-non-x86.patch
|
||||
|
||||
@ -634,15 +632,9 @@ Patch25064: 0001-HID-rmi-do-not-handle-touchscreens-through-hid-rmi.patch
|
||||
#rhbz 1090161
|
||||
Patch25072: HID-rmi-do-not-fetch-more-than-16-bytes-in-a-query.patch
|
||||
|
||||
#rhbz 1090746
|
||||
Patch25067: ACPICA-Tables-Fix-bad-pointer-issue-in-acpi_tb_parse_root_table.patch
|
||||
|
||||
#rhbz 983342 1093120
|
||||
Patch25069: 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch
|
||||
|
||||
#rhbz 1089545
|
||||
Patch25070: 0001-acpi-video-Add-use_native_backlight-quirks-for-Think.patch
|
||||
|
||||
Patch25071: s390-appldata-add-slab.h-for-kzalloc-kfree.patch
|
||||
|
||||
|
||||
@ -1352,20 +1344,12 @@ ApplyPatch 0001-HID-rmi-do-not-handle-touchscreens-through-hid-rmi.patch
|
||||
#rhbz 1090161
|
||||
ApplyPatch HID-rmi-do-not-fetch-more-than-16-bytes-in-a-query.patch
|
||||
|
||||
ApplyPatch gpio-ich-set-regs-and-reglen-for-i3100-and-ich6-chipset.patch
|
||||
|
||||
#rhbz 1025603
|
||||
ApplyPatch disable-libdw-unwind-on-non-x86.patch
|
||||
|
||||
#rhbz 1090746
|
||||
ApplyPatch ACPICA-Tables-Fix-bad-pointer-issue-in-acpi_tb_parse_root_table.patch
|
||||
|
||||
#rhbz 983342 1093120
|
||||
ApplyPatch 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch
|
||||
|
||||
#rhbz 1089545
|
||||
ApplyPatch 0001-acpi-video-Add-use_native_backlight-quirks-for-Think.patch
|
||||
|
||||
ApplyPatch s390-appldata-add-slab.h-for-kzalloc-kfree.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
@ -2238,6 +2222,9 @@ fi
|
||||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Wed May 21 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc5.git4.1
|
||||
- Linux v3.15-rc5-270-gfba69f042ad9
|
||||
|
||||
* Tue May 20 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc5.git3.1
|
||||
- Linux v3.15-rc5-157-g60b5f90d0fac
|
||||
|
||||
|
2
sources
2
sources
@ -1,4 +1,4 @@
|
||||
b621207b3f6ecbb67db18b13258f8ea8 linux-3.14.tar.xz
|
||||
d36baf2d62de5aa61f10a976d00d2d2a perf-man-3.14.tar.gz
|
||||
aea51aad0a095fb9c56f91b382f421ba patch-3.15-rc5.xz
|
||||
48d34b2fde6d760a572161bcd602dc07 patch-3.15-rc5-git3.xz
|
||||
b27b0b5d773da18e31f1c02e1fca4581 patch-3.15-rc5-git4.xz
|
||||
|
Loading…
Reference in New Issue
Block a user