From: Tejun Heo <tj@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>,
Steve French <smfrench@gmail.com>,
linux-cifs@vger.kernel.org
Subject: Re: linux-next: manual merge of the workqueues tree with the Linus' tree
Date: Fri, 23 Jul 2010 13:34:55 +0200 [thread overview]
Message-ID: <4C497E5F.80301@kernel.org> (raw)
In-Reply-To: <20100723213148.3d2193a3.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2010-07-23 11:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 4:46 Stephen Rothwell
2010-07-23 11:28 ` Tejun Heo
2010-07-23 11:31 ` Stephen Rothwell
2010-07-23 11:34 ` Tejun Heo [this message]
2010-07-23 11:42 ` Stephen Rothwell
2010-07-23 11:45 ` Tejun Heo
2010-08-05 3:04 ` Stephen Rothwell
2010-08-05 3:45 ` Stephen Rothwell
2010-07-23 12:05 ` David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C497E5F.80301@kernel.org \
--to=tj@kernel.org \
--cc=dhowells@redhat.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=smfrench@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome