lkml.org 
[lkml]   [2010]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the workqueues tree with the Linus' tree
Hello,

On 07/23/2010 01:31 PM, Stephen Rothwell wrote:
>> Yes, one failure case is removed, so that would be correct.
>
> Thanks for the confirmation. This should probably be fixed in the
> workqueues tree before it is merged upstream.

I was thinking about sending pull request w/ a note describing how to
resolve the conflict. Would pulling in master before requesting pull
be better?

Thanks.

--
tejun


\
 
 \ /
  Last update: 2010-07-23 13:37    [W:0.049 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site