From: Jens Axboe <jens.axboe@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rusty Russell <rusty@rustcorp.com.au>,
linux-next@vger.kernel.org, Hannes Reinecke <hare@suse.de>,
Tejun Heo <tj@kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the tree
Date: Mon, 18 May 2009 08:27:47 +0200 [thread overview]
Message-ID: <20090518062747.GF4140@kernel.dk> (raw)
In-Reply-To: <20090518145318.c199842e.sfr@canb.auug.org.au>
On Mon, May 18 2009, Stephen Rothwell wrote:
> Hi Jens, Rusty,
>
> Today's linux-next merge of the block tree got a conflict in
> drivers/block/virtio_blk.c between commit
> fb8df56d3255396ff144a5f359f711e516e7d7b1 ("virtio_blk: SG_IO passthru
> support") from the rr tree and commit
> 40cbbb781d3eba5d6ac0860db078af490e5c7c6b ("block: implement and use [__]
> blk_end_request_all()") from the block tree.
>
> I have no idea what the correct solution is here, so I used the version
> from the block tree for today.
Rusty, perhaps it would be easier if I took the SG_IO patch through the
block tree?
--
Jens Axboe
next prev parent reply other threads:[~2009-05-18 6:27 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-18 4:53 linux-next: manual merge of the block tree with the tree Stephen Rothwell
2009-05-18 6:27 ` Jens Axboe [this message]
2009-05-18 12:34 ` Rusty Russell
2009-05-18 12:42 ` Jens Axboe
2009-05-19 0:11 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-07-01 5:37 Stephen Rothwell
2009-07-01 6:59 ` Jens Axboe
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
2010-12-17 1:28 Stephen Rothwell
2010-12-17 14:53 ` James Bottomley
2010-12-18 7:15 ` Tejun Heo
2013-11-01 3:20 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
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=20090518062747.GF4140@kernel.dk \
--to=jens.axboe@oracle.com \
--cc=hare@suse.de \
--cc=linux-next@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=sfr@canb.auug.org.au \
--cc=tj@kernel.org \
/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.