All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoph Hellwig <hch@lst.de>,
	Darren Hart <dvhart@infradead.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the generic-ioremap tree with the drivers-x86 tree
Date: Fri, 10 Jan 2020 12:22:35 +0200	[thread overview]
Message-ID: <CAHp75Vcu6JnfX13_eAy+gXu_jQMXQzcD0rSwANU2n9uS-6vmpQ@mail.gmail.com> (raw)
In-Reply-To: <20200110165233.0ee71ee4@canb.auug.org.au>

On Fri, Jan 10, 2020 at 7:52 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the generic-ioremap tree got a conflict in:
>
>   drivers/platform/x86/intel_telemetry_pltdrv.c
>
> between commit:
>
>   ebc28a8e59ca ("platform/x86: intel_telemetry_pltdrv: use devm_platform_ioremap_resource()")
>
> from the drivers-x86 tree and commit:
>
>   4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
>
> from the generic-ioremap tree.
>
> I fixed it up (the former removed th referneved to ioremap_nocache so
> I just used that) 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.

Thanks, Stephen!
The conflict resolution looks correct to me.

>
>
>
> --
> Cheers,
> Stephen Rothwell



-- 
With Best Regards,
Andy Shevchenko

  reply	other threads:[~2020-01-10 10:22 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-10  5:52 linux-next: manual merge of the generic-ioremap tree with the drivers-x86 tree Stephen Rothwell
2020-01-10 10:22 ` Andy Shevchenko [this message]
2020-01-27 22:56 ` Stephen Rothwell
2020-01-24  5:15 Stephen Rothwell
2020-01-27 23:03 ` Stephen Rothwell
2020-01-28  9:11   ` Andy Shevchenko
2020-01-28 10:06     ` 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=CAHp75Vcu6JnfX13_eAy+gXu_jQMXQzcD0rSwANU2n9uS-6vmpQ@mail.gmail.com \
    --to=andy.shevchenko@gmail.com \
    --cc=dvhart@infradead.org \
    --cc=hch@lst.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.