From: Linus Torvalds Date: Fri, 27 Jan 2017 01:27:00 +0000 (-0800) Subject: Merge tag 'acpi-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... X-Git-Tag: microblaze-4.13-rc1~822 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=2287a240a6b1c39fd06f94e57b8c0189c497efe5;p=linux-2.6-microblaze.git Merge tag 'acpi-4.10-rc6' of git://git./linux/kernel/git/rafael/linux-pm Pull ACPI fixes from Rafael Wysocki: "These fix two regressions introduced recently, one by reverting the problematic commit and one by fixing up locking in the ACPICA core. Specifics: - Revert a recent change that added an ACPI video blacklist entry for HP Pavilion dv6 as it turned to introduce backlight handling regressions on some systems (Hans de Goede). - Fix locking in the ACPICA core to avoid deadlocks related to table loading that were exposed by a recent change in that area (Lv Zheng)" * tag 'acpi-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: Revert "ACPI / video: Add force_native quirk for HP Pavilion dv6" ACPICA: Tables: Fix hidden logic related to acpi_tb_install_standard_table() --- 2287a240a6b1c39fd06f94e57b8c0189c497efe5