From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Neil Brown <neilb@suse•de>
Cc: linux-next@vger•kernel.org, Denis ChengRq <crquan@gmail•com>,
Jens Axboe <jens.axboe@oracle•com>, Tejun Heo <tj@kernel•org>,
Andre Noll <maan@systemlinux•org>
Subject: Re: linux-next: manual merge of the md tree
Date: Thu, 16 Oct 2008 17:13:00 +1100 [thread overview]
Message-ID: <20081016171300.bb2184ff.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20081016170757.87ccb3bf.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 670 bytes --]
Hi Neil,
On Thu, 16 Oct 2008 17:07:57 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Wed, 15 Oct 2008 21:52:38 +1100 Neil Brown <neilb@suse•de> wrote:
> >
> > I pushed out a new for-next just a couple of hours before I got this
> > email which resolves that, so the conflict should disappear in your
> > next merge.
>
> Thanks for that. Unfortunately, neil.brown.name was unresolvable this
> morning so it will have to wait for tomorrow.
Actually I just managed to fetch it now, so it will make today's tree (if
I finish it :-().
--
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-10-16 6:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-15 8:34 linux-next: manual merge of the md tree Stephen Rothwell
2008-10-15 10:52 ` Neil Brown
2008-10-16 6:07 ` Stephen Rothwell
2008-10-16 6:13 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-15 8:41 Stephen Rothwell
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=20081016171300.bb2184ff.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=crquan@gmail$(echo .)com \
--cc=jens.axboe@oracle$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maan@systemlinux$(echo .)org \
--cc=neilb@suse$(echo .)de \
--cc=tj@kernel$(echo .)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