linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Nicolas Ferre <nicolas.ferre@atmel.com>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	ARM <linux-arm-kernel@lists.infradead.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Peter Rosin <peda@axentia.se>,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>
Subject: linux-next: manual merge of the at91 tree with the arm-soc tree
Date: Thu, 20 Apr 2017 08:38:17 +1000	[thread overview]
Message-ID: <20170420083817.5a44b69c@canb.auug.org.au> (raw)

Hi Nicolas,

Today's linux-next merge of the at91 tree got a conflict in:

  arch/arm/boot/dts/at91-tse850-3.dts

between commit:

  e67cedc92812 ("ARM: dts: at91: add envelope detector mux to the Axentia TSE-850")

from the arm-soc tree and commit:

  29dd89418007 ("ARM: dts: at91: add envelope detector mux to the Axentia TSE-850")

from the at91 tree.

I fixed it up (I used the arm-soc tree version) 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.

-- 
Cheers,
Stephen Rothwell

             reply	other threads:[~2017-04-19 22:38 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-19 22:38 Stephen Rothwell [this message]
2017-04-20 14:50 ` Nicolas.Ferre
  -- strict thread matches above, loose matches on Subject: below --
2017-06-04 23:48 Stephen Rothwell
2015-07-30 22:38 Stephen Rothwell
2015-07-31  7:09 ` Nicolas Ferre
2015-05-20  0:08 Stephen Rothwell
2015-05-20  7:41 ` Nicolas Ferre
2011-11-24  1:16 Stephen Rothwell
2011-11-24  9:56 ` Jamie Iles
2011-11-24 10:47   ` Nicolas Ferre

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=20170420083817.5a44b69c@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=nicolas.ferre@atmel.com \
    --cc=olof@lixom.net \
    --cc=peda@axentia.se \
    --subject='Re: linux-next: manual merge of the at91 tree with the arm-soc tree' \
    /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

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).