Re: linux-next: manual merge of the workqueues tree with the Linus'tree
From: Stephen Rothwell
Date: Fri Jul 23 2010 - 07:42:49 EST
Hi Tejun,
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.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp00000.pgp
Description: PGP signature