From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932073AbcAMIsd (ORCPT <rfc822;w@1wt.eu>);
	Wed, 13 Jan 2016 03:48:33 -0500
Received: from ozlabs.org ([103.22.144.67]:51971 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751684AbcAMIsc (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 13 Jan 2016 03:48:32 -0500
Message-ID: <1452674905.7404.3.camel@ellerman.id.au>
Subject: Re: [Xen-devel] [GIT PULL] xen: features and fixes for 4.5-rc0
From: Michael Ellerman <mpe@ellerman.id.au>
To: David Vrabel <david.vrabel@citrix.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc: xen-devel <xen-devel@lists.xenproject.org>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Date: Wed, 13 Jan 2016 19:48:25 +1100
In-Reply-To: <56951415.4030202@citrix.com>
References: <569392B1.9010905@cantab.net>
	 <20160112100141.3eac615c@canb.auug.org.au> <56951415.4030202@citrix.com>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.16.5-1ubuntu3.1 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, 2016-01-12 at 14:56 +0000, David Vrabel wrote:
> On 11/01/16 23:01, Stephen Rothwell wrote:
> > Hi David,
> > 
> > On Mon, 11 Jan 2016 11:32:01 +0000 David Vrabel <dvrabel@cantab.net> wrote:
> > > 
> > > Please git pull the following tag:
> > > 
> > >  git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git for-linus-4.5-rc0-tag
> > > 
> > > xen: features and fixes for 4.5-rc0
> > > 
> > > - - Stolen ticks and PV wallclock support for arm/arm64.
> > > - - Add grant copy ioctl to gntdev device.
> > 
> > So the version I have of this in linux-next has not been updated since
> > Dec 2 and is based on v4.4-rc1.  The version above is based on
> > v4.4-rc6 and has extra commits ... Did someone forget to update the
> > xen-tip/linux-next branch?
> 
> Yes.
> 
> Ideally I'd like the linux-next branch in ../xen/tip.git to be symbolic
> reference to the current for-linus-x.y branch so I do not have to
> remember to push to two different branches.  I can't see a way to do
> this though.

You're using tags for the pull request though, so do you need the for-linus-x.y
branch at all?

I've stopped using them, and instead just push to next and ask Linus to pull
a tag. That also avoids any possibility of the for-linus-x.y branch getting out
of sync with the for-linus-x.y tag.

cheers