Merge tag 'backlight-detect-refactor-1' into review-hans

Immutable backlight-detect-refactor branch between acpi, drm-* and pdx86

Tag (immutable branch) with v6.0-rc1 + the (acpi/x86) backlight
detect refactor work. For merging into the acpi, drm-* and pdx86
subsystems.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/platform/x86/acer-wmi.c
Simple merge

diff --cc drivers/platform/x86/asus-nb-wmi.c
Simple merge

diff --cc drivers/platform/x86/asus-wmi.c
Simple merge

diff --cc drivers/platform/x86/asus-wmi.h
index 0187f13d241486c0dd4912d341cd72ec3e87cbd1,f30252efe1db04badb934bcf155e37e154f66e68..65316998b898aaf7cbff2dbc3c1a969ac9e93de9
--- 1/drivers/platform/x86/asus-wmi.h
--- 2/drivers/platform/x86/asus-wmi.h
+++ b/drivers/platform/x86/asus-wmi.h
@@@ -36,11 -29,10 +36,9 @@@ struct quirk_entry 
        bool hotplug_wireless;
        bool scalar_panel_brightness;
        bool store_backlight_power;
-       bool wmi_backlight_power;
-       bool wmi_backlight_native;
        bool wmi_backlight_set_devstate;
        bool wmi_force_als_set;
 -      bool use_kbd_dock_devid;
 -      bool use_lid_flip_devid;
 +      enum asus_wmi_tablet_switch_mode tablet_switch_mode;
        int wapf;
        /*
         * For machines with AMD graphic chips, it will send out WMI event

diff --cc drivers/platform/x86/toshiba_acpi.c
Simple merge