 Home |
Products |
Support |
Community |
News |
xen-devel
[Xen-devel] linux-next: manual merge of the xen tree with Linus' tree
| To: | Jeremy Fitzhardinge <jeremy@xxxxxxxx>, Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx> |
|---|---|
| Subject: | [Xen-devel] linux-next: manual merge of the xen tree with Linus' tree |
| From: | Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> |
| Date: | Mon, 15 Nov 2010 11:23:52 +1100 |
| Cc: | linux-next@xxxxxxxxxxxxxxx, Hellwig <hch@xxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, Christoph |
| Delivery-date: | Sun, 14 Nov 2010 16:24:34 -0800 |
| Envelope-to: | www-data@xxxxxxxxxxxxxxxxxxx |
| List-help: | <mailto:xen-devel-request@lists.xensource.com?subject=help> |
| List-id: | Xen developer discussion <xen-devel.lists.xensource.com> |
| List-post: | <mailto:xen-devel@lists.xensource.com> |
| List-subscribe: | <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe> |
| List-unsubscribe: | <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe> |
| Sender: | xen-devel-bounces@xxxxxxxxxxxxxxxxxxx |
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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
_______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-devel |
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [Xen-devel] [xen-unstable test] 2670: all pass, xen . org |
|---|---|
| Next by Date: | [Xen-devel] [PATCH 31/44] drivers/xen: Remove unnecessary semicolons, Joe Perches |
| Previous by Thread: | [Xen-devel] [xen-unstable test] 2670: all pass, xen . org |
| Next by Thread: | [Xen-devel] Re: linux-next: manual merge of the xen tree with Linus' tree, Jeremy Fitzhardinge |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
