Subject: Re: linux-next: manual merge of the workqueues tree with the Linus' tree

From: Tejun Heo <[email-masked]>
Date: Fri, 23 Jul 2010 13:34:55 +0200

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