From patchwork Wed Feb 15 00:16:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13141071 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 B056BC6379F for ; Wed, 15 Feb 2023 00:17:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=EXD56XOIwxGFEAdefaEYjctDmQdoDispNp3cBQ/YDeI=; b=tJM AHnD5vUXbINiy6AgwihVFeOM1chrKRhhE9pb7ZwigXzJjY7+b3+X/A6+DyLIdydFMnx/tB5s1a53e 3GWua54UC4xM3f7sS/mm5fUzUk+8HOZ2aP+BvoY3wyYj955JxNJCcNP5fl4sNFY7Lbxnk21yNTGsd ks4ajFJ4uIYcc76yz+WyJUJsxSi6RN7xb50zTCoKA3qWH6p54pUo1BuB492lQZ6oiRjifI1GpqoOX BboPWyGDn5vOroAxic/TYwJDM0AEksUSLXeFZBw8PBIUXcAktqOPFxueYH7pj1+1iFcMckTBFYyzn dvAcPUzRe4Fi3sm+sk4z1OzyZEO0mZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS5Td-0042FC-Im; Wed, 15 Feb 2023 00:16:49 +0000 Received: from gandalf.ozlabs.org ([150.107.74.76]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS5TZ-0042Ar-HG for linux-arm-kernel@lists.infradead.org; Wed, 15 Feb 2023 00:16:47 +0000 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4PGdsj4Kxyz4x4r; Wed, 15 Feb 2023 11:16:25 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1676420187; bh=BbNn6Pgl+xjsw/pPrE8cV2dCSLevjgOOJD49Mzbz0Bs=; h=Date:From:To:Cc:Subject:From; b=DtgkI+GbHy3dmcoX6/nN47rCf+8HR5zHhn5MvtRgNiE0Lf18Pop5po6BBAsKLXteK hO12dvDBxDcqY0387PiGfpH1CC9n+Fgmit38ALla8/XjQChAR0WgZtkN6vXU91XHCU 2+41vhorFb6jrn6puAbKO4wiLZHmPNr2/dulBmEGg+H3/9xwsbB2Qh9sNRkZpcis4x Ky9itz8q8uK/EILIpJobxpw+AuGO2QNMVMZZnVi5pAlMfg67dHQnQd5jDO2wqe+KVV sYpM982haAcuk5+dcCozx2MNjw+QG4LzOxXroPO/iRDxWTMVXrkeKPZpm6WzPJaqz9 8MYUvljyuWd/g== Date: Wed, 15 Feb 2023 11:16:23 +1100 From: Stephen Rothwell To: Ulf Hansson , Olof Johansson , Arnd Bergmann , Herbert Xu Cc: Linux Crypto List , ARM , Conor Dooley , Jenny Zhang , Jia Jie Ho , Linux Kernel Mailing List , Linux Next Mailing List , Walker Chen , William Qiu Subject: linux-next: manual merge of the mmc tree with the arm-soc, crypto trees Message-ID: <20230215111623.06d9aa24@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230214_161645_902356_7E39E96A X-CRM114-Status: GOOD ( 16.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the mmc tree got a conflict in: MAINTAINERS between commits: 08b9a94e8654 ("soc: starfive: Add StarFive JH71XX pmu driver") c388f458bc34 ("hwrng: starfive - Add TRNG driver for StarFive SoC") from the arm-soc, crypto trees and commit: bfde6b3869f5 ("mmc: starfive: Add sdio/emmc driver support") from the mmc 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 MAINTAINERS index 9262a1d7203d,71355c68a237..000000000000 --- a/MAINTAINERS