From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: linux-next@vger.kernel.org, bunk@kernel.org, geert@linux-m68k.org
Subject: Re: linux-next: manual merge of sparc tree
Date: Tue, 17 Jun 2008 00:35:34 -0700 (PDT) [thread overview]
Message-ID: <20080617.003534.193689527.davem@davemloft.net> (raw)
In-Reply-To: <20080617172150.9ef1ea69.sfr@canb.auug.org.au>
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.
next prev parent reply other threads:[~2008-06-17 7:35 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 [this message]
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
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=20080617.003534.193689527.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=bunk@kernel.org \
--cc=geert@linux-m68k.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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