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,
Fenghua Yu <fenghua.yu@intel•com>,
Oleg Nesterov <oleg@redhat•com>
Subject: linux-next: manual merge of the cgroup tree with the tip tree
Date: Mon, 21 Dec 2015 15:41:21 +1100 [thread overview]
Message-ID: <20151221154121.4bfb97b7@canb.auug.org.au> (raw)
Hi Tejun,
Today's linux-next merge of the cgroup tree got a conflict in:
include/linux/cgroup_subsys.h
between commit:
5ad9144cdb9a ("x86,cgroup/intel_rdt : Add a cgroup interface to manage Intel cache allocation")
from the tip tree and commit:
b53202e63089 ("cgroup: kill cgrp_ss_priv[CGROUP_CANFORK_COUNT] and friends")
from the cgroup tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc include/linux/cgroup_subsys.h
index c559ef5cae23,0df0336acee9..000000000000
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@@ -58,15 -52,6 +52,10 @@@ SUBSYS(net_prio
SUBSYS(hugetlb)
#endif
+#if IS_ENABLED(CONFIG_INTEL_RDT)
+SUBSYS(intel_rdt)
+#endif
+
- /*
- * Subsystems that implement the can_fork() family of callbacks.
- */
- SUBSYS_TAG(CANFORK_START)
-
#if IS_ENABLED(CONFIG_CGROUP_PIDS)
SUBSYS(pids)
#endif
next reply other threads:[~2015-12-21 4:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-21 4:41 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-25 5:15 linux-next: manual merge of the cgroup tree with the tip tree Stephen Rothwell
2022-09-12 5:59 Stephen Rothwell
2022-10-10 21:00 ` Stephen Rothwell
2015-12-21 4:41 Stephen Rothwell
2015-12-21 4:48 ` Tejun Heo
2016-01-11 15:15 ` Ingo Molnar
2015-10-16 5:40 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=20151221154121.4bfb97b7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=fenghua.yu@intel$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=oleg@redhat$(echo .)com \
--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