linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the cgroup tree

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] [day] [month] [year] [list]

Message-Id: <20140214153010.7ccb12b8518a46b21a158b22@canb.auug.org.au>
Date:	Fri, 14 Feb 2014 15:30:10 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Tejun Heo <tj@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Viresh Kumar <viresh.kumar@...aro.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 cgroup tree

[Just adding Tejun]

On Fri, 14 Feb 2014 15:25:57 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi Andrew,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in
> kernel/cpuset.c between commit d66393e54e0a ("cpuset: use
> css_task_iter_start/next/end() instead of css_scan_tasks()") from the
> cgroup tree and commit a82211b06d6e ("cpusets: allocate heap only when
> required") from the akpm-current tree.
> 
> I fixed it up (the former removed the need for the heap, so I effectively
> remove the latter) and can carry the fix as necessary (no action is
> required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au


-- 
Cheers,
Stephen Rothwell <sfr@...b.auug.org.au>

Content of type "application/pgp-signature" skipped