* linux-next: manual merge of sparc tree
@ 2008-06-17 7:21 Stephen Rothwell
2008-06-17 7:35 ` David Miller
0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2008-06-17 7:21 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, Adrian Bunk, Geert Uytterhoeven
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
Hi Dave,
Today's linux-next merge of the sparc tree got a trivial contextual
conflict in include/asm-m68k/sbus.h between commit
69edc57f65f2d0bf63485cba4567876a1cfa3dae ("m68k/sun3/: possible
cleanups") from the m68k tree and commit
878e7a6e498bec55f10a163197c41554fb078416 ("sparc: remove CONFIG_SUN4")
from the sparc tree.
It was just close changes to the same file. I fixed it up.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: linux-next: manual merge of sparc tree
2008-06-17 7:21 linux-next: manual merge of sparc tree Stephen Rothwell
@ 2008-06-17 7:35 ` David Miller
2008-06-17 20:32 ` Geert Uytterhoeven
0 siblings, 1 reply; 10+ messages in thread
From: David Miller @ 2008-06-17 7:35 UTC (permalink / raw)
To: sfr; +Cc: linux-next, bunk, geert
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 17 Jun 2008 17:21:50 +1000
> Today's linux-next merge of the sparc tree got a trivial contextual
> conflict in include/asm-m68k/sbus.h between commit
> 69edc57f65f2d0bf63485cba4567876a1cfa3dae ("m68k/sun3/: possible
> cleanups") from the m68k tree and commit
> 878e7a6e498bec55f10a163197c41554fb078416 ("sparc: remove CONFIG_SUN4")
> from the sparc tree.
>
> It was just close changes to the same file. I fixed it up.
Thanks.
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: linux-next: manual merge of sparc tree
2008-06-17 7:35 ` David Miller
@ 2008-06-17 20:32 ` Geert Uytterhoeven
2008-06-17 21:03 ` Adrian Bunk
2008-06-18 5:37 ` David Miller
0 siblings, 2 replies; 10+ messages in thread
From: Geert Uytterhoeven @ 2008-06-17 20:32 UTC (permalink / raw)
To: David Miller; +Cc: Stephen Rothwell, linux-next, bunk, Geert Uytterhoeven
On Tue, 17 Jun 2008, David Miller wrote:
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Tue, 17 Jun 2008 17:21:50 +1000
>
> > Today's linux-next merge of the sparc tree got a trivial contextual
> > conflict in include/asm-m68k/sbus.h between commit
> > 69edc57f65f2d0bf63485cba4567876a1cfa3dae ("m68k/sun3/: possible
> > cleanups") from the m68k tree and commit
> > 878e7a6e498bec55f10a163197c41554fb078416 ("sparc: remove CONFIG_SUN4")
> > from the sparc tree.
> >
> > It was just close changes to the same file. I fixed it up.
If you want your change to include/asm-m68k/sbus.h to go in through the
m68k tree, please send me the patch.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k•org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: linux-next: manual merge of sparc tree
2008-06-17 20:32 ` Geert Uytterhoeven
@ 2008-06-17 21:03 ` Adrian Bunk
2008-06-17 21:16 ` Geert Uytterhoeven
2008-06-18 5:37 ` David Miller
1 sibling, 1 reply; 10+ messages in thread
From: Adrian Bunk @ 2008-06-17 21:03 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: David Miller, Stephen Rothwell, linux-next
On Tue, Jun 17, 2008 at 10:32:01PM +0200, Geert Uytterhoeven wrote:
> On Tue, 17 Jun 2008, David Miller wrote:
> > From: Stephen Rothwell <sfr@canb•auug.org.au>
> > Date: Tue, 17 Jun 2008 17:21:50 +1000
> >
> > > Today's linux-next merge of the sparc tree got a trivial contextual
> > > conflict in include/asm-m68k/sbus.h between commit
> > > 69edc57f65f2d0bf63485cba4567876a1cfa3dae ("m68k/sun3/: possible
> > > cleanups") from the m68k tree and commit
> > > 878e7a6e498bec55f10a163197c41554fb078416 ("sparc: remove CONFIG_SUN4")
> > > from the sparc tree.
> > >
> > > It was just close changes to the same file. I fixed it up.
>
> If you want your change to include/asm-m68k/sbus.h to go in through the
> m68k tree, please send me the patch.
Sorry for this mess, I'm in the unlucky position of having made both
conflicting commits. :-(
Below is the part of the commit that caused this conflict.
> Gr{oetje,eeting}s,
>
> Geert
cu
Adrian
<-- snip -->
m68k: remove stale ARCH_SUN4 #define
Signed-off-by: Adrian Bunk <bunk@kernel•org>
--- a/include/asm-m68k/sbus.h
+++ b/include/asm-m68k/sbus.h
@@ -12,8 +12,6 @@ struct sbus_dev {
} reg_addrs[1];
};
-#define ARCH_SUN4 0
-
/* sbus IO functions stolen from include/asm-sparc/io.h for the serial driver */
/* No SBUS on the Sun3, kludge -- sam */
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: linux-next: manual merge of sparc tree
2008-06-17 21:03 ` Adrian Bunk
@ 2008-06-17 21:16 ` Geert Uytterhoeven
0 siblings, 0 replies; 10+ messages in thread
From: Geert Uytterhoeven @ 2008-06-17 21:16 UTC (permalink / raw)
To: Adrian Bunk
Cc: David Miller, Stephen Rothwell, linux-next, Geert Uytterhoeven
On Wed, 18 Jun 2008, Adrian Bunk wrote:
> On Tue, Jun 17, 2008 at 10:32:01PM +0200, Geert Uytterhoeven wrote:
> > On Tue, 17 Jun 2008, David Miller wrote:
> > > From: Stephen Rothwell <sfr@canb•auug.org.au>
> > > Date: Tue, 17 Jun 2008 17:21:50 +1000
> > >
> > > > Today's linux-next merge of the sparc tree got a trivial contextual
> > > > conflict in include/asm-m68k/sbus.h between commit
> > > > 69edc57f65f2d0bf63485cba4567876a1cfa3dae ("m68k/sun3/: possible
> > > > cleanups") from the m68k tree and commit
> > > > 878e7a6e498bec55f10a163197c41554fb078416 ("sparc: remove CONFIG_SUN4")
> > > > from the sparc tree.
> > > >
> > > > It was just close changes to the same file. I fixed it up.
> >
> > If you want your change to include/asm-m68k/sbus.h to go in through the
> > m68k tree, please send me the patch.
>
> Sorry for this mess, I'm in the unlucky position of having made both
> conflicting commits. :-(
>
> Below is the part of the commit that caused this conflict.
IC...
> m68k: remove stale ARCH_SUN4 #define
Thx, queued for 2.6.27.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k•org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: manual merge of sparc tree
2008-06-17 20:32 ` Geert Uytterhoeven
2008-06-17 21:03 ` Adrian Bunk
@ 2008-06-18 5:37 ` David Miller
2008-06-18 6:23 ` Stephen Rothwell
2008-06-18 7:34 ` Geert Uytterhoeven
1 sibling, 2 replies; 10+ messages in thread
From: David Miller @ 2008-06-18 5:37 UTC (permalink / raw)
To: geert; +Cc: sfr, linux-next, bunk
From: Geert Uytterhoeven <geert@linux-m68k•org>
Date: Tue, 17 Jun 2008 22:32:01 +0200 (CEST)
> On Tue, 17 Jun 2008, David Miller wrote:
> > From: Stephen Rothwell <sfr@canb•auug.org.au>
> > Date: Tue, 17 Jun 2008 17:21:50 +1000
> >
> > > Today's linux-next merge of the sparc tree got a trivial contextual
> > > conflict in include/asm-m68k/sbus.h between commit
> > > 69edc57f65f2d0bf63485cba4567876a1cfa3dae ("m68k/sun3/: possible
> > > cleanups") from the m68k tree and commit
> > > 878e7a6e498bec55f10a163197c41554fb078416 ("sparc: remove CONFIG_SUN4")
> > > from the sparc tree.
> > >
> > > It was just close changes to the same file. I fixed it up.
>
> If you want your change to include/asm-m68k/sbus.h to go in through the
> m68k tree, please send me the patch.
It's part of a tree-wide removal of CONFIG_SUN4. If Stephen doesn't
mind making this minor merge fixup all the time, it's probably
best to keep it in the sparc tree.
Let me know if you disagree :-)
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: linux-next: manual merge of sparc tree
2008-06-18 5:37 ` David Miller
@ 2008-06-18 6:23 ` Stephen Rothwell
2008-06-18 7:34 ` Geert Uytterhoeven
1 sibling, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2008-06-18 6:23 UTC (permalink / raw)
To: David Miller; +Cc: geert, linux-next, bunk
[-- Attachment #1: Type: text/plain, Size: 457 bytes --]
On Tue, 17 Jun 2008 22:37:07 -0700 (PDT) David Miller <davem@davemloft•net> wrote:
>
> It's part of a tree-wide removal of CONFIG_SUN4. If Stephen doesn't
> mind making this minor merge fixup all the time, it's probably
> best to keep it in the sparc tree.
>
> Let me know if you disagree :-)
I don't mind. git rerere is my friend :-)
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: manual merge of sparc tree
2008-06-18 5:37 ` David Miller
2008-06-18 6:23 ` Stephen Rothwell
@ 2008-06-18 7:34 ` Geert Uytterhoeven
2008-06-18 7:47 ` Stephen Rothwell
2008-06-18 7:53 ` David Miller
1 sibling, 2 replies; 10+ messages in thread
From: Geert Uytterhoeven @ 2008-06-18 7:34 UTC (permalink / raw)
To: David Miller; +Cc: Stephen Rothwell, linux-next, bunk, Geert Uytterhoeven
On Tue, 17 Jun 2008, David Miller wrote:
> From: Geert Uytterhoeven <geert@linux-m68k•org>
> Date: Tue, 17 Jun 2008 22:32:01 +0200 (CEST)
>
> > On Tue, 17 Jun 2008, David Miller wrote:
> > > From: Stephen Rothwell <sfr@canb•auug.org.au>
> > > Date: Tue, 17 Jun 2008 17:21:50 +1000
> > >
> > > > Today's linux-next merge of the sparc tree got a trivial contextual
> > > > conflict in include/asm-m68k/sbus.h between commit
> > > > 69edc57f65f2d0bf63485cba4567876a1cfa3dae ("m68k/sun3/: possible
> > > > cleanups") from the m68k tree and commit
> > > > 878e7a6e498bec55f10a163197c41554fb078416 ("sparc: remove CONFIG_SUN4")
> > > > from the sparc tree.
> > > >
> > > > It was just close changes to the same file. I fixed it up.
> >
> > If you want your change to include/asm-m68k/sbus.h to go in through the
> > m68k tree, please send me the patch.
>
> It's part of a tree-wide removal of CONFIG_SUN4. If Stephen doesn't
For sparc it is. For m68k, it's the removal of something that was
blindly copied and never needed.
> mind making this minor merge fixup all the time, it's probably
> best to keep it in the sparc tree.
Never mind, I already added it to my tree. Probably yours will be
integrated in mainline earlier, so I'll just drop it at that time.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k•org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: linux-next: manual merge of sparc tree
2008-06-18 7:34 ` Geert Uytterhoeven
@ 2008-06-18 7:47 ` Stephen Rothwell
2008-06-18 7:53 ` David Miller
1 sibling, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2008-06-18 7:47 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: David Miller, linux-next, bunk
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
On Wed, 18 Jun 2008 09:34:40 +0200 (CEST) Geert Uytterhoeven <geert@linux-m68k•org> wrote:
>
> Never mind, I already added it to my tree. Probably yours will be
> integrated in mainline earlier, so I'll just drop it at that time.
Or Linus will do the same trivial conflict resolution I did and noone
will even notice :-)
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: manual merge of sparc tree
2008-06-18 7:34 ` Geert Uytterhoeven
2008-06-18 7:47 ` Stephen Rothwell
@ 2008-06-18 7:53 ` David Miller
1 sibling, 0 replies; 10+ messages in thread
From: David Miller @ 2008-06-18 7:53 UTC (permalink / raw)
To: geert; +Cc: sfr, linux-next, bunk
From: Geert Uytterhoeven <geert@linux-m68k•org>
Date: Wed, 18 Jun 2008 09:34:40 +0200 (CEST)
> Never mind, I already added it to my tree. Probably yours will be
> integrated in mainline earlier, so I'll just drop it at that time.
Ok.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2008-06-18 7:53 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-17 7:21 linux-next: manual merge of sparc tree Stephen Rothwell
2008-06-17 7:35 ` David Miller
2008-06-17 20:32 ` Geert Uytterhoeven
2008-06-17 21:03 ` Adrian Bunk
2008-06-17 21:16 ` Geert Uytterhoeven
2008-06-18 5:37 ` David Miller
2008-06-18 6:23 ` Stephen Rothwell
2008-06-18 7:34 ` Geert Uytterhoeven
2008-06-18 7:47 ` Stephen Rothwell
2008-06-18 7:53 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox