Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 12 Sep 2022 16:18:12 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Tejun Heo <tj@kernel.org>, Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>
Cc:     Chengming Zhou <zhouchengming@bytedance.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the cgroup tree
Message-ID: <20220912161812.072aaa3b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/PNj=fYiUIBsNctRUXH3ph65";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/PNj=fYiUIBsNctRUXH3ph65
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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 (n=
ot in a function)
 5275 |                 .flags =3D 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 int=
erface")

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[] =3D {
 #ifdef CONFIG_IRQ_TIME_ACCOUNTING
 	{
 		.name =3D "irq.pressure",
-		.flags =3D CFTYPE_PRESSURE,
 		.file_offset =3D offsetof(struct cgroup, psi_files[PSI_IRQ]),
 		.seq_show =3D cgroup_irq_pressure_show,
 		.write =3D cgroup_irq_pressure_write,
@@ -5282,7 +5281,6 @@ static struct cftype cgroup_psi_files[] =3D {
 #endif
 	{
 		.name =3D "cgroup.pressure",
-		.flags =3D CFTYPE_PRESSURE,
 		.seq_show =3D cgroup_pressure_show,
 		.write =3D cgroup_pressure_write,
 	},
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/PNj=fYiUIBsNctRUXH3ph65
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMezyQACgkQAVBC80lX
0GxhjQf+NXsMubvv5TYNTfU0/JsvVWj9hXHyNt6le+xJ4heBpagEeivynmL35Sly
xcwSXxVBLpXbFfUBB715dXCwL5glhUujnH2s6+ErC5ybZa4o8TxRelrEdgnh16jQ
drly8VD3esP4WHDAqQ9M4oT2TILstyqmAS9Cb+At8dzCRXbTfGhiUt4m19x63wIz
qq86bdNp6M88BVHbPsNv02rBpqfRS6yh1kUxUzr4Q1YZ/xSKpoY9nO1iwgxvREjy
qIcUowqKAtef71YTq+KiYeKDoGxlVgmD9srpslq1CczBAGEtNvDtJMn86eHWdx24
CwhyhAjU7yUrtLmUJhep8zLWiXvY9Q==
=5YHP
-----END PGP SIGNATURE-----

--Sig_/PNj=fYiUIBsNctRUXH3ph65--