linux-kernel - Re: 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140617225403.GB8838@mtj.dyndns.org>
Date:	Tue, 17 Jun 2014 18:54:03 -0400
From:	Tejun Heo <tj@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: the cgroup tree has an unnecessary merge

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/