linux-kernel - Re: linux-next: manual merge of the driver-core tree with the drivers-x86-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <YcYpLFmy0Z+EBRNY@smile.fi.intel.com>
Date:   Fri, 24 Dec 2021 22:10:20 +0200
From:   Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Greg KH <greg@...ah.com>, Hans de Goede <hdegoede@...hat.com>,
        Mark Gross <markgross@...nel.org>,
        "David E. Box" <david.e.box@...ux.intel.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
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