Merge tag 'platform-drivers-x86-v6.8-2' into pdx/for-next
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Thu, 8 Feb 2024 11:49:31 +0000 (13:49 +0200)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Thu, 8 Feb 2024 11:49:31 +0000 (13:49 +0200)
commitd16c9a3d97d1905392e4b86ac9e25fa6c2d5faa3
treed1bc3f7a059b5f8fe18628d541143a50e7857626
parentfde7da1072f3c0239a80b590e7b75c9411e8b630
parent1abdf288b0ef5606f76b6e191fa6df05330e3d7e
Merge tag 'platform-drivers-x86-v6.8-2' into pdx/for-next

Merge tag 'platform-drivers-x86-v6.8-2' fixes into pdf86/for-next
because of WMI fixes. The WMI changes done in for-next already created
a minor conflict with the fixes and WMI is actively being improved
currently so besides resolving the current conflict, this is also to
avoid further conflicts.
drivers/platform/x86/intel/ifs/load.c
drivers/platform/x86/wmi.c