Re: linux-next: manual merge of the security-testing tree with thetree

From: Stephen Rothwell
Date: Thu Jun 30 2011 - 00:39:31 EST


On Thu, 30 Jun 2011 14:33:34 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> On Thu, 30 Jun 2011 14:29:10 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature