From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Tejun Heo <tj@kernel•org>,
Chengming Zhou <zhouchengming@bytedance•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the cgroup tree
Date: Tue, 11 Oct 2022 07:57:48 +1100 [thread overview]
Message-ID: <20221011075748.3db42926@canb.auug.org.au> (raw)
In-Reply-To: <20220912161812.072aaa3b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1925 bytes --]
Hi all,
On Mon, 12 Sep 2022 16:18:12 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> After merging the cgroup tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> kernel/cgroup/cgroup.c:5275:26: error: 'CFTYPE_PRESSURE' undeclared here (not in a function)
> 5275 | .flags = CFTYPE_PRESSURE,
> | ^~~~~~~~~~~~~~~
>
> Caused by commit
>
> 8a693f7766f9 ("cgroup: Remove CFTYPE_PRESSURE")
>
> inteacting with commits
>
> 52b1364ba0b1 ("sched/psi: Add PSI_IRQ to track IRQ/SOFTIRQ pressure")
> 34f26a15611a ("sched/psi: Per-cgroup PSI accounting disable/re-enable interface")
>
> from the tip tree.
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Mon, 12 Sep 2022 16:15:33 +1000
> Subject: [PATCH] sched/psi: fix up for "cgroup: Remove CFTYPE_PRESSURE"
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> kernel/cgroup/cgroup.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
> index 974ca46c6d7b..829aa42e773e 100644
> --- a/kernel/cgroup/cgroup.c
> +++ b/kernel/cgroup/cgroup.c
> @@ -5272,7 +5272,6 @@ static struct cftype cgroup_psi_files[] = {
> #ifdef CONFIG_IRQ_TIME_ACCOUNTING
> {
> .name = "irq.pressure",
> - .flags = CFTYPE_PRESSURE,
> .file_offset = offsetof(struct cgroup, psi_files[PSI_IRQ]),
> .seq_show = cgroup_irq_pressure_show,
> .write = cgroup_irq_pressure_write,
> @@ -5282,7 +5281,6 @@ static struct cftype cgroup_psi_files[] = {
> #endif
> {
> .name = "cgroup.pressure",
> - .flags = CFTYPE_PRESSURE,
> .seq_show = cgroup_pressure_show,
> .write = cgroup_pressure_write,
> },
> --
> 2.35.1
This is now a conflict between the tip tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-10-10 20:59 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-12 6:18 linux-next: build failure after merge of the cgroup tree Stephen Rothwell
2022-09-12 7:38 ` Peter Zijlstra
2022-09-12 18:44 ` Tejun Heo
2022-09-12 22:16 ` Tejun Heo
2022-09-15 10:46 ` Peter Zijlstra
2022-10-10 20:57 ` Stephen Rothwell [this message]
2022-10-10 20:59 ` Tejun Heo
-- strict thread matches above, loose matches on Subject: below --
2025-08-25 5:03 Stephen Rothwell
2025-08-25 18:18 ` Tejun Heo
2024-07-12 6:43 Stephen Rothwell
2024-07-12 6:51 ` Stephen Rothwell
2024-07-12 14:48 ` Jonathan Corbet
2024-07-12 16:44 ` Tejun Heo
2024-07-12 16:50 ` Tejun Heo
2023-12-07 3:38 Stephen Rothwell
2023-12-07 4:18 ` Waiman Long
2023-07-17 1:34 Stephen Rothwell
2023-07-17 6:45 ` Miaohe Lin
2022-10-31 2:23 Stephen Rothwell
2022-10-31 17:52 ` Tejun Heo
2022-08-29 3:29 Stephen Rothwell
2021-05-11 0:51 Stephen Rothwell
2021-05-11 1:10 ` Roman Gushchin
2021-05-11 1:31 ` Tejun Heo
2021-04-22 6:31 Stephen Rothwell
2015-09-25 3:26 Stephen Rothwell
2014-02-26 6:46 Stephen Rothwell
2014-02-26 13:44 ` Tejun Heo
2013-04-29 4:04 Stephen Rothwell
2013-04-29 22:55 ` Tejun Heo
2013-04-30 1:51 ` Benjamin Herrenschmidt
2012-09-14 3:17 Stephen Rothwell
2012-09-14 6:56 ` Daniel Wagner
2012-09-14 17:00 ` Tejun Heo
2012-09-14 18:32 ` Sedat Dilek
2012-09-14 18:34 ` Tejun Heo
2012-09-15 7:55 ` Sedat Dilek
2011-11-25 3:50 Stephen Rothwell
2011-11-27 19:33 ` Tejun Heo
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=20221011075748.3db42926@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=tj@kernel$(echo .)org \
--cc=zhouchengming@bytedance$(echo .)com \
/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