linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the staging tree with the ux500-core tree
@ 2011-07-07  5:42 Stephen Rothwell
  2011-07-07 13:42 ` Greg KH
  2011-07-07 14:03 ` Linus Walleij
  0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-07-07  5:42 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Linus Walleij, Axel Lin

[-- Attachment #1: Type: text/plain, Size: 511 bytes --]

Hi Greg,

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.

The second supercedes the first, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the staging tree with the ux500-core tree
  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
  1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2011-07-07 13:42 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Linus Walleij, Axel Lin

On Thu, Jul 07, 2011 at 03:42:23PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> 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.
> 
> The second supercedes the first, so I used that.

That sounds correct, thanks for doing this.

greg k-h

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the staging tree with the ux500-core tree
  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
  1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2011-07-07 14:03 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Greg KH, linux-next, linux-kernel, Axel Lin

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-07-07 14:03 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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).