Subject: Re: linux-next: manual merge of the cgroup tree with the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 11 Oct 2022 08:00:19 +1100

Hi all,

On Mon, 12 Sep 2022 15:59:41 +1000 Stephen Rothwell <[email-masked]> wrote:

> Today's linux-next merge of the cgroup tree got a conflict in:
> 
>   kernel/cgroup/cgroup.c
> 
> between commit:
> 
>   34f26a15611a ("sched/psi: Per-cgroup PSI accounting disable/re-enable interface")
> 
> from the tip tree and commit:
> 
>   8a693f7766f9 ("cgroup: Remove CFTYPE_PRESSURE")
> 
> from the cgroup tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> 
> diff --cc kernel/cgroup/cgroup.c
> index 3dcd2a0041b3,e24015877d3c..000000000000
> --- a/kernel/cgroup/cgroup.c
> +++ b/kernel/cgroup/cgroup.c
> @@@ -5222,8 -5159,6 +5247,7 @@@ static struct cftype cgroup_psi_files[
>   #ifdef CONFIG_PSI
>   	{
>   		.name = "io.pressure",
> - 		.flags = CFTYPE_PRESSURE,
>  +		.file_offset = offsetof(struct cgroup, psi_files[PSI_IO]),
>   		.seq_show = cgroup_io_pressure_show,
>   		.write = cgroup_io_pressure_write,
>   		.poll = cgroup_pressure_poll,
> @@@ -5231,8 -5166,6 +5255,7 @@@
>   	},
>   	{
>   		.name = "memory.pressure",
> - 		.flags = CFTYPE_PRESSURE,
>  +		.file_offset = offsetof(struct cgroup, psi_files[PSI_MEM]),
>   		.seq_show = cgroup_memory_pressure_show,
>   		.write = cgroup_memory_pressure_write,
>   		.poll = cgroup_pressure_poll,
> @@@ -5240,8 -5173,6 +5263,7 @@@
>   	},
>   	{
>   		.name = "cpu.pressure",
> - 		.flags = CFTYPE_PRESSURE,
>  +		.file_offset = offsetof(struct cgroup, psi_files[PSI_CPU]),
>   		.seq_show = cgroup_cpu_pressure_show,
>   		.write = cgroup_cpu_pressure_write,
>   		.poll = cgroup_pressure_poll,

This is now a conflict between the tip tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell