mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* linux-next: manual merge of the trivial tree with the ux500-core tree
@ 2011-04-29  1:59 Stephen Rothwell
  2011-04-29  7:25 ` Linus Walleij
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2011-04-29  1:59 UTC (permalink / raw)
  To: Jiri Kosina; +Cc: linux-next, linux-kernel, Linus Walleij, Joe Perches

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

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-u300/gpio.c between commit 4a5a6e2804a3 ("mach-u300:
rewrite gpio driver, move to drivers/gpio") from the ux500-core tree and
commit b0c3af5ef0d7 ("arm: mach-u300/gpio: Fix mem_region resource size
miscalculations") from the trivial tree.

The former removed the file updated by the latter.  These updates should
be applied to drivers/gpio/u300-gpio.c, now.  Joe, maybe you could update
your patch and send it to Linus Walleij.
-- 
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] 5+ messages in thread

end of thread, other threads:[~2011-05-06  9:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-29  1:59 linux-next: manual merge of the trivial tree with the ux500-core tree Stephen Rothwell
2011-04-29  7:25 ` Linus Walleij
2011-05-05 13:48   ` Jiri Kosina
2011-05-06  9:29     ` Linus Walleij
2011-05-06  9:44       ` Jiri Kosina

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®