Messages in this thread | | | Date | Fri, 24 Dec 2021 22:10:20 +0200 | From | Andy Shevchenko <> | Subject | Re: linux-next: manual merge of the driver-core tree with the drivers-x86-fixes tree |
| |
On Fri, Dec 24, 2021 at 01:14:50PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the driver-core tree got a conflict in: > > drivers/platform/x86/intel/Kconfig > > between commit: > > 4f6c131c3c31 ("platform/x86/intel: Remove X86_PLATFORM_DRIVERS_INTEL") > > from the drivers-x86-fixes tree and commit: > > a3c8f906ed5f ("platform/x86/intel: Move intel_pmt from MFD to Auxiliary Bus") > > from the driver-core tree. > > I fixed it up (see below) and can carry the fix as necessary.
Fix is correct, thanks!
-- With Best Regards, Andy Shevchenko
| |