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

From: David Miller <[email-masked]>
Date: Tue, 17 Jun 2008 00:35:34 -0700 (PDT)

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.

Thanks.