From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 30 Jun 2011 04:39:15 GMT
Subject: Re: linux-next: manual merge of the security-testing tree with the tree
Message-ID: <20110630143915.0b0fdf0f.sfr@canb.auug.org.au>
In-Reply-To: <20110630143334.90c9d1bc.sfr@canb.auug.org.au>

On Thu, 30 Jun 2011 14:33:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 30 Jun 2011 14:29:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > More information for the git experts:
> > 
> 
> $ git version
> git version 1.7.5.4
> 
> I am running Debian unstable.

Today's linux-next is based on v3.0-rc5-76-gc017d0d (Linus' tree commit
c017d0d135 ("Merge branch 'kvm-updates/3.0' of
git://git.kernel.org/pub/scm/virt/kvm/kvm").

The point at which I tried to merge the security-testing tree is
v3.0-rc5-3666-g9fd8fab.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/