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

[James Morris]

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.


- James
-- 
James Morris
<jmorris@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/