From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 658832FF66B; Wed, 19 Nov 2025 23:54:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763596473; cv=none; b=GnPnUBy3cB6wrxrzjg+oNolY5iWdUNQ+mtCniwYFYP499R6ntttZ4qxYjC1LR+3USVJ+Z8hw05Uia3NidIooFX6XeJ4RacaAoGRok8X/oJT52XkLLy0LWGhGMvDPqjKbqUXRSM5EmG5eeMAuLWKv8UaOoIJh0m33P9AYlg8MHjs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763596473; c=relaxed/simple; bh=glopRIxhFvs1C5Gwoz0NsdQFCbUEjMJ/gzaW4Xyet6o=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=bgquqFh0f1UIKzqj+baC5JGZZj32GeHxAHELfVgWFN2WCo+7m8S3VOxNKQfaryhXMC5TrBRyOcp34Zxn83U7UxlSw0o5piCnSGnz7dcSPhtgVtLAz4i+un+yR9gjFI6FI6Pr4DiWQsW67djPsNkKN7JYPpTtxYKIROtfSDTmrf8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ofi6PAvF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ofi6PAvF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DAF8AC4CEF5; Wed, 19 Nov 2025 23:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763596473; bh=glopRIxhFvs1C5Gwoz0NsdQFCbUEjMJ/gzaW4Xyet6o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ofi6PAvFCXbF6so0h1O51AmzQHsjAcZgU2QNrvcO2i/dQGAb0+XKsXTszws8Q+Hgu 7wlI4mIjnG16CFAcDCIU5Q0NtO1kvfdaXr5GSgw+Raw4yVm2SkjeJrnqZ5vUivlqYU 9depToi+a54loCkgU1jIdsFgtcbd8o67chSZ4qf17X6vCm2L7h2PpvgDtSvZAVBIkp jCeC3R9CcIZ0XFFfWtroy/uzpUaJkQ5FZ6ngdyylNjnYuID1lK4/OXnWAqarAS13KZ V02nrijT8R1j8XjpFH4BF0rtopIuTcMO2AchaJYeKbBdMUAW9mm/AC1/xpcIqD+CCm thc+a10T0NfsQ== Date: Wed, 19 Nov 2025 15:54:31 -0800 From: Drew Fustini To: Stephen Rothwell Cc: Arnd Bergmann , soc@kernel.org, Palmer Dabbelt , Paul Walmsley , Joel Stanley , =?iso-8859-1?Q?Cl=E9ment_L=E9ger?= , Drew Fustini , Himanshu Chauhan , Linux Kernel Mailing List , Linux Next Mailing List , Paul Walmsley Subject: Re: linux-next: manual merge of the risc-v tree with the tenstorrent-dt tree Message-ID: References: <20251120102925.57ab2fe7@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="U0gUBaz4YRthsKQe" Content-Disposition: inline In-Reply-To: <20251120102925.57ab2fe7@canb.auug.org.au> --U0gUBaz4YRthsKQe Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Nov 20, 2025 at 10:29:25AM +1100, Stephen Rothwell wrote: > Hi all, >=20 > Today's linux-next merge of the risc-v tree got a conflict in: >=20 > MAINTAINERS >=20 > between commits: >=20 > 4de28f1edcfb ("dt-bindings: riscv: Add Tenstorrent Blackhole compatible= ") > 8e88602e99a7 ("riscv: dts: Add Tenstorrent Blackhole SoC PCIe cards") >=20 > from the tenstorrent-dt tree and commit: >=20 > 5ffe60d26107 ("drivers: firmware: add riscv SSE support") >=20 > from the risc-v tree. >=20 > 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. Thank you for fixing it up. The resolution looks correct to me. The Tenstorrent MAINTAINERS patch is in the tag tenstorrent-dt-for-v6.19 [1] that I used for the 6.19 pull request [2]. Drew [1] https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git/tag/?= h=3Dtenstorrent-dt-for-v6.19 [2] https://lore.kernel.org/all/aPUemXdOFZEdkayE@x1/ --U0gUBaz4YRthsKQe Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQSy8G7QpEpV9aCf6Lbb7CzD2SixDAUCaR5YsgAKCRDb7CzD2Six DNQ7AQCVz9RjfUOW0yaz4OZyzr3R5T89AB+v9IDPWXk4el5kxwD+OUhs6bdj5a8C cphsXr7tQuu+SPcdBtwbOf4DK83N6QE= =VQEk -----END PGP SIGNATURE----- --U0gUBaz4YRthsKQe--