Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758509Ab0KOVHv (ORCPT ); Mon, 15 Nov 2010 16:07:51 -0500 Received: from 0122700014.0.fullrate.dk ([95.166.99.235]:53463 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754205Ab0KOVHu (ORCPT ); Mon, 15 Nov 2010 16:07:50 -0500 Message-ID: <4CE1A124.3010108@kernel.dk> Date: Mon, 15 Nov 2010 22:07:48 +0100 From: Jens Axboe MIME-Version: 1.0 To: Jeremy Fitzhardinge CC: Stephen Rothwell , Xen Devel , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig Subject: Re: linux-next: manual merge of the xen tree with Linus' tree References: <20101115112352.6cbf5604.sfr@canb.auug.org.au> <4CE1A07B.5010202@goop.org> In-Reply-To: <4CE1A07B.5010202@goop.org> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1045 Lines: 28 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). -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/