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
Hi Tejun,

On Fri, 23 Jul 2010 13:34:55 +0200 Tejun Heo <tj@kernel.org> 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 sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-07-23 13:45    [from the cache]
©2003-2011 Jasper Spaans