lkml.org 
[lkml]   [2012]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: CRYPTO_DEV_NX merge problem (Re: linux-next: Tree for July 31)
From
Date
On Wed, 2012-08-01 at 08:00 +1000, Michael Neuling wrote:
>
> OK. Please post the fix as a patch. Anton's patch is already in the
> powerpc next tree so it won't be changed/rebased directly.
>
> I'm not sure who can carry this, since the crypto tree doesn't have
> Anton's change and the powerpc tree doesn't have Seth's change.
>
> sfr: who normally carries it when we have a merge issue like this?
> You?

There is no powerpc -next tree at this point, Anton patch is either
upstream or in no tree.

Cheers,
Ben.




\
 
 \ /
  Last update: 2012-08-01 00:41    [W:0.032 / U:0.736 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site