linux-kernel - linux-next: the cgroup tree has an unnecessary merge

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140618084921.07c3b391@canb.auug.org.au>
Date:	Wed, 18 Jun 2014 08:49:21 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: the cgroup tree has an unnecessary merge

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@...b.auug.org.au

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)