tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'platform-drivers-x86-v4.5-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver updates from Darren Hart:
"Emergency travel prevented me from completing my final testing on this
until today. Nothing here that couldn't wait until RC1 fixes, but I
thought it best to get it out sooner rather than later as it does
contain a build warning fix.

Summary:

A build warning fix, MAINTAINERS cleanup, and a new DMI quirk:

ideapad-laptop:
- Add Lenovo Yoga 700 to no_hw_rfkill dmi list

MAINTAINERS:
- Combine multiple telemetry entries

intel_telemetry_debugfs:
- Fix unused warnings in telemetry debugfs"

* tag 'platform-drivers-x86-v4.5-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
ideapad-laptop: Add Lenovo Yoga 700 to no_hw_rfkill dmi list
MAINTAINERS: Combine multiple telemetry entries
intel_telemetry_debugfs: Fix unused warnings in telemetry debugfs

Linus Torvalds e1c10879 81f05fee

+10 -3
+1 -3
MAINTAINERS
··· 5780 5780 M: Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com> 5781 5781 L: platform-driver-x86@vger.kernel.org 5782 5782 S: Maintained 5783 - F: drivers/platform/x86/intel_telemetry_core.c 5784 5783 F: arch/x86/include/asm/intel_telemetry.h 5785 - F: drivers/platform/x86/intel_telemetry_pltdrv.c 5786 - F: drivers/platform/x86/intel_telemetry_debugfs.c 5784 + F: drivers/platform/x86/intel_telemetry* 5787 5785 5788 5786 IOC3 ETHERNET DRIVER 5789 5787 M: Ralf Baechle <ralf@linux-mips.org>
+7
drivers/platform/x86/ideapad-laptop.c
··· 900 900 }, 901 901 }, 902 902 { 903 + .ident = "Lenovo Yoga 700", 904 + .matches = { 905 + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), 906 + DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 700"), 907 + }, 908 + }, 909 + { 903 910 .ident = "Lenovo Yoga 900", 904 911 .matches = { 905 912 DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+2
drivers/platform/x86/intel_telemetry_debugfs.c
··· 96 96 } \ 97 97 } 98 98 99 + #ifdef CONFIG_PM_SLEEP 99 100 static u8 suspend_prep_ok; 100 101 static u32 suspend_shlw_ctr_temp, suspend_deep_ctr_temp; 101 102 static u64 suspend_shlw_res_temp, suspend_deep_res_temp; 103 + #endif 102 104 103 105 struct telemetry_susp_stats { 104 106 u32 shlw_swake_ctr;