Home » Mailing list archives » linux-kernel » 2010 » November » 15

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

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Stephen Rothwell
Subject: linux-next: manual merge of the xen tree with Linus' tree
Date: Sunday, November 14, 2010 - 5:23 pm

Hi all,

Today's linux-next merge of the xen tree got a conflict in
drivers/block/xen-blkfront.c between commit
02e031cbc843b010e72fcc05c76113c688b2860f ("block: remove
REQ_HARDBARRIER") from Linus' tree and commits
c64e38ea17a81721da0393584fd807f8434050fa ("xen/blkfront: map REQ_FLUSH
into a full barrier") and be2f8373c188ed1f5d36003c9928e4d695213080
("xen/blkfront: Implement FUA with BLKIF_OP_WRITE_BARRIER") from the xen
tree.

I used the xen tree version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
linux-next: manual merge of the xen tree with Linus' tree, Stephen Rothwell, (Sun Nov 14, 5:23 pm)
Re: linux-next: manual merge of the xen tree with Linus' tree, Jeremy Fitzhardinge, (Mon Nov 15, 2:04 pm)
Re: linux-next: manual merge of the xen tree with Linus' tree, Jens Axboe, (Mon Nov 15, 2:07 pm)
Re: linux-next: manual merge of the xen tree with Linus' tree, Jeremy Fitzhardinge, (Mon Nov 22, 1:15 pm)
Re: linux-next: manual merge of the xen tree with Linus' tree, Jens Axboe, (Mon Nov 22, 1:17 pm)
Re: linux-next: manual merge of the xen tree with Linus' tree, Jeremy Fitzhardinge, (Mon Nov 22, 1:21 pm)