linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Walleij <linus.walleij@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Axel Lin <axel.lin@gmail.com>
Subject: Re: linux-next: manual merge of the staging tree with the ux500-core tree
Date: Thu, 7 Jul 2011 16:03:26 +0200	[thread overview]
Message-ID: <CAKnu2Mr+L3XHk18wgRY87cyKt=7mDrG4bYM8hCCexgh5TjvJuw@mail.gmail.com> (raw)
In-Reply-To: <20110707154223.d7ecda2a6cc84e033bb0b26a@canb.auug.org.au>

2011/7/7 Stephen Rothwell <sfr@canb.auug.org.au>:

> Today's linux-next merge of the staging tree got a conflict in
> arch/arm/mach-ux500/board-mop500-u8500uib.c between commit 0df7aaf0f276
> ("mach-ux500: fix build error due to unknown 'regulator_en' field") from
> the ux500-core tree and commit 857f727674f4 ("staging: ste_rmi4: remove
> cross-dependent platform data") from the staging tree.

I'll drop that patch in ux500-core.

> The second supercedes the first, so I used that.

Correct, sorry for the mess.

Yours,
Linus Walleij

      parent reply	other threads:[~2011-07-07 14:03 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-07  5:42 linux-next: manual merge of the staging tree with the ux500-core tree Stephen Rothwell
2011-07-07 13:42 ` Greg KH
2011-07-07 14:03 ` Linus Walleij [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='CAKnu2Mr+L3XHk18wgRY87cyKt=7mDrG4bYM8hCCexgh5TjvJuw@mail.gmail.com' \
    --to=linus.walleij@linaro.org \
    --cc=axel.lin@gmail.com \
    --cc=greg@kroah.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).