From: James Morris Date: Thu, 30 Jun 2011 05:22:33 GMT Subject: Re: linux-next: manual merge of the security-testing tree with the tree Message-ID: In-Reply-To: <20110630142910.2fea4257.sfr@canb.auug.org.au> 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