linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Michael Ellerman <mpe@ellerman.id.au>,
	PowerPC <linuxppc-dev@lists.ozlabs.org>
Subject: linux-next: build failure in Linus' tree
Date: Mon, 28 Mar 2022 09:01:11 +1100	[thread overview]
Message-ID: <20220328090111.26f8980f@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1462 bytes --]

Hi all,

Building LInus' tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from arch/powerpc/kernel/irq.c:66:
arch/powerpc/include/asm/livepatch.h:7: error: unterminated #ifndef
    7 | #ifndef _ASM_POWERPC_LIVEPATCH_H
      | 

Caused by commit

  7001052160d1 ("Merge tag 'x86_core_for_5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip")

A #endif got removed during the merge resolution :-(

I have applied the following patch for today

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 28 Mar 2022 08:55:39 +1100
Subject: [PATCH] powerpc: restore removed #endif

Fixes: 7001052160d1 ("Merge tag 'x86_core_for_5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/include/asm/livepatch.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/include/asm/livepatch.h b/arch/powerpc/include/asm/livepatch.h
index fd65931a739f..1c60094ea0cd 100644
--- a/arch/powerpc/include/asm/livepatch.h
+++ b/arch/powerpc/include/asm/livepatch.h
@@ -16,6 +16,7 @@ static inline void klp_arch_set_pc(struct ftrace_regs *fregs, unsigned long ip)
 {
 	ftrace_instruction_pointer_set(fregs, ip);
 }
+#endif /* CONFIG_LIVEPATCH */
 
 #ifdef CONFIG_LIVEPATCH_64
 static inline void klp_init_thread_info(struct task_struct *p)
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2022-03-27 22:01 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-27 22:01 Stephen Rothwell [this message]
2022-03-27 22:23 ` linux-next: build failure in Linus' tree Linus Torvalds
2022-03-27 22:31   ` Linus Torvalds
2022-03-27 23:33   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2021-11-05  4:54 Stephen Rothwell
2021-11-05  9:25 ` Suzuki K Poulose
2021-11-05  4:49 Stephen Rothwell
2021-09-07  1:02 Stephen Rothwell
2021-09-06  5:57 Stephen Rothwell
2021-07-14 23:50 Stephen Rothwell
2021-07-20  6:45 ` Stephen Rothwell
2021-07-20 12:11   ` Jakub Kicinski
2021-07-22 23:04     ` Stephen Rothwell
2020-11-23  7:40 Stephen Rothwell
2020-11-23 23:39 ` Michael Ellerman
2020-11-24  0:23   ` Daniel Axtens
2020-11-25  2:47     ` Michael Ellerman
2020-06-21  2:05 Stephen Rothwell
2020-04-20 11:46 linux-next: build failure in Linus tree Stephen Rothwell
2020-04-28  8:48 ` Stephen Rothwell
2020-05-18 22:20 ` Stephen Rothwell
2020-04-05  1:22 linux-next: build failure in Linus' tree Stephen Rothwell
2020-04-05  1:27 ` Stephen Rothwell
2020-02-09 21:08 Stephen Rothwell
2020-02-09 21:24 ` Linus Torvalds
2020-02-09 22:57   ` Marc Zyngier
2020-02-09 23:48     ` Linus Torvalds
2020-02-10  2:00     ` Zenghui Yu
2018-10-28 22:45 Stephen Rothwell
2018-10-28 22:35 Stephen Rothwell
2018-10-28 22:45 ` Linus Torvalds
2018-10-29  1:38   ` Hangbin Liu
2018-10-29  2:17   ` David Miller
2018-06-12  2:26 Stephen Rothwell
2018-06-18  3:50 ` Stephen Rothwell
2018-02-04 22:28 Stephen Rothwell
2017-09-17 23:34 Stephen Rothwell
2016-03-27  6:06 Stephen Rothwell
2016-03-28 20:44 ` Arnaldo Carvalho de Melo
2014-11-03  4:09 Stephen Rothwell
2014-11-03  4:16 ` David Miller
2012-07-27  0:15 Stephen Rothwell
2012-07-27  0:23 ` Stephen Rothwell
2012-07-27  1:04 ` Linus Torvalds
2012-06-14  1:47 Stephen Rothwell
2012-06-14  3:06 ` Paul Mundt
2012-06-14  3:40   ` Paul Mundt
2012-06-15  0:14     ` Stephen Rothwell
2012-06-15  0:56       ` Paul Mundt
2012-06-17 23:38         ` Benjamin Herrenschmidt
2012-06-18  4:58           ` Paul Mundt
2012-06-15  9:23       ` Sedat Dilek
2012-06-15 10:15         ` Sedat Dilek
2012-06-15  8:46     ` Richard W.M. Jones
2012-06-15 11:38     ` Arnd Bergmann
2012-05-14  0:50 Stephen Rothwell
2012-05-14  6:57 ` Grant Likely
2012-05-14  8:32   ` Thomas Gleixner
2012-05-07  0:08 Stephen Rothwell
2012-05-07  0:10 ` Al Viro
2012-04-19  0:41 Stephen Rothwell
2012-01-24  0:51 Stephen Rothwell
2011-08-29  0:44 Stephen Rothwell
2011-08-29 22:32 ` Stephen Rothwell
2011-08-29 22:50   ` James Bottomley
2011-08-11  1:59 Stephen Rothwell
2011-08-11  6:43 ` Borislav Petkov
2011-05-26  1:12 Stephen Rothwell
2011-05-20  1:15 Stephen Rothwell
2011-05-20  1:19 ` Linus Torvalds
2011-03-17 23:29 Stephen Rothwell
2011-03-17 23:35 ` Luck, Tony
2011-01-14 23:40 Stephen Rothwell
2011-01-19  3:12 ` Konrad Rzeszutek Wilk
2011-01-19  4:19   ` Stephen Rothwell
2011-01-13 23:43 Stephen Rothwell
2011-01-14  1:24 ` Linus Torvalds
2011-01-14  2:17   ` Al Viro
2010-12-21  1:01 Stephen Rothwell
2010-12-21  4:47 ` Sedat Dilek
2010-10-06  0:09 Stephen Rothwell
2010-05-28  0:57 Stephen Rothwell
2010-05-28  1:09 ` Linus Torvalds
2010-05-30  0:43   ` Stephen Rothwell
2010-06-01 17:04     ` Tony Luck
2010-06-01 17:07       ` Linus Torvalds
2010-05-24  0: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=20220328090111.26f8980f@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=torvalds@linux-foundation.org \
    /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).