On Wed, Apr 1, 2020 at 6:11 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> On Mon, 23 Mar 2020 14:38:16 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > Today's linux-next merge of the driver-core tree got a conflict in:
> >
> > drivers/platform/x86/Kconfig
> >
> > between commit:
> >
> > 45a3d578f2ed ("platform/x86: Kconfig: Group modules by companies and functions")
> >
> > from the drivers-x86 tree and commit:
> >
> > 835e1b86ef8c ("platform/x86: touchscreen_dmi: Add EFI embedded firmware info support")
> >
> > from the driver-core tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> This is now a conflict between the drivers-x86 tree and Linus' tree.
PDx86 is in Linus tree already with conflict resolutions.
--
With Best Regards,
Andy Shevchenko
