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,
Andrew Morton <akpm@linux-foundation•org>
Subject: Re: linux-next: manual merge of the workqueues tree with Linus' tree
Date: Tue, 19 Mar 2013 15:13:08 -0700 [thread overview]
Message-ID: <20130319221308.GS3042@htj.dyndns.org> (raw)
In-Reply-To: <20130320090540.81c687d28ffe3a6abe905816@canb.auug.org.au>
On Wed, Mar 20, 2013 at 09:05:40AM +1100, Stephen Rothwell wrote:
> > Anyways, I pulled master into wq/for-next and resolved it there, so it
> > shouldn't cause you any more trouble.
>
> Ah, OK, thanks. One small point, when you do a back merge like that,
> you should always put an explanation in the commit message for the merge.
Oh, I do that for any permanent branches. for-next branches are
ephemeral (at least in my trees) so I usually don't bother. I do
compare against for-next when and after sending pull requests with
proper conflict descriptions, so things are not likely to slip through
there. Hmmm.... if it's gonna be helpful to you, I'd be happy to
describe merge conflicts and resolutions in for-next merges. Would
that be helpful?
Thanks.
--
tejun
next prev parent reply other threads:[~2013-03-19 22:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-19 2:19 linux-next: manual merge of the workqueues tree with Linus' tree Stephen Rothwell
2013-03-19 21:12 ` Tejun Heo
2013-03-19 22:05 ` Stephen Rothwell
2013-03-19 22:13 ` Tejun Heo [this message]
2013-03-19 22:20 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-06-26 4:11 Stephen Rothwell
2021-07-15 1:22 Stephen Rothwell
2014-01-13 4:09 Stephen Rothwell
2013-03-14 4:29 Stephen Rothwell
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=20130319221308.GS3042@htj.dyndns.org \
--to=tj@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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