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 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 9C84ACAC590 for ; Tue, 17 Sep 2024 23:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: References:In-Reply-To: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:List-Owner; bh=t1noOrDvrTz359kxFhjY3nJXTUUHuskoM8PWULvvuZo=; b=3hxj1+jFjWF2Vt5K4Fav8NB2BD bSPYEBep8PGG35KKYuZ5Q3d5xLytVeaUUwEFXkTl08aACzERpXEjKMiCuK32Qcz/DrTJVngP1jhvd Wi1d0P26zkr7FDCm9/3iLO2rel20HDjQ1Od/LVGB30W/kozi+w5lnNllMH9dI75fG1QieAnfqK+Wj KMB/LsB+FdhBUMsjrbrPw4UV/RZHDcUix/UuDCQ4mp13mS6sroIwsK8Smc3OZENCIPxgT4DMugvaj F9ZXSFsw0GgRHhGwrfPGaOEX6MZKfzEcHWuTs+3nCJq5i8G5JTiATbgExA9PBIkvGvHohwyZxNW8+ 1jc+/zuw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1sqi62-00000007Bct-2Mqs; Tue, 17 Sep 2024 23:59:02 +0000 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1sqi4v-00000007BX1-1qhs for linux-arm-kernel@lists.infradead.org; Tue, 17 Sep 2024 23:57:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1726617471; bh=t1noOrDvrTz359kxFhjY3nJXTUUHuskoM8PWULvvuZo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=g0XT6X6JK66KjfatWW7onuqqIvkm3oEwC47tNb1oP2hwSFO2fHvUz7CCQwq5CTwbi cjfym4uSRPRde5wid0GRe6bsjSabnKXRcig7VoECfEcAuhFX2mYUMoVTEZ8D67+q5y 0SVRGl7NNkw5PtO76fnLwo0dPsTlhsocHsWoGSX0c+8nmhKgJ0pZ2ZRcBS3CSTu3fC 6o2ryG6v27A2O0+/ktNjirGUjPxXRe5qVo8nMebUgw1s+MTZ+qCDvfjcJXAOI0ek6P hkT5Dz36NgFZMk+ZkSC/3B7guMNtlkazO6Ciu0BcQqf6OoF4iK6IvCMmAXj42kM6zF JPSq5cXCKbJsA== 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) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4X7dy45kvFz4wy9; Wed, 18 Sep 2024 09:57:48 +1000 (AEST) Date: Wed, 18 Sep 2024 09:57:47 +1000 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann Cc: Takashi Iwai , Alexander Sverdlin , Linux Kernel Mailing List , Linux Next Mailing List , ARM , Mark Brown , Nikita Shubin , Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= Subject: Re: linux-next: manual merge of the sound tree with the arm-soc tree Message-ID: <20240918095747.508337e4@canb.auug.org.au> In-Reply-To: <20240916145800.743302ec@canb.auug.org.au> References: <20240916145800.743302ec@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/FkEfwHpp0+phsd4eE3MHwPs"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240917_165753_774570_5C92C587 X-CRM114-Status: GOOD ( 19.09 ) 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 --Sig_/FkEfwHpp0+phsd4eE3MHwPs Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 16 Sep 2024 14:58:00 +1000 Stephen Rothwell = wrote: > > Today's linux-next merge of the sound tree got a conflict in: >=20 > sound/soc/cirrus/edb93xx.c >=20 > between commit: >=20 > 7a9a9110d765 ("ASoC: cirrus: edb93xx: Delete driver") >=20 > from the arm-soc tree and commit: >=20 > 130af75b5c05 ("ASoC: Switch back to struct platform_driver::remove()") >=20 > from the sound tree. >=20 > I fixed it up (I removed the file) 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. This is now a conflict between the arm-soc tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/FkEfwHpp0+phsd4eE3MHwPs Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmbqF3sACgkQAVBC80lX 0GyM6Qf+K+yimpVHXRqeY5c2ufM1cDuZ4Ia7tdNp+mMdo2x17DQYzccnPDwVyuZs 3SYjfp02/HnuMTEfE4GFY+f8+/lfu81ZeU/JxVRMBpfCiCJF1eXtcnLpnzDcVOca BOBm3vtUg2iv2esZ2AdLcux0L1bnB7uWycD8DUrIhPix+DagJQwc4MFK0JASh0Nc 9nQq3boXETCLrgA7IqcCpsipMOdEzth7YZDeDcZaFIqkO8SV6vZnO/FUm6CLlnYK P1mqH4obkT/553xHTSHfnfe8uYK4zZMy802d79p2gqZpKxUZ3/NBZOk68ghjHzaR EMsrnfzv4GWOl0wE7bquqaOZMElO1A== =5Mf9 -----END PGP SIGNATURE----- --Sig_/FkEfwHpp0+phsd4eE3MHwPs--