From patchwork Sun Feb 11 22:55:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 199522 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp2138418dyd; Sun, 11 Feb 2024 15:06:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IEf517AgPmYFgiBqNhKRqFk21dKqBh7vcaogVntpEO3IJiZ2F9QsXaIConZ+uTRkAsLA5rl X-Received: by 2002:a17:903:1c1:b0:1d9:5923:c242 with SMTP id e1-20020a17090301c100b001d95923c242mr6340889plh.42.1707692768490; Sun, 11 Feb 2024 15:06:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707692768; cv=pass; d=google.com; s=arc-20160816; b=c62krPVKPOhI0TvPtqE7Olx8Dq2COTlyF/F6/m5Y68T244+4Ni8ZUpw62gSulBVVUG aN2Lyyj4PtEumWSXxzTz8rNboHj5abhN29shYX1WVct4Ldke/n3KzCU/OT87IT8uj8E8 IRuymPmXTze/r2WR1QTW/RnnfYEl1B84KRZH0SIbTjPhxS2epWBvdwYX7Ee2tF8ywQbY VdTpJCLAOOL2QRCUb0hXwmdX0MKZvCq3Wdh04NWa0Jbr2rIrzoQO3zbR9JtPl1d6SPLv lR/URFp67OzaB/QaEl/ZH77hTFpwQ3KO1nKaFZ77nP1h9gevyM8GaQyQWlXHNMT+GEEX +rpA== ARC-Message-Signature: i=2; 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=09zokI+nVMpltLJOhPeuRiCSxk2FWPngUU/BG+OkZJw=; fh=NKNc+7V9o9J4q+OQMvEUu2BkUQ00DGW2Q2gdbsMbRe4=; b=W115EK+pijvRhoZB692AXzEPGgIuKpGodglDAGDHx55Fy6thuCc1baFHeIFnDp1ScN BjpCyx7NBSR8pv7003z6CW51qUG5Ihs87ufL8st8q7GCOJXruyoQGPtxdZ1TDeeHSgCs e1kwDBRxADNwsHJsmKOziIEu8YPc/Ym9h5SxSr1ckMqSC0y+PVbt9CdyN5PtSGt9hAu0 jJvxzAphKCOn+zGB2a0FXaqRzc0RroDSQjTm4xOZMsU8XQqqSGXMlnPMKz3fVNvrwi0Y bKnxsz5zj9t9zfPK0P5TsvHwoYqQ8G4K3Q1fbB12XX+KDa+9m3idTMXufYnurMg/8aBK Oepg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=LBheBiLl; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-60976-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60976-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au X-Forwarded-Encrypted: i=2; AJvYcCW9JaRDa2Mb+3CYWjUqnvLFKNPcY4Xx+30GtC4PNMPowDxqpZZ2KDheVDLaujBKN3YEYUmpWkZddgpXC877rVbzsdILiA== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id y14-20020a17090aca8e00b0029683caf298si5305426pjt.84.2024.02.11.15.06.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 15:06:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-60976-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=LBheBiLl; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-60976-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60976-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id DCFCBB21B7C for ; Sun, 11 Feb 2024 23:04:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A3EE517557; Sun, 11 Feb 2024 23:04:16 +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="LBheBiLl" 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 C914015C3; Sun, 11 Feb 2024 23:04:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707692653; cv=none; b=kw3qXSjL7d05nniYmoCSTd4P2M1+59NCS/dXP701sJusTvt3TSKtGDnnz9A7iubBha2OQ/WcEFKtFfmEE/NLDxAh10FODttYrT9f/hlnsuPci4FWYJ1ocMLzo5XXNB2QjM+Z+yADIo6gweBkiT/gA2ApauajW94wwK5zHbg2QGQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707692653; c=relaxed/simple; bh=kMRLFb0103x5yMVxBy6sPonpF2CtIuDQztGmbWLySJI=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=rZmntkzFAAiB0ItYg4uC4TsWyspKLdy+y9K6FdOMfqzOajWvLhRcmlzfEd9oOoJ7PluAYlJIzEVyOWpfoCzoqE2P069dh4qwBleXDvlFIuVIsmzotE6dT6v56qFTrET5RWc17dcXvksWlGCCRzg0pEiaqI52nQsUzcQ6jLSgRAM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=LBheBiLl; arc=none smtp.client-ip=150.107.74.76 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=1707692127; bh=09zokI+nVMpltLJOhPeuRiCSxk2FWPngUU/BG+OkZJw=; h=Date:From:To:Cc:Subject:From; b=LBheBiLlxfXowln9CLZvr+G9/aMuQv4QymQ0VlYazz9f+KpudaLm2Vc5pYkPEe5Ci wwbVCqw+hoiYMwBVt8+A9Ix8xHkZomxpKtCqqWgtSTk8RWmu6EcQgeB+Gdrv6eAw3A lFM0o4CdLexv4MSJs6LiBIAzjXzxqLA0GU20vIzlflZzyRuhz0WUFb9ZBatEquDnKw ULAlG2wg2xM7ocHv5ZXWqY+rcqV31Z2TFnilBc8UGl3Gwun5JG7/YeSC8eHut+Yh0T m6uBIlqiu2gbI4EsMepjEVH0TH6DQf4oZNJMSmziFtnwHTUvYyJG7s7ZQ3sdJ6MQjE DF5TSrHeROyrw== 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 4TY2x95GPlz4wcK; Mon, 12 Feb 2024 09:55:25 +1100 (AEDT) Date: Mon, 12 Feb 2024 09:55:23 +1100 From: Stephen Rothwell To: Palmer Dabbelt , Paul Walmsley Cc: Linus Torvalds , Linux Kernel Mailing List , Linux Next Mailing List , Palmer Dabbelt , Xiao Wang Subject: linux-next: manual merge of the risc-v tree with Linus' tree Message-ID: <20240212095523.21f0579b@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: 1790645652190485349 X-GMAIL-MSGID: 1790645652190485349 Hi all, Today's linux-next merge of the risc-v tree got a conflict in: arch/riscv/include/asm/bitops.h between commit: 4356e9f841f7 ("work around gcc bugs with 'asm goto' with outputs") from Linus' tree and commit: cb4ede926134 ("riscv: Avoid code duplication with generic bitops implementation") 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 arch/riscv/include/asm/bitops.h index 329d8244a9b3,c4c2173dfe99..000000000000 --- a/arch/riscv/include/asm/bitops.h