linux-kernel - linux-next: manual merge of the cgroup tree with the tip 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>] [day] [month] [year] [list]

Date:	Fri, 16 Oct 2015 16:40:21 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>, Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kirill Tkhai <ktkhai@...n.com>
Subject: linux-next: manual merge of the cgroup tree with the tip tree

Hi Tejun,

Today's linux-next merge of the cgroup tree got conflicts in:

  kernel/events/core.c
  kernel/sched/core.c

between commits:

  516792e67c39 ("perf/core: Delete PF_EXITING checks from perf_cgroup_exit() callback")
  446685e9bfa1 ("sched/core: Delete PF_EXITING checks from cpu_cgroup_exit() callback")

from the tip tree and commit:

  2e91fa7f6d45 ("cgroup: keep zombies associated with their original cgroups")

from the cgroup tree.

I fixed it up (the latter removed the two functions that were modified
by the former 2 commits) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
--
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/