From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 30 Jun 2011 05:53:54 GMT
Subject: Re: linux-next: manual merge of the security-testing tree with the tree
Message-ID: <20110630155354.bdd620b5.sfr@canb.auug.org.au>
In-Reply-To: <alpine.LRH.2.00.1106301518430.13767@tundra.namei.org>

Hi James,

On Thu, 30 Jun 2011 15:22:33 +1000 (EST) James Morris <jmorris@namei.org> wrote:
>
> On Thu, 30 Jun 2011, Stephen Rothwell wrote:
> 
> > I cannot merge commit bcd05ca10420 ("Merge branch 'for-security' of
> > git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev into next")
> > which is the child of the above two commits.
> 
> Actually, I may have accidentally pulled upstream commits in via the 
> above.  I'll rebase my tree to the TOMOYO merge.

It does pull in v3.0-rc5, but that is already in my tree today, so I
still don't understand why the merge I did gets so messaed up.

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