* linux-next: manual merge of the block tree with the Linus' tree
@ 2010-09-16 2:04 Stephen Rothwell
2010-09-16 6:26 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-09-16 2:04 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, Jiri Slaby, Tejun Heo
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the block tree with the Linus' tree
2010-09-16 2:04 linux-next: manual merge of the block tree with the Linus' tree Stephen Rothwell
@ 2010-09-16 6:26 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2010-09-16 6:26 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jiri Slaby, Tejun Heo
On 2010-09-16 04:04, Stephen Rothwell wrote:
> 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.
Thanks Stephen, I will merge in -git in for-next to resolve these
for you so you don't have to carry it.
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-16 6:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-16 2:04 linux-next: manual merge of the block tree with the Linus' tree Stephen Rothwell
2010-09-16 6:26 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).