From: Javier Carrasco <javier.carrasco.cruz@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>, Greg KH <greg@kroah•com>,
Arnd Bergmann <arnd@arndb•de>,
Jonathan Cameron <Jonathan.Cameron@Huawei•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the iio-fixes tree
Date: Wed, 23 Oct 2024 20:17:30 +0200 [thread overview]
Message-ID: <22f9dbb6-ba5e-4c85-8aa2-6090008e7da4@gmail.com> (raw)
In-Reply-To: <20241023141015.0ec5346d@canb.auug.org.au>
On 23/10/2024 05:10, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/iio/light/veml6030.c
>
> between commit:
>
> de9981636774 ("iio: light: veml6030: fix microlux value calculation")
>
> from the iio-fixes tree and commit:
>
> ed59fc90f38a ("iio: light: veml6030: drop processed info for white channel")
>
> from the char-misc tree.
>
> I fixed it up (the latter removed the line updated by the former) 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.
>
Hi Stephen,
I doubled checked the status of the driver in linux-next, and everything
looks as it should: the first commit applied as a single chunk, as its
second chunk affects lines that the second commit removed.
Thank you for fixing it up.
Best regards,
Javier Carrasco
next prev parent reply other threads:[~2024-10-23 18:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-23 3:10 linux-next: manual merge of the char-misc tree with the iio-fixes tree Stephen Rothwell
2024-10-23 18:17 ` Javier Carrasco [this message]
2024-10-24 17:41 ` Jonathan Cameron
2024-10-24 18:39 ` Javier Carrasco
2024-10-25 16:08 ` Jonathan Cameron
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=22f9dbb6-ba5e-4c85-8aa2-6090008e7da4@gmail.com \
--to=javier.carrasco.cruz@gmail$(echo .)com \
--cc=Jonathan.Cameron@Huawei$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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