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 B4EA7C3ABCB for ; Mon, 16 Sep 2024 04:59:37 +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: 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=SGvh2KrCSkdxgT9cqqyW72ZphrRxJSgV7dWMDYAvspI=; b=qKGHxviqtR/G6h5Qo4vQ7ao0Xm O/eE899/rRwTPkcq0iuHBSZBXkFkANE9b63y8Zw6XBB5Zarn4NIxw91Ak1mezfrfoyMGTXrNgcYUA 9POAFaMzVj/IEPeEk8k8xZ6thn/AqflETAZGx9AgZ+OwynxVa3WU7apPxPS7vDVI6rhp8WK6oWakS tC8Vj2Lbqi7a4i5MJF54qiA9F10LDvzrQhprRv7lVej1gDAAczV+8tF3OjFrQG7KA9bs/LoyjPuuh cd57GirSAm3zFnFAxJDitAM+mI8CEdv5A4ItfP4+t5bOodoWL9Qz26ANvdZ2otugQdamUyeZ/JgDe uhSaHhvQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1sq3pX-000000035MX-3JmA; Mon, 16 Sep 2024 04:59:19 +0000 Received: from gandalf.ozlabs.org ([150.107.74.76] helo=mail.ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1sq3oS-000000035HY-1SXX for linux-arm-kernel@lists.infradead.org; Mon, 16 Sep 2024 04:58:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1726462684; bh=SGvh2KrCSkdxgT9cqqyW72ZphrRxJSgV7dWMDYAvspI=; h=Date:From:To:Cc:Subject:From; b=nMicJQhpuC1K20IyWIyWvhpfHHPk1MXTMX/ZTGGfEoITpJMQ25Kat760Fd5Fj3+bg HICU3/2lIYJpEvRD7A9J36AVGn5LNRF2dIk7ilMw2lKakVZABcNCX4XD6wX1WkRD5d Kd8N+2pfJ1UceAtGGYtrXr+IrQPR1lFPrUUw/zKtU98V2196vfqEHdPZnPTC5UfVsg yBOWWN2jzltJvouu3ZQm9+zNV5OFc8/ETyHMO6QvM2xfCSuoK4QjWg1zR+YLl6oiUz DX6aoyAjt4E2N2pcj1klISM66bgCK1ALIu87u6LH/fNWnldBBsLoiUjEv8qjSrB3Hb +kmFX19p7nXBw== 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 4X6XjP5Zddz4xCV; Mon, 16 Sep 2024 14:58:01 +1000 (AEST) Date: Mon, 16 Sep 2024 14:58:00 +1000 From: Stephen Rothwell To: Takashi Iwai , Olof Johansson , Arnd Bergmann Cc: Alexander Sverdlin , Linux Kernel Mailing List , Linux Next Mailing List , ARM , Mark Brown , Nikita Shubin , Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= Subject: linux-next: manual merge of the sound tree with the arm-soc tree Message-ID: <20240916145800.743302ec@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/9CVimmwn12Biz5BvpeTDfeD"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240915_215812_784466_EAD03EB1 X-CRM114-Status: GOOD ( 14.92 ) 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_/9CVimmwn12Biz5BvpeTDfeD Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the sound tree got a conflict in: sound/soc/cirrus/edb93xx.c between commit: 7a9a9110d765 ("ASoC: cirrus: edb93xx: Delete driver") from the arm-soc tree and commit: 130af75b5c05 ("ASoC: Switch back to struct platform_driver::remove()") from the sound tree. 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. --=20 Cheers, Stephen Rothwell --Sig_/9CVimmwn12Biz5BvpeTDfeD Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmbnutgACgkQAVBC80lX 0GwhNAf+L14dWyGJLxdRhRIHsGZigQ+1g5GW0KgRjOsdSytBn4eV68gVwh9Yy2yZ WvUrPBjyefc+kF5v5ZIN4LwWkr2ly7RA3HuFn/4Ioi/mpiSAZqC/cuaCrqKukXaM 36eg2MtifWjt7dfVgN2t2YlWPuw6sHRlXzoy2YbmFIkN3pwuySnQhdVZYzdF54+r Cws8G3zB+U9sofomOFUFAUdrymAvmc9NKy0Ju8Ms1PgtXNhEgI9ex5n3yjkyzhT9 gCmjfB/RLELpnNuTB6ico5Lx0HYhbNYvGemzXBI6rvnkqpBXfHrlAD7EPIbefNvy Q8Rg/I2Y7tvIXF8t26ukiaTyPo+MzQ== =dddB -----END PGP SIGNATURE----- --Sig_/9CVimmwn12Biz5BvpeTDfeD--