[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4C497E5F.80301@kernel.org>
Date: Fri, 23 Jul 2010 13:34:55 +0200
From: Tejun Heo <tj@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
CC: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
David Howells <dhowells@...hat.com>,
Steve French <smfrench@...il.com>, linux-cifs@...r.kernel.org
Subject: Re: linux-next: manual merge of the workqueues tree with the Linus'
tree
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists