public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt•com>, Paul Walmsley <paul@pwsan•com>
Cc: Andrew Jones <ajones@ventanamicro•com>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>,
	Palmer Dabbelt <palmer@rivosinc•com>
Subject: linux-next: manual merge of the risc-v tree with Linus' tree
Date: Mon, 8 Jan 2024 09:49:57 +1100	[thread overview]
Message-ID: <20240108094957.2cc727e0@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  arch/riscv/kernel/sys_riscv.c

between commit:

  777c0d761be7 ("RISC-V: hwprobe: Always use u64 for extension bits")

from Linus' tree and commit:

  53b2b22850e1 ("RISC-V: Move the hwprobe syscall to its own file")

from the risc-v tree.

I fixed it up (I used the latter version of this file and applied the
following merge fix patch) 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.

From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 8 Jan 2024 09:46:10 +1100
Subject: [PATCH] fix up for "RISC-V: Move the hwprobe syscall to its own file"

interacting with commit

  777c0d761be7 ("RISC-V: hwprobe: Always use u64 for extension bits")

from Linus' tree.

Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
 arch/riscv/kernel/sys_hwprobe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/kernel/sys_hwprobe.c b/arch/riscv/kernel/sys_hwprobe.c
index ccf61b040536..41f45acb156b 100644
--- a/arch/riscv/kernel/sys_hwprobe.c
+++ b/arch/riscv/kernel/sys_hwprobe.c
@@ -136,7 +136,7 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,
 	pair->value &= ~missing;
 }
 
-static bool hwprobe_ext0_has(const struct cpumask *cpus, unsigned long ext)
+static bool hwprobe_ext0_has(const struct cpumask *cpus, u64 ext)
 {
 	struct riscv_hwprobe pair;
 
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

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

             reply	other threads:[~2024-01-07 22:50 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-07 22:49 Stephen Rothwell [this message]
2024-01-11 17:20 ` linux-next: manual merge of the risc-v tree with Linus' tree Palmer Dabbelt
  -- strict thread matches above, loose matches on Subject: below --
2025-08-08  0:36 Stephen Rothwell
2025-08-08  0:33 Stephen Rothwell
2025-01-31  0:42 Stephen Rothwell
2025-01-31  0:39 Stephen Rothwell
2024-09-18  0:05 Stephen Rothwell
2024-05-22 23:17 Stephen Rothwell
2024-05-23  6:54 ` Yangyu Chen
2024-05-15 23:36 Stephen Rothwell
2024-05-16  2:17 ` Yangyu Chen
2024-05-16  4:40   ` Stephen Rothwell
2024-02-11 22:55 Stephen Rothwell
2023-11-02 22:14 Stephen Rothwell
2023-08-30 23:29 Stephen Rothwell
2023-08-31 17:50 ` Nick Desaulniers
2023-09-01 15:46   ` Palmer Dabbelt
2023-08-30 23:25 Stephen Rothwell
2023-07-04 23:46 Stephen Rothwell
2023-06-04 22:51 Stephen Rothwell
2023-02-05 22:48 Stephen Rothwell
2023-02-05 22:40 Stephen Rothwell
2023-02-05 22:43 ` Stephen Rothwell
2023-01-08 21:42 Stephen Rothwell
2022-12-12 23:03 Stephen Rothwell
2022-10-13 22:11 Stephen Rothwell
2022-07-24 23:33 Stephen Rothwell
2022-03-22 22:06 Stephen Rothwell
2021-12-19 22:47 Stephen Rothwell
2021-07-05 23:32 Stephen Rothwell
2021-06-14 23:26 Stephen Rothwell
2021-04-26 23:42 Stephen Rothwell
2021-03-30 22:40 Stephen Rothwell
2021-04-02  4:33 ` Palmer Dabbelt
2021-02-23 22:00 Stephen Rothwell
2020-10-25 22:01 Stephen Rothwell
2020-01-13 22:05 Stephen Rothwell
2020-01-05 22:32 Stephen Rothwell
2020-01-06  1:50 ` Paul Walmsley
2020-01-06  1: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=20240108094957.2cc727e0@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=ajones@ventanamicro$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=palmer@dabbelt$(echo .)com \
    --cc=palmer@rivosinc$(echo .)com \
    --cc=paul@pwsan$(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