From patchwork Sun Jan 7 22:49:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 185770 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp733126dyq; Sun, 7 Jan 2024 14:50:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IEIRw3IxpjXm5yC3rxQaCbG6aogh0nq12XHx6dX/ialUkHGOtAHEMPLF4ny8g4XuePSs65m X-Received: by 2002:a05:6e02:19c5:b0:35f:d1ed:d189 with SMTP id r5-20020a056e0219c500b0035fd1edd189mr3934623ill.58.1704667826854; Sun, 07 Jan 2024 14:50:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704667826; cv=none; d=google.com; s=arc-20160816; b=fPFDPjWpqXb/xZx86SO6317mAzwkOImy0yFs60yNm4c2DdrbzQK3vDkJ3GAEPiQOQ1 mrd9HiCpipmho1JQvOG/ed+qAiFK3/sSAp3JdwlOTtWKu3bXTrM9lVyLymH/pt/S8PU0 kN9duwLw9Nacrgq4oDBw+qUwLCiV5Bx22yXouaJdkUHoDHS8U9ueXyGHIB7+pU5Txtos JhYvd7txfoNIuwIiuXCQleoo0C0+WmzvcWiGERpB+2bQGd4jELGnRbASSuV8GzZyryK6 zx7GvbrLLm/PUH++zDe05I0BNUcFyYlc7abUX/4JdPHisGiqLUEtsBJLK8bSupsAP9fG z8/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=qeeLPSRcaG41tQhl/NP0bNXSAdBbnIiIqEBXhjiAZ+k=; fh=qnqD29ZAYL5rBDXczJYxjrDj0XJGrrlelMvQJhLeWNU=; b=P1M/cTLrCQ012Kf6cCKAMN7/fwEaDU/6boMz1vANKmI8JgIyulncI/WE4/JHeYxljG FMSOxB0bnaCWdOOj187m0qETjVl6xUTJ4xt5MJ1pGdd5f1HBZ9yILjLM0qglrFXlxIRT LgdPjo4KgPh5uIHz3WbxQqMyhBgUxIxE+YWimBFfuK3T5cR7iw+x4t1NbFPw7f8hnVQU tPKlKyLh7eQ+Syu4u1JR2KKTa7qgzY+DRSvHhn/l/kKosUtNJTopfQVbuaXKZ4/p+qUw +9E2JgBYV6SlbyUxvzlSfNa9NE/sHSdXLax6rNAYwHGGiyF/qkpJXEJgO2uwXUsahT7t jeLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=uN07giFm; spf=pass (google.com: domain of linux-kernel+bounces-19011-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-19011-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id n16-20020a634d50000000b005cdf37c9c29si5198622pgl.703.2024.01.07.14.50.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 14:50:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-19011-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=uN07giFm; spf=pass (google.com: domain of linux-kernel+bounces-19011-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-19011-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 83A2B281AFD for ; Sun, 7 Jan 2024 22:50:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 14A1913FEE; Sun, 7 Jan 2024 22:50:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="uN07giFm" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE793125A5; Sun, 7 Jan 2024 22:50:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1704667803; bh=qeeLPSRcaG41tQhl/NP0bNXSAdBbnIiIqEBXhjiAZ+k=; h=Date:From:To:Cc:Subject:From; b=uN07giFmwlOjPs4lBnyOkaC5TA4v5X37vMMIdRMw/Nyp3AEsPSafZnvezRdsTXljI XTVxyR9YXHWPh045csAqjOs7VU9EmUXG5xXXzqvqSDhVfAGMrQvhDqTIBtfOR7RkfJ gk7LS4JKUqMPTp463c9TMciyVvpowKHfNOHW2E2KsTCKn8N5cx/vBdF7rDtK+1tkjn eYhT77SaARarbn509X6ZojxmvNqa6y90AJ6mmX0g0h0FpgiHZKJ/gAgc0An6vwMnGv uqfwAgtuit6OZ/AYRgFg6CAKVBRUaf95jO4jG6eFqhRBu+NpspmfY4241CdUfStb/q +V2nyYld+q81g== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4T7XT34KFrz4wcc; Mon, 8 Jan 2024 09:49:59 +1100 (AEDT) Date: Mon, 8 Jan 2024 09:49:57 +1100 From: Stephen Rothwell To: Palmer Dabbelt , Paul Walmsley Cc: Andrew Jones , Linux Kernel Mailing List , Linux Next Mailing List , Palmer Dabbelt Subject: linux-next: manual merge of the risc-v tree with Linus' tree Message-ID: <20240108094957.2cc727e0@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787473771541635950 X-GMAIL-MSGID: 1787473771541635950 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 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 --- 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;