From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Geert Uytterhoeven <geert@linux-m68k•org>
Cc: David Miller <davem@davemloft•net>,
linux-next@vger•kernel.org, bunk@kernel•org
Subject: Re: linux-next: manual merge of sparc tree
Date: Wed, 18 Jun 2008 17:47:24 +1000 [thread overview]
Message-ID: <20080618174724.62adc27f.sfr@canb.auug.org.au> (raw)
In-Reply-To: <Pine.LNX.4.64.0806180933110.8377@anakin>
[-- 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 --]
next prev parent reply other threads:[~2008-06-18 7:47 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
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 [this message]
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=20080618174724.62adc27f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bunk@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=geert@linux-m68k$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
/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