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

[Tejun Heo]

Hello,

On 07/23/2010 01:42 PM, Stephen Rothwell wrote:
> On Fri, 23 Jul 2010 13:34:55 +0200 Tejun Heo <tj@xxxxxxxxxx> wrote:
>>
>> 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?
> 
> Either would work.  Linus is fine with doing merge fixups and, after all,
> I figured it out. :-)
> 
> A description always helps, of course.

Yeah, sorry about causng headaches in linux-next.  I'll test merge w/
mainline and let you know non-trivial conflicts for future commits.

Thank you.

-- 
tejun
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/