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