From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Zeffertt <alex.zeffertt@eu.citrix.com>
Subject: Re: xen.git branch reorg
Date: Fri, 24 Apr 2009 09:59:35 +0100
Message-ID: <49F17F77.6040903@eu.citrix.com>
References: <49F0A797.1050402@goop.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <49F0A797.1050402@goop.org>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

Jeremy Fitzhardinge wrote:
> I finally fixed the AHCI problem with xen-tip/next and pushed forward 
> with the long-threatened xen.git cleanup and reorg.
> 
> I've removed a pile of branches on 
> git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git:
> 
>     * xen/*
>     * push2/*
>     * for-*/*
> 


Does this mean we need this patch in xen-unstable.hg?

Update XEN_LINUX_GIT_REMOTEBRANCH to match changes made in upstream repo.
Needed if you want setting KERNELS=linux-2.6-pvops in config/Linux.mk to
work.

diff -r 8b152638adaa buildconfigs/mk.linux-2.6-pvops
--- a/buildconfigs/mk.linux-2.6-pvops	Thu Apr 23 16:22:48 2009 +0100
+++ b/buildconfigs/mk.linux-2.6-pvops	Fri Apr 24 09:53:40 2009 +0100
@@ -7,7 +7,7 @@

  XEN_LINUX_GIT_URL ?= git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
  XEN_LINUX_GIT_REMOTENAME ?= xen
-XEN_LINUX_GIT_REMOTEBRANCH ?= xen/dom0/hackery
+XEN_LINUX_GIT_REMOTEBRANCH ?= xen-tip/master

  EXTRAVERSION ?=