[lkml]   [2010]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the xen tree with Linus' tree
On 11/15/2010 01:07 PM, Jens Axboe wrote:
> On 2010-11-15 22:04, Jeremy Fitzhardinge wrote:
>> On 11/14/2010 04:23 PM, Stephen Rothwell wrote:
>>> 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.
>> I'll drop that because you should be seeing those changes come via Jens.
> Yep, since Linus pulled the last batch, for-linus now has the next bits
> (which include the xen barrier set).

These don't seem to be in -rc3. Did they get dropped on the ground

are available in the git repository at:
git:// upstream/blkfront

Jeremy Fitzhardinge (4):
xen/blkfront: map REQ_FLUSH into a full barrier
xen/blkfront: change blk_shadow.request to proper pointer
xen/blkfront: Implement FUA with BLKIF_OP_WRITE_BARRIER
xen/blkfront: cope with backend that fail empty BLKIF_OP_WRITE_BARRIER requests

drivers/block/xen-blkfront.c | 55 ++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 23 deletions(-)


 \ /
  Last update: 2010-11-22 21:17    [W:0.041 / U:0.056 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site