public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <jens.axboe@oracle•com>
Cc: linux-next@vger•kernel.org
Subject: Re: linux-next: block merge conflicts
Date: Thu, 12 Jun 2008 11:08:08 +1000	[thread overview]
Message-ID: <20080612110808.d0815065.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20080611195604.GE20851@kernel.dk>

[-- Attachment #1: Type: text/plain, Size: 506 bytes --]

Hi Jens,

On Wed, 11 Jun 2008 21:56:06 +0200 Jens Axboe <jens.axboe@oracle•com> wrote:
>
> No worries, I'll make sure to compile test everything again and send you
> a note. I had half-expected the move of the arch defines from
> linux/smp.h to asm/smp.h to cause a problem or two, I'll double check
> everything.
> 
> I'll send you a note tomorrow when things are going.

OK, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

  reply	other threads:[~2008-06-12  1:08 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-11  8:47 linux-next: block merge conflicts Stephen Rothwell
2008-06-11 19:56 ` Jens Axboe
2008-06-12  1:08   ` Stephen Rothwell [this message]
2008-06-12 13:26     ` Jens Axboe
2008-06-12 13:32       ` Stephen Rothwell
2008-06-13  7:22 ` linux-next: manual merge of block tree Stephen Rothwell
2008-06-13  7:48   ` Jens Axboe

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=20080612110808.d0815065.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=jens.axboe@oracle$(echo .)com \
    --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