Messages in this thread | | | Date | Mon, 15 Nov 2010 11:23:52 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the xen tree with Linus' tree |
| |
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/ [unhandled content-type:application/pgp-signature] | |