Received-SPF: pass (google.com: domain of linux-kernel+bounces-196234-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Fri, 31 May 2024 14:06:21 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
Cc: Adam Rizkalla <ajarizzo@gmail.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Vasileios Amoiridis <vassilisamir@gmail.com>
Subject: linux-next: manual merge of the iio tree with the iio-fixes tree
Message-ID: <20240531140621.264f0848@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/77uBBWuWW74Vr9XPqBfa2ox";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  drivers/iio/pressure/bmp280-core.c

between commit:

  0f0f6306617c ("iio: pressure: bmp280: Fix BMP580 temperature reading")

from the iio-fixes tree and commit:

  d58479ff81c0 ("iio: pressure: bmp280: Generalize read_{temp,press,humid}(=
) functions")

from the iio tree.

I fixed it up (I just 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_/77uBBWuWW74Vr9XPqBfa2ox
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZZTL0ACgkQAVBC80lX
0Gxoewf7BmUZwxfd7Wh6MEAwH514y3ObMGtjKDMPDw1H6bdKw/8duC50pAin2GDb
58kf6CbbTcfEoZyWr/iuMRWWgK5eBbvtEjPF1m2lE3OH8DdoE2qjafardJ0nTDN9
ULmrE4Som349wyLW56/75t9EaIBGFQumdFUD7UnGW+zrUWcpN1QnulN5Cm4Hbx7M
ILgOop7LdIq0vd7WFDGFd/q3zzrC/ddZGszxCXBJVR+0tmXK5Jf05dAcJcNYl56R
39nHus8z2lWgXefBEBl6tR0NeFywg3J7E4ze9XZROfScgJYlywhj5L1OKXu2OrE/
mo8xLDPys97X5gL80jBYyosMiEH3ZQ==
=fRZy
-----END PGP SIGNATURE-----

--Sig_/77uBBWuWW74Vr9XPqBfa2ox--