From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@kernel•org>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Miguel Ojeda <ojeda@kernel•org>,
"Borislav Petkov (AMD)" <bp@alien8•de>,
FUJITA Tomonori <fujita.tomonori@gmail•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 rust tree with the tip tree
Date: Mon, 4 Aug 2025 12:09:33 +1000 [thread overview]
Message-ID: <20250804120933.2bb0ec2e@canb.auug.org.au> (raw)
In-Reply-To: <20250723110537.5d5de415@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2496 bytes --]
Hi all,
On Wed, 23 Jul 2025 11:05:37 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> arch/riscv/include/asm/bug.h
>
> between commit:
>
> ac2655438eb5 ("bugs/riscv: Pass in 'cond_str' to __BUG_FLAGS()")
>
> from the tip tree and commit:
>
> 8ad470d4e3dc ("riscv/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust")
>
> from the rust 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/riscv/include/asm/bug.h
> index da9b8e83934d,4c03e20ad11f..000000000000
> --- a/arch/riscv/include/asm/bug.h
> +++ b/arch/riscv/include/asm/bug.h
> @@@ -57,16 -56,22 +56,22 @@@ typedef u32 bug_insn_t
> "ebreak\n" \
> ".pushsection __bug_table,\"aw\"\n\t" \
> "2:\n\t" \
> - __BUG_ENTRY "\n\t" \
> - ".org 2b + %3\n\t" \
> + __BUG_ENTRY(file, line, flags) "\n\t" \
> + ".org 2b + " size "\n\t" \
> ".popsection" \
> +
> -#define __BUG_FLAGS(flags) \
> ++#define __BUG_FLAGS(cond_str, flags) \
> + do { \
> + __asm__ __volatile__ ( \
> + ARCH_WARN_ASM("%0", "%1", "%2", "%3") \
> : \
> - : "i" (__FILE__), "i" (__LINE__), \
> + : "i" (WARN_CONDITION_STR(cond_str) __FILE__), "i" (__LINE__), \
> "i" (flags), \
> "i" (sizeof(struct bug_entry))); \
> } while (0)
> +
> #else /* CONFIG_GENERIC_BUG */
> -#define __BUG_FLAGS(flags) do { \
> +#define __BUG_FLAGS(cond_str, flags) do { \
> __asm__ __volatile__ ("ebreak\n"); \
> } while (0)
> #endif /* CONFIG_GENERIC_BUG */
> @@@ -76,8 -81,10 +81,10 @@@
> unreachable(); \
> } while (0)
>
> -#define __WARN_FLAGS(flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags))
> +#define __WARN_FLAGS(cond_str, flags) __BUG_FLAGS(cond_str, BUGFLAG_WARNING|(flags))
>
> + #define ARCH_WARN_REACHABLE
> +
> #define HAVE_ARCH_BUG
>
> #include <asm-generic/bug.h>
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:[~2025-08-04 2:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-23 1:05 linux-next: manual merge of the rust tree with the tip tree Stephen Rothwell
2025-08-04 2:09 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-23 1:16 Stephen Rothwell
2025-08-04 2:10 ` Stephen Rothwell
2025-03-18 8:55 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=20250804120933.2bb0ec2e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bp@alien8$(echo .)de \
--cc=fujita.tomonori@gmail$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=ojeda@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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