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
Subject: Re: linux-next: the cgroup tree has an unnecessary merge
Date: Tue, 17 Jun 2014 18:54:03 -0400 [thread overview]
Message-ID: <20140617225403.GB8838@mtj.dyndns.org> (raw)
In-Reply-To: <20140617225159.GA8838@mtj.dyndns.org>
On Tue, Jun 17, 2014 at 06:51:59PM -0400, Tejun Heo wrote:
> Hello, Stephen.
>
> On Wed, Jun 18, 2014 at 08:49:21AM +1000, Stephen Rothwell wrote:
> > The cgroup tree has a merge of 963649d735c8 and c731ae1d0f02 both of
> > which are already merged into v3.16-rc1. Why did you just not use
> > v3.16-rc1 itself (or the point where Linus merged your tree) (and then
> > add the other commit on top? That would have removed any chance that
> > you resolved the merged differently to how it was resolved in Linus'
> > tree (I don't know if there is a difference, but I have had conflicts
> > from different merge resolutions in the past).
>
> Oops, my mistake. Reset to for-3.16-fixes.
Heh, the mistake was in cgroup/for-3.16-fixes. I branched it off the
wrong base. Thanks for noticing it early. Fixed now.
Thanks.
--
tejun
next prev parent reply other threads:[~2014-06-17 22:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 22:49 linux-next: the cgroup tree has an unnecessary merge Stephen Rothwell
2014-06-17 22:51 ` Tejun Heo
2014-06-17 22:54 ` Tejun Heo [this message]
2014-06-17 22:58 ` 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=20140617225403.GB8838@mtj.dyndns.org \
--to=tj@kernel$(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