[lkml]   [2011]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
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:// 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

 \ /
  Last update: 2011-06-30 07:25    [W:0.229 / U:5.900 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site