From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: the cgroup tree has an unnecessary merge
Date: Wed, 18 Jun 2014 08:49:21 +1000 [thread overview]
Message-ID: <20140618084921.07c3b391@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 557 bytes --]
Hi Tejun,
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).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-06-17 22:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 22:49 Stephen Rothwell [this message]
2014-06-17 22:51 ` linux-next: the cgroup tree has an unnecessary merge Tejun Heo
2014-06-17 22:54 ` Tejun Heo
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=20140618084921.07c3b391@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tj@kernel$(echo .)org \
/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