From: Will Deacon <will@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>
Cc: "Marc Zyngier" <maz@misterjones.org>, "Willy Tarreau" <w@1wt.eu>,
"Kees Cook" <keescook@chromium.org>,
"Linus Torvalds" <torvalds@linux-foundation.org>,
"Stephen Rothwell" <sfr@canb.auug.org.au>,
"Emese Revfy" <re.emese@gmail.com>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Sami Tolvanen" <samitolvanen@google.com>,
"Daniel Díaz" <daniel.diaz@linaro.org>
Subject: Re: linux-next: build failure after merge of the origin tree
Date: Thu, 30 Jul 2020 16:00:56 +0100 [thread overview]
Message-ID: <20200730150056.GA24716@willie-the-truck> (raw)
In-Reply-To: <20200730100923.GE25149@gaia>
On Thu, Jul 30, 2020 at 11:09:23AM +0100, Catalin Marinas wrote:
> On Thu, Jul 30, 2020 at 10:59:09AM +0100, Marc Zyngier wrote:
> > From 33d819f4efa0a4474b5dc2e4bcaef1b886ca30c3 Mon Sep 17 00:00:00 2001
> > From: Marc Zyngier <maz@kernel.org>
> > Date: Thu, 30 Jul 2020 10:53:05 +0100
> > Subject: [PATCH] arm64: Drop unnecessary include from asm/smp.h
> >
> > asm/pointer_auth.h is not needed anymore in asm/smp.h, as 62a679cb2825
> > ("arm64: simplify ptrauth initialization") removed the keys from the
> > secondary_data structure.
> >
> > This also cures a compilation issue introduced by f227e3ec3b5c
> > ("random32: update the net random state on interrupt and activity").
> >
> > Fixes: 62a679cb2825 ("arm64: simplify ptrauth initialization")
> > Fixes: f227e3ec3b5c ("random32: update the net random state on interrupt and
> > activity")
> > Signed-off-by: Marc Zyngier <maz@kernel.org>
> > ---
> > arch/arm64/include/asm/smp.h | 1 -
> > 1 file changed, 1 deletion(-)
> >
> > diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h
> > index ea268d88b6f7..a0c8a0b65259 100644
> > --- a/arch/arm64/include/asm/smp.h
> > +++ b/arch/arm64/include/asm/smp.h
> > @@ -30,7 +30,6 @@
> > #include <linux/threads.h>
> > #include <linux/cpumask.h>
> > #include <linux/thread_info.h>
> > -#include <asm/pointer_auth.h>
> >
> > DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
>
> I think this arm64 patch makes sense irrespective of any other generic
> fixes. If Will wants to take it as a fix:
>
> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
>
> (otherwise I'll queue it for 5.9)
Cheers, I'll pick this up asap.
Will
next prev parent reply other threads:[~2020-07-30 15:01 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 23:08 linux-next: build failure after merge of the origin tree Stephen Rothwell
2020-07-29 23:43 ` Linus Torvalds
2020-07-30 0:09 ` Linus Torvalds
2020-07-30 2:12 ` Linus Torvalds
2020-07-30 2:30 ` Willy Tarreau
2020-07-30 3:17 ` Kees Cook
2020-07-30 3:22 ` Willy Tarreau
2020-07-30 6:14 ` Willy Tarreau
2020-07-30 9:59 ` Marc Zyngier
2020-07-30 10:09 ` Catalin Marinas
2020-07-30 15:00 ` Will Deacon [this message]
2020-07-30 17:49 ` Kees Cook
2020-07-30 18:24 ` Linus Torvalds
2020-07-30 18:47 ` Kees Cook
-- strict thread matches above, loose matches on Subject: below --
2023-06-30 2:59 Stephen Rothwell
2023-06-30 3:43 ` Linus Torvalds
2021-09-19 23:42 Stephen Rothwell
2021-09-14 0:08 Stephen Rothwell
2021-09-14 0:19 ` Linus Torvalds
2021-09-14 0:24 ` Linus Torvalds
2021-09-14 0:58 ` Stephen Rothwell
2021-09-14 1:29 ` Linus Torvalds
2021-09-14 1:37 ` Linus Torvalds
2021-09-14 2:03 ` Linus Torvalds
2021-09-14 2:08 ` Stephen Rothwell
2021-09-14 2:12 ` Linus Torvalds
2021-09-14 2:50 ` Michael Ellerman
2021-09-14 12:21 ` Michael Ellerman
2021-09-14 2:39 ` Stephen Rothwell
2021-09-07 23:07 Stephen Rothwell
2021-09-07 23:09 ` Stephen Rothwell
2021-09-07 23:17 ` Marco Elver
2021-09-07 23:38 ` Miguel Ojeda
2020-07-30 22:58 Stephen Rothwell
2020-07-30 23:15 ` Stephen Rothwell
2020-06-04 22:37 Stephen Rothwell
2020-06-05 0:04 ` Josh Poimboeuf
2020-06-05 9:48 ` Jessica Yu
2020-04-20 10:23 Stephen Rothwell
2020-01-31 4:12 Stephen Rothwell
2020-01-31 4:17 ` Randy Dunlap
2020-01-31 9:39 ` Daniel Lezcano
2012-10-09 23:21 Stephen Rothwell
2012-10-09 23:45 ` Andrew Morton
2012-10-09 23:52 ` Yasuaki Ishimatsu
2012-10-10 3:12 ` Stephen Rothwell
2012-10-10 0:07 ` Stephen Rothwell
2012-06-04 2:57 Stephen Rothwell
2012-06-04 7:39 ` Paul Mundt
2012-01-18 23:31 Stephen Rothwell
2012-01-19 8:21 ` Jens Axboe
2012-01-19 8:23 ` Jens Axboe
2011-11-06 23:12 Stephen Rothwell
2011-11-07 1:52 ` David Miller
2011-11-07 2:47 ` Stephen Rothwell
2011-11-07 3:36 ` David Miller
2011-11-07 5:29 ` Kirsher, Jeffrey T
2011-11-07 16:46 ` Rose, Gregory V
2011-11-07 17:46 ` Rose, Gregory V
2011-07-25 1:16 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=20200730150056.GA24716@willie-the-truck \
--to=will@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=daniel.diaz@linaro.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maz@misterjones.org \
--cc=re.emese@gmail.com \
--cc=samitolvanen@google.com \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
--cc=w@1wt.eu \
/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).