From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
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 tip tree with the s390 tree
Date: Wed, 22 Feb 2023 10:03:51 +1100 [thread overview]
Message-ID: <20230222100351.5801c81b@canb.auug.org.au> (raw)
In-Reply-To: <20230210120021.4a507539@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1792 bytes --]
Hi all,
On Fri, 10 Feb 2023 12:00:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/s390/kernel/idle.c
>
> between commit:
>
> c01016299dc7 ("s390/idle: move idle time accounting to account_idle_time_irq()")
>
> from the s390 tree and commit:
>
> 89b3098703bd ("arch/idle: Change arch_cpu_idle() behavior: always exit with IRQs disabled")
>
> from the tip 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 arch/s390/kernel/idle.c
> index dd8351e76539,b04fb418307c..000000000000
> --- a/arch/s390/kernel/idle.c
> +++ b/arch/s390/kernel/idle.c
> @@@ -61,7 -57,15 +61,6 @@@ void noinstr arch_cpu_idle(void
>
> /* psw_idle() returns with interrupts disabled. */
> psw_idle(idle, psw_mask);
> - raw_local_irq_enable();
> -
> - /* Account time spent with enabled wait psw loaded as idle time. */
> - raw_write_seqcount_begin(&idle->seqcount);
> - idle_time = idle->clock_idle_exit - idle->clock_idle_enter;
> - idle->clock_idle_enter = idle->clock_idle_exit = 0ULL;
> - idle->idle_time += idle_time;
> - idle->idle_count++;
> - account_idle_time(cputime_to_nsecs(idle_time));
> - raw_write_seqcount_end(&idle->seqcount);
> }
>
> static ssize_t show_idle_count(struct device *dev,
This is now a conflict between the s390 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:[~2023-02-21 23:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-10 1:00 linux-next: manual merge of the tip tree with the s390 tree Stephen Rothwell
2023-02-21 23:03 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-18 13:40 broonie
2019-05-06 6:58 Stephen Rothwell
2017-11-01 6:04 Stephen Rothwell
2017-10-11 15:51 Mark Brown
2017-11-13 5:30 ` Stephen Rothwell
2015-08-20 5:32 Stephen Rothwell
2013-02-07 2:50 Stephen Rothwell
2012-03-14 3:46 Stephen Rothwell
2009-08-24 7:01 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=20230222100351.5801c81b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=borntraeger@de.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).