From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>, Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@elte•hu>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kirill Tkhai <ktkhai@odin•com>
Subject: linux-next: manual merge of the cgroup tree with the tip tree
Date: Fri, 16 Oct 2015 16:40:21 +1100 [thread overview]
Message-ID: <20151016164021.754c1856@canb.auug.org.au> (raw)
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@canb•auug.org.au
next reply other threads:[~2015-10-16 5:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-16 5:40 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-12-21 4:41 linux-next: manual merge of the cgroup tree with the tip tree Stephen Rothwell
2015-12-21 4:48 ` Tejun Heo
2016-01-11 15:15 ` Ingo Molnar
2015-12-21 4:41 Stephen Rothwell
2022-09-12 5:59 Stephen Rothwell
2022-10-10 21:00 ` Stephen Rothwell
2025-11-25 5:15 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=20151016164021.754c1856@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=ktkhai@odin$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--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