All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the i.MX tree with the  tree
Date: Mon, 23 May 2011 09:19:09 +0200	[thread overview]
Message-ID: <20110523071909.GD20715@pengutronix.de> (raw)
In-Reply-To: <20110523114542.9868cba1.sfr@canb.auug.org.au>

Hi Stephen,

On Mon, May 23, 2011 at 11:45:42AM +1000, Stephen Rothwell wrote:
> Hi Sascha,
> 
> Today's linux-next merge of the i.MX tree got a conflict in
> arch/arm/mach-imx/Kconfig arch/arm/plat-mxc/Kconfig between the "same"
> commits from the arm tree and the i.MX tree.
> 
> Please don't rearrange commits when upstreaming them - or if you do, then
> update the source tree as well.  I am assuming that the commits that are
> in the arm tree amount to the same as what has been int the i.MX tree for
> some time.  There are a couple of extra commits in the i.MX tree, so I
> just used the i.MX version of those files.   This may not work.

I have forgotten that my tree shows up in -next twice once rmk pulled
from me. I removed these patches from my -next queue and will hopefully
remember it next time aswell.

Thanks
 Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

      reply	other threads:[~2011-05-23  7:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-23  1:45 linux-next: manual merge of the i.MX tree with the tree Stephen Rothwell
2011-05-23  7:19 ` Sascha Hauer [this message]

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=20110523071909.GD20715@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rmk@arm.linux.org.uk \
    --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.