linux-cifs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
	Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: linux-next: manual merge of the workqueues tree with the Linus' tree
Date: Fri, 23 Jul 2010 13:45:16 +0200	[thread overview]
Message-ID: <4C4980CC.7070909@kernel.org> (raw)
In-Reply-To: <20100723214233.7cb7de8d.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>

Hello,

On 07/23/2010 01:42 PM, Stephen Rothwell wrote:
> On Fri, 23 Jul 2010 13:34:55 +0200 Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.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.

Yeah, sorry about causng headaches in linux-next.  I'll test merge w/
mainline and let you know non-trivial conflicts for future commits.

Thank you.

-- 
tejun

  parent reply	other threads:[~2010-07-23 11:45 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-23  4:46 linux-next: manual merge of the workqueues tree with the Linus' tree Stephen Rothwell
     [not found] ` <20100723144600.dd4da992.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2010-07-23 11:28   ` Tejun Heo
     [not found]     ` <4C497CD5.5010908-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2010-07-23 11:31       ` Stephen Rothwell
     [not found]         ` <20100723213148.3d2193a3.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2010-07-23 11:34           ` Tejun Heo
     [not found]             ` <4C497E5F.80301-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2010-07-23 11:42               ` Stephen Rothwell
     [not found]                 ` <20100723214233.7cb7de8d.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2010-07-23 11:45                   ` Tejun Heo [this message]
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=4C4980CC.7070909@kernel.org \
    --to=tj-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \
    --cc=dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org \
    --cc=smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    /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;
as well as URLs for NNTP newsgroup(s).