Re: linux-next: manual merge of the security-testing tree with the tree
From: James Morris <jmorris@namei.org>
Date: 2011-06-30 05:22:49
Also in:
linux-next, lkml
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 [off-list ref]