lkml.org 
[lkml]   [2011]   [Mar]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the block tree with Linus' tree
Hi Jens,

Today's linux-next merge of the block tree got a conflict in
block/blk-flush.c between commit 255bb490c8c27eed484d538efe6ef6a7473bd3f6
("block: blk-flush shouldn't call directly into q->request_fn()
__blk_run_queue()") from the tree and commit
ae1b1539622fb46e51b4d13b3f9e5f4c713f86ae ("block: reimplement FLUSH/FUA
to support merge") from the block tree.

The latter rewrote a large part of the file, so I just used that. If
this is not correct, please fix it up in the block tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-03-07 03:23    [W:1.132 / U:0.420 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site