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: manual merge of the cgroup tree with the tip tree
Date: Tue, 11 Oct 2022 08:00:19 +1100 [thread overview]
Message-ID: <20221011080019.684aa624@canb.auug.org.au> (raw)
In-Reply-To: <20220912155941.530e4318@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2062 bytes --]
Hi all,
On Mon, 12 Sep 2022 15:59:41 +1000 Stephen Rothwell <sfr@canb•auug.org.au> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-10-10 21:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-12 5:59 linux-next: manual merge of the cgroup tree with the tip tree Stephen Rothwell
2022-10-10 21:00 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-25 5:15 Stephen Rothwell
2015-12-21 4:41 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=20221011080019.684aa624@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