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

Today's linux-next merge of the block tree got a conflict in
drivers/block/loop.c between commit
5e00d1b5b4c10fb839afd5ce61db8e24339454b0 ("BLOCK: fix bio.bi_rw
handling") from Linus' tree and commit
6259f28459a9de820f47a9ece4ffa22d4596a9af ("block/loop: implement
REQ_FLUSH/FUA support") from the block tree.

I fixed it up (the latter removed the line that the former changed) and
can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-09-16 04:07    [W:0.030 / U:3.160 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site