linux-next: manual merge of the block tree with the Linus' tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp2TPVteQSfD.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux