linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Darren Hart <dvhart@infradead.org>, Greg KH <greg@kroah.com>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Hans de Goede <hdegoede@redhat.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the drivers-x86 tree
Date: Wed, 1 Apr 2020 09:47:20 +0300	[thread overview]
Message-ID: <CAHp75VdoMpA4tDg57UND5hnWXV60EGaThPxLnTpKT6wG7bdYYQ@mail.gmail.com> (raw)
In-Reply-To: <20200401141113.21014665@canb.auug.org.au>

On Wed, Apr 1, 2020 at 6:11 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Mon, 23 Mar 2020 14:38:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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

  reply	other threads:[~2020-04-01  6:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-23  3:38 linux-next: manual merge of the driver-core tree with the drivers-x86 tree Stephen Rothwell
2020-03-23  9:57 ` Greg KH
2020-03-23 11:43 ` Andy Shevchenko
2020-04-01  3:11 ` Stephen Rothwell
2020-04-01  6:47   ` Andy Shevchenko [this message]
2020-04-01  7:18     ` 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=CAHp75VdoMpA4tDg57UND5hnWXV60EGaThPxLnTpKT6wG7bdYYQ@mail.gmail.com \
    --to=andy.shevchenko@gmail.com \
    --cc=dvhart@infradead.org \
    --cc=greg@kroah.com \
    --cc=hdegoede@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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).