All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jens Axboe <axboe@kernel.dk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dave Kleikamp <dave.kleikamp@oracle.com>,
	Kent Overstreet <kmo@daterainc.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Zach Brown <zab@zabbo.net>, Olof Johansson <olof@lixom.net>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the block tree with the  tree
Date: Thu, 7 Nov 2013 19:39:01 -0700	[thread overview]
Message-ID: <20131108023901.GE10212@kernel.dk> (raw)
In-Reply-To: <20131108125307.613427c04a7527c4359e6443@canb.auug.org.au>

On Fri, Nov 08 2013, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 07 Nov 2013 18:04:57 -0600 Dave Kleikamp <dave.kleikamp@oracle.com> wrote:
> >
> > Can you please drop the aio-direct tree for the time being?
> 
> OK, I was afraid of this, but, yes, I can drop it.  I am not quite sure
> what affect this will have on Andrew's tree, though (hopefully not too
> much).
> 
> This is a bit disappointing.  Dave's stuff have been sitting in
> linux-next for quite some time (probably too long) so it is not as if
> Kent and Jens (should) have been unaware of it.

If it doesn't throw merge errors for you, I am not aware of it.

-- 
Jens Axboe

  parent reply	other threads:[~2013-11-08  2:39 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-01  3:20 linux-next: manual merge of the block tree with the tree Stephen Rothwell
2013-11-01 15:10 ` Jens Axboe
2013-11-01 20:22   ` Stephen Rothwell
2013-11-01 20:27     ` Jens Axboe
2013-11-01 20:41       ` Dave Kleikamp
2013-11-01 20:53         ` Jens Axboe
2013-11-01 21:07           ` Dave Kleikamp
2013-11-02 20:50           ` Dave Kleikamp
2013-11-07 19:17             ` Olof Johansson
2013-11-07 19:20               ` Kent Overstreet
2013-11-07 19:20             ` Dave Kleikamp
2013-11-07 19:25               ` Kent Overstreet
2013-11-07 19:38                 ` Dave Kleikamp
2013-11-08  0:04                 ` Dave Kleikamp
2013-11-08  1:53                   ` Stephen Rothwell
2013-11-08  2:08                     ` Kent Overstreet
2013-11-08  2:32                       ` Dave Kleikamp
2013-11-08  7:33                         ` Christoph Hellwig
2013-11-08  7:39                           ` Kent Overstreet
2013-11-08  7:44                             ` Christoph Hellwig
2013-11-08  7:56                               ` Kent Overstreet
2013-11-08  8:02                                 ` Christoph Hellwig
2013-11-08  8:17                                   ` Kent Overstreet
2013-11-08  8:32                                     ` Christoph Hellwig
2013-11-08  9:21                                       ` Kent Overstreet
2013-11-08 17:56                                         ` Zach Brown
2013-11-08 15:10                           ` Dave Kleikamp
2013-11-08 15:29                           ` Jens Axboe
2013-11-08 16:15                             ` Jens Axboe
2013-11-10 21:32                               ` Stephen Rothwell
2013-11-08  2:39                     ` Jens Axboe [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-12-17  1:28 Stephen Rothwell
2010-12-17 14:53 ` James Bottomley
2010-12-18  7:15   ` Tejun Heo
2009-09-10  4:48 Stephen Rothwell
2009-09-10  7:24 ` Jens Axboe
2009-09-10  7:40   ` Stephen Rothwell
2009-09-10  7:43     ` Jens Axboe
2009-07-01  5:37 Stephen Rothwell
2009-07-01  6:59 ` Jens Axboe
2009-05-18  4:53 Stephen Rothwell
2009-05-18  6:27 ` Jens Axboe
2009-05-18 12:34   ` Rusty Russell
2009-05-18 12:42     ` Jens Axboe
2009-05-19  0:11       ` 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=20131108023901.GE10212@kernel.dk \
    --to=axboe@kernel.dk \
    --cc=akpm@linux-foundation.org \
    --cc=dave.kleikamp@oracle.com \
    --cc=kmo@daterainc.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    --cc=zab@zabbo.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.