Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 21 Sep 2022 15:20:13 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Vinod Koul <vkoul@kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: linux-next: manual merge of the soundwire tree with Linus' tree
Message-ID: <20220921152013.2cffcf42@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/NvcAsUE2FnweYF6OhaOesF=";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/NvcAsUE2FnweYF6OhaOesF=
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the soundwire tree got a conflict in:

  drivers/soundwire/qcom.c

between commit:

  4ef3f2aff126 ("soundwire: qcom: fix device status array range")

from Linus' tree and commits:

  8039b6f3e5c7 ("soundwire: qcom: update status from device id 1")
  ed8d07acec73 ("soundwire: qcom: do not send status of device 0 during ale=
rt")

from the soundwire tree.

I fixed it up (I used the latter) 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_/NvcAsUE2FnweYF6OhaOesF=
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMqnw0ACgkQAVBC80lX
0GznvQf/fGiI++ydJ4a1cmdSzCBYlI0yMpIZILMCu1mEPdQPt7DIYBGBqhLNt405
1k+nyFJYV9D8uzjXmVqvcJ8HEjhMK6LmYCsUYNsShrt2x0wPg/FycLXGsIrOjXx9
NNDxcjxhnMci6TcNPeJwJRKg07N294ZOLQbeR+2Ms2zNH5QYG8e24dS6S1rzBLBA
wWm28MyuCIKPWV4SO+tNKEWePWSbSq6fJ49G7AaB2XE7j1S0otV6eMmdEGJrL77J
raypvng1UZucP/W7AGJFSWhsuFaqkeUEpHteHEc06zl4Az7o+ekukAwffEHW1zpL
I5q6Mb1fhoWKsN2SyMtY0u+K7nNsxA==
=lML6
-----END PGP SIGNATURE-----

--Sig_/NvcAsUE2FnweYF6OhaOesF=--