lkml.org 
[lkml]   [2011]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the security-testing tree with the tree
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@namei.org>


\
 
 \ /
  Last update: 2011-06-30 07:25    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site