From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EE7D9C10F1A for ; Tue, 7 May 2024 03:56:30 +0000 (UTC) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=evVuxTsO; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4VYPbK1VxZz3cV5 for ; Tue, 7 May 2024 13:56:29 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=evVuxTsO; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4VYPZT07hLz30VK for ; Tue, 7 May 2024 13:55:45 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ellerman.id.au; s=201909; t=1715054144; bh=wOtPNxB5OzuiLNH0fMUK5c9wuXAdWP2Bh0gK00toAS8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=evVuxTsO7Gm7tMSnmmBSjDM4TuiWoSBD7DYmjC3UEU2GnTX2MwcFzVxP/6+l7NmnM 7JtZJMkxHIamnBKP5WjbBYTKOGZHOOHZ8Wn/jvbGpwX9iW4VTgbPFDmsTZfV60cc4P 4ToGoBe47wula7JmgLIVWWGxI1KkG4Gk4QH9XJDApifStJ3WaJu5as0VkowtpflfjZ 1aeCvk40Pq6CCPMyw02b63LnpN+yIX3FENWe6rsT3KJlIOoA/v4O1++b6DQfIMOSTr HEs4BtC7AacZWM4FlJ6euZ32mcsiRC5qxqvZpI8Cerd0tS8TGW8UctxxJ/9eQq2HjC ei1qEaUaXLW9Q== 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 4VYPZS0ThQz4x0K; Tue, 7 May 2024 13:55:44 +1000 (AEST) From: Michael Ellerman To: Stephen Rothwell , Palmer Dabbelt , Paul Walmsley Subject: Re: linux-next: manual merge of the risc-v tree with the powerpc tree In-Reply-To: <20240507100441.0ffefbd9@canb.auug.org.au> References: <20240507100441.0ffefbd9@canb.auug.org.au> Date: Tue, 07 May 2024 13:55:41 +1000 Message-ID: <87bk5ip96q.fsf@mail.lhotse> MIME-Version: 1.0 Content-Type: text/plain 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+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Stephen Rothwell writes: > 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. Thanks. As you would have seen, I accounted for 71 being taken by PR_RISCV_SET_ICACHE_FLUSH_CTX in my tree, so this is just a textual conflict. So should be nothing to do other than mention it to Linus. cheers > diff --cc include/uapi/linux/prctl.h > index 713d28788df7,524d546d697b..000000000000 > --- a/include/uapi/linux/prctl.h > +++ b/include/uapi/linux/prctl.h > @@@ -306,20 -306,10 +306,26 @@@ struct prctl_mm_map > # define PR_RISCV_V_VSTATE_CTRL_NEXT_MASK 0xc > # define PR_RISCV_V_VSTATE_CTRL_MASK 0x1f > > + #define PR_RISCV_SET_ICACHE_FLUSH_CTX 71 > + # define PR_RISCV_CTX_SW_FENCEI_ON 0 > + # define PR_RISCV_CTX_SW_FENCEI_OFF 1 > + # define PR_RISCV_SCOPE_PER_PROCESS 0 > + # define PR_RISCV_SCOPE_PER_THREAD 1 > + > +/* PowerPC Dynamic Execution Control Register (DEXCR) controls */ > +#define PR_PPC_GET_DEXCR 72 > +#define PR_PPC_SET_DEXCR 73 > +/* DEXCR aspect to act on */ > +# define PR_PPC_DEXCR_SBHE 0 /* Speculative branch hint enable */ > +# define PR_PPC_DEXCR_IBRTPD 1 /* Indirect branch recurrent target prediction disable */ > +# define PR_PPC_DEXCR_SRAPD 2 /* Subroutine return address prediction disable */ > +# define PR_PPC_DEXCR_NPHIE 3 /* Non-privileged hash instruction enable */ > +/* Action to apply / return */ > +# define PR_PPC_DEXCR_CTRL_EDITABLE 0x1 /* Aspect can be modified with PR_PPC_SET_DEXCR */ > +# define PR_PPC_DEXCR_CTRL_SET 0x2 /* Set the aspect for this process */ > +# define PR_PPC_DEXCR_CTRL_CLEAR 0x4 /* Clear the aspect for this process */ > +# define PR_PPC_DEXCR_CTRL_SET_ONEXEC 0x8 /* Set the aspect on exec */ > +# define PR_PPC_DEXCR_CTRL_CLEAR_ONEXEC 0x10 /* Clear the aspect on exec */ > +# define PR_PPC_DEXCR_CTRL_MASK 0x1f > + > #endif /* _LINUX_PRCTL_H */ > diff --cc kernel/sys.c > index f9c95410278c,1b7bda0722ca..000000000000 > --- a/kernel/sys.c > +++ b/kernel/sys.c > @@@ -146,12 -146,9 +146,15 @@@ > #ifndef RISCV_V_GET_CONTROL > # define RISCV_V_GET_CONTROL() (-EINVAL) > #endif > + #ifndef RISCV_SET_ICACHE_FLUSH_CTX > + # define RISCV_SET_ICACHE_FLUSH_CTX(a, b) (-EINVAL) > + #endif > +#ifndef PPC_GET_DEXCR_ASPECT > +# define PPC_GET_DEXCR_ASPECT(a, b) (-EINVAL) > +#endif > +#ifndef PPC_SET_DEXCR_ASPECT > +# define PPC_SET_DEXCR_ASPECT(a, b, c) (-EINVAL) > +#endif > > /* > * this is where the system-wide overflow UID and GID are defined, for