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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 23 Jul 2010 21:42:33 +1000

Hi Tejun,

On Fri, 23 Jul 2010 13:34:55 +0200 Tejun Heo <[email-masked]> 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.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/