From: Thierry Reding <thierry.reding@kernel.org>
To: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
Cc: Francesco Lavra <flavra@baylibre.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jonathan Cameron <jic23@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the iio tree with the iio-fixes tree
Date: Thu, 07 May 2026 12:05:27 +0200 [thread overview]
Message-ID: <a361f317e3aff614a00ddc8ef908d820@kernel.org> (raw)
Hi all,
Today's linux-next merge of the iio tree got a conflict in:
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
between commit:
cba48e44357b ("iio: imu: st_lsm6dsx: fix stack leak in tagged FIFO buffer")
from the iio-fixes tree and commit:
7216b9f7e9fe ("iio: imu: st_lsm6dsx: Fix check for invalid samples from FIFO")
from the iio tree.
I fixed it up by using the version from the iio tree. 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.
next reply other threads:[~2026-05-07 10:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-07 10:05 Thierry Reding [this message]
2026-05-07 10:29 ` linux-next: manual merge of the iio tree with the iio-fixes tree Jonathan Cameron
2026-05-07 10:41 ` Thierry Reding
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a361f317e3aff614a00ddc8ef908d820@kernel.org \
--to=thierry.reding@kernel.org \
--cc=Jonathan.Cameron@Huawei.com \
--cc=flavra@baylibre.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox