From patchwork Tue May 7 00:04:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1932195 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=lCjvESUs; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=patchwork.ozlabs.org) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VYJSM6q5Jz1xnS for ; Tue, 7 May 2024 10:05:06 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=lCjvESUs; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4VYJSK414Wz3bZ3 for ; Tue, 7 May 2024 10:05:05 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=lCjvESUs; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4VYJS00wxdz30VT for ; Tue, 7 May 2024 10:04:48 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1715040286; bh=hB9NaGtn0Ed1umyavuftHblA0GfvfFPA+kBeEH5epLU=; h=Date:From:To:Cc:Subject:From; b=lCjvESUslbl9iBCnNsSNcaLyjlsbvxsWCdrgnh75Pncsy+UD/sToVEVgPqWdGmrNV KuoIIMpDe0hWidof8pElUq999Vvwoc6wq3EVfNgGLSFkeRfj6ETuDUS3XCGWU9a6oS ZA1d/zjikqDehZkqCjv1/5oF9bq8oJu+v4XpMop5Kkd8NWimKCPE1PK1C1OWqbBIdE sK4Wut3vGjs31724JN+ModQf2lZ2TghlO5hCDyBRgwIlxZPVXD3oGQUE/0mmNsfOwP dqcF+bUPA2Qx2YWCvp0gWGSHe4fznP3C2PXGgL6VoByEepoV52hrq7aa91zKnLHPZL qkwqTmL+kfFAA== 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 4VYJRx716pz4x11; Tue, 7 May 2024 10:04:45 +1000 (AEST) Date: Tue, 7 May 2024 10:04:41 +1000 From: Stephen Rothwell To: Palmer Dabbelt , Paul Walmsley , Michael Ellerman Subject: linux-next: manual merge of the risc-v tree with the powerpc tree Message-ID: <20240507100441.0ffefbd9@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Charlie Jenkins , Linux Kernel Mailing List , Palmer Dabbelt , Linux Next Mailing List , Benjamin Gray , PowerPC Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi all, Today's linux-next merge of the risc-v tree got conflicts in: include/uapi/linux/prctl.h kernel/sys.c between commit: 628d701f2de5 ("powerpc/dexcr: Add DEXCR prctl interface") from the powerpc tree and commit: 6b9391b581fd ("riscv: Include riscv_set_icache_flush_ctx prctl") from the risc-v 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 include/uapi/linux/prctl.h index 713d28788df7,524d546d697b..000000000000 --- a/include/uapi/linux/prctl.h diff --cc kernel/sys.c index f9c95410278c,1b7bda0722ca..000000000000 --- a/kernel/sys.c