From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Darren Hart <dvhart@infradead.org>,
Gayatri Kammela <gayatri.kammela@intel.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Borislav Petkov <bp@suse.de>
Subject: Re: linux-next: manual merge of the drivers-x86 tree with the tip tree
Date: Wed, 1 Apr 2020 09:49:48 +0300 [thread overview]
Message-ID: <CAHp75VdaCfEBp0co611O8uCpu9fzOaobcE7EmZyHsX0D=4=neQ@mail.gmail.com> (raw)
In-Reply-To: <20200401141409.446e989b@canb.auug.org.au>
On Wed, Apr 1, 2020 at 6:14 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Thu, 26 Mar 2020 15:05:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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
next prev parent reply other threads:[~2020-04-01 6:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 4:05 linux-next: manual merge of the drivers-x86 tree with the tip tree Stephen Rothwell
2020-03-26 8:47 ` Andy Shevchenko
2020-04-01 3:14 ` Stephen Rothwell
2020-04-01 6:49 ` Andy Shevchenko [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-10-08 3:48 Stephen Rothwell
2018-10-08 10:55 ` Andy Shevchenko
2018-10-08 3:44 Stephen Rothwell
2018-10-08 10:55 ` Andy Shevchenko
2012-03-13 6:51 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHp75VdaCfEBp0co611O8uCpu9fzOaobcE7EmZyHsX0D=4=neQ@mail.gmail.com' \
--to=andy.shevchenko@gmail.com \
--cc=bp@suse.de \
--cc=dvhart@infradead.org \
--cc=gayatri.kammela@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).