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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4CEACFBC.8050402@kernel.dk>
Date:	Mon, 22 Nov 2010 21:17:00 +0100
From:	Jens Axboe <axboe@...nel.dk>
To:	Jeremy Fitzhardinge <jeremy@...p.org>
CC:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Xen Devel <Xen-devel@...ts.xensource.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christoph Hellwig <hch@....de>
Subject: Re: linux-next: manual merge of the xen tree with Linus' tree

On 2010-11-22 21:15, Jeremy Fitzhardinge wrote:
> 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
> somewhere?

No, they are in for-linus as written above. Just not shipped off yet,
will be soon.

-- 
Jens Axboe

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/