From: Jonathan Cameron <jic23@kernel.org>
To: Thierry Reding <thierry.reding@kernel.org>
Cc: Jonathan Cameron <Jonathan.Cameron@Huawei.com>,
Francesco Lavra <flavra@baylibre.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
linux-iio@vger.kernel.org
Subject: Re: linux-next: manual merge of the iio tree with the iio-fixes tree
Date: Thu, 7 May 2026 11:29:38 +0100 [thread overview]
Message-ID: <20260507112938.369b6a1b@jic23-huawei> (raw)
In-Reply-To: <a361f317e3aff614a00ddc8ef908d820@kernel.org>
On Thu, 07 May 2026 12:05:27 +0200
Thierry Reding <thierry.reding@kernel.org> wrote:
> 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.
Thanks. That's the correct conflict resolution.
next parent reply other threads:[~2026-05-07 10:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <a361f317e3aff614a00ddc8ef908d820@kernel.org>
2026-05-07 10:29 ` Jonathan Cameron [this message]
2026-05-07 10:41 ` linux-next: manual merge of the iio tree with the iio-fixes tree 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=20260507112938.369b6a1b@jic23-huawei \
--to=jic23@kernel.org \
--cc=Jonathan.Cameron@Huawei.com \
--cc=flavra@baylibre.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=thierry.reding@kernel.org \
/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