Subject: Re: linux-next: manual merge of sparc tree

From: David Miller <[email-masked]>
Date: Tue, 17 Jun 2008 22:37:07 -0700 (PDT)

From: Geert Uytterhoeven <[email-masked]>
Date: Tue, 17 Jun 2008 22:32:01 +0200 (CEST)

> On Tue, 17 Jun 2008, David Miller wrote:
> > From: Stephen Rothwell <[email-masked]>
> > 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 :-)