From: Geert Uytterhoeven <geert@linux-m68k•org>
To: Adrian Bunk <bunk@stusta•de>
Cc: David Miller <davem@davemloft•net>,
Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org,
Geert Uytterhoeven <geert@linux-m68k•org>
Subject: Re: linux-next: manual merge of sparc tree
Date: Tue, 17 Jun 2008 23:16:53 +0200 (CEST) [thread overview]
Message-ID: <Pine.LNX.4.64.0806172316140.8377@anakin> (raw)
In-Reply-To: <20080617210342.GA25911@cs181133002.pp.htv.fi>
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
next prev parent reply other threads:[~2008-06-17 21:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0806172316140.8377@anakin \
--to=geert@linux-m68k$(echo .)org \
--cc=bunk@stusta$(echo .)de \
--cc=davem@davemloft$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox