linux-kernel - linux-next: manual merge of the iio tree with the iio-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20240531140621.264f0848@canb.auug.org.au>
Date: Fri, 31 May 2024 14:06:21 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@...wei.com>
Cc: Adam Rizkalla <ajarizzo@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Vasileios Amoiridis <vassilisamir@...il.com>
Subject: linux-next: manual merge of the iio tree with the iio-fixes tree

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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped