* linux-next: manual merge of the sparc-current tree with Linus' tree
@ 2009-09-26 1:01 Stephen Rothwell
2009-09-27 3:20 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-09-26 1:01 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, linux-kernel, Jan Beulich, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 550 bytes --]
Hi David,
Today's linux-next merge of the sparc-current tree got a conflict in
arch/sparc/include/asm/vio.h between commit
8c87df457cb58fe75b9b893007917cf8095660a0 ("BUILD_BUG_ON(): fix it and a
couple of bogus uses of it") from Linus' tree and commit
87ba00515657eede6077fa195ca6592b98cc31e3 ("sparc64: vio: Kill BUILD_BUG_ON
() in vio_dring_avail()") from the sparc-current tree.
I just used the sparc-current version for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the sparc-current tree with Linus' tree
2009-09-26 1:01 linux-next: manual merge of the sparc-current tree with Linus' tree Stephen Rothwell
@ 2009-09-27 3:20 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-09-27 3:20 UTC (permalink / raw)
To: sfr; +Cc: linux-next, linux-kernel, JBeulich, akpm
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 26 Sep 2009 11:01:58 +1000
> Today's linux-next merge of the sparc-current tree got a conflict in
> arch/sparc/include/asm/vio.h between commit
> 8c87df457cb58fe75b9b893007917cf8095660a0 ("BUILD_BUG_ON(): fix it and a
> couple of bogus uses of it") from Linus' tree and commit
> 87ba00515657eede6077fa195ca6592b98cc31e3 ("sparc64: vio: Kill BUILD_BUG_ON
> () in vio_dring_avail()") from the sparc-current tree.
>
> I just used the sparc-current version for today.
Thanks Stephen. When Linus pulled in my tree he resolved the
merge conflict and thus you shouldn't have to deal with this
any more either.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-09-27 3:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-09-26 1:01 linux-next: manual merge of the sparc-current tree with Linus' tree Stephen Rothwell
2009-09-27 3:20 ` David Miller
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.