On Wed, Apr 1, 2020 at 6:14 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> On Thu, 26 Mar 2020 15:05:23 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > Today's linux-next merge of the drivers-x86 tree got a conflict in:
> >
> > drivers/platform/x86/intel_pmc_core.c
> >
> > between commit:
> >
> > a69b3b1d4cf0 ("platform/x86: Convert to new CPU match macros")
> >
> > from the tip tree and commit:
> >
> > 16292bed9c56 ("platform/x86: intel_pmc_core: Add Atom based Jasper Lake (JSL) platform support")
> >
> > from the drivers-x86 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 with conflict resolution.
--
With Best Regards,
Andy Shevchenko
