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: <1305721938.20907.132.camel@zakaz.uk.xensource.com>
Date:	Wed, 18 May 2011 13:32:18 +0100
From:	Ian Campbell <ijc@...lion.org.uk>
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,
	Stefano Stabellini <stefano.stabellini@...citrix.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Subject: Re: linux-next: manual merge of the xen tree with Linus tree

On Tue, 2011-05-17 at 12:15 -0700, Jeremy Fitzhardinge wrote:
> On 05/17/2011 04:12 AM, Stephen Rothwell wrote:
> > Hi Jeremy,
> >
> > On Sat, 15 Jan 2011 12:05:44 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >> Today's linux-next merge of the xen tree got a conflict in
> >> drivers/xen/Kconfig, drivers/xen/gntdev.c and include/xen/gntdev.h
> >> between various commits Linus' tree and various commits from the xen tree.
> >>
> >> As previously discussed, I have dropped the xen tree for today (as it
> >> contains an older version of the changes that were merged into Linus'
> >> tree).
> > Just wondering if the xen tree is ever going to make a reappearance in
> > linux-next?
> 
> Konrad's tree has the bulk of the xen work in it at the moment.  I'm
> doing to start on a few bits and pieces, but I've not decided if I'll
> put them into linux-next myself or just push them via Konrad.
> 
> So, maybe, but maybe not.

Perhaps resetting your branch to some commit on Linus tree in the
meantime would mean Stephen doesn't have to see it everyday?

Ian.
-- 
Ian Campbell
Current Noise: Devin Townsend - Away

In an orderly world, there's always a place for the disorderly.

--
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/