linux-kernel - Re: linux-next: manual merge of the gpio-brgl tree with the iio 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CACMJSesMvFBd3cvCZgD+02puEMbNgrxKgSvJtu23rt6fAAOMvw@mail.gmail.com>
Date: Mon, 17 Feb 2025 09:13:36 +0100
From: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Jonathan Cameron <jonathan.cameron@...wei.com>
Cc: Bartosz Golaszewski <brgl@...ev.pl>, Angelo Dureghello <adureghello@...libre.com>, 
	David Lechner <dlechner@...libre.com>, Guillaume Stols <gstols@...libre.com>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the iio tree

On Mon, 17 Feb 2025 at 04:56, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   drivers/iio/adc/ad7606_spi.c
>
> between commit:
>
>   d2477887f667 ("iio: adc: ad7606: move software functions into common file")
>
> from the iio tree and commit:
>
>   8203bc81f025 ("iio: adc: ad7606: use gpiod_multi_set_value_cansleep")
>
> from the gpio-brgl tree.
>
> I fixed it up (code was moved so I used the former version of this file
> and applied the following merge resolution patch) 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.
>
> From a1072aac97bdaf3042fe2def4d7e6e7fa928cfbd Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Mon, 17 Feb 2025 14:52:30 +1100
> Subject: [PATCH] fix up for "iio: adc: ad7606: use gpiod_multi_set_value_cansleep"
>
> interacting with commit
>
>   d2477887f667 ("iio: adc: ad7606: move software functions into common file")
>
> from the iio tree.
>
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  drivers/iio/adc/ad7606.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c
> index cb3de1bd15b4..7d83bb320249 100644
> --- a/drivers/iio/adc/ad7606.c
> +++ b/drivers/iio/adc/ad7606.c
> @@ -1259,10 +1259,9 @@ static int ad7606b_sw_mode_setup(struct iio_dev *indio_dev)
>          * in the device tree, then they need to be set to high,
>          * otherwise, they must be hardwired to VDD
>          */
> -       if (st->gpio_os) {
> -               gpiod_set_array_value(st->gpio_os->ndescs, st->gpio_os->desc,
> -                                     st->gpio_os->info, os);
> -       }
> +       if (st->gpio_os)
> +               gpiod_multi_set_value_cansleep(st->gpio_os, os);
> +
>         /* OS of 128 and 256 are available only in software mode */
>         st->oversampling_avail = ad7606b_oversampling_avail;
>         st->num_os_ratios = ARRAY_SIZE(ad7606b_oversampling_avail);
> --
> 2.45.2
>
> --
> Cheers,
> Stephen Rothwell

Jonathan,

I'm repeating my offer here - I can drop the iio patches from my queue
and let you pick them up to avoid conflicts in next and during the
merge window. How does it sound? It's still pretty early into the
release cycle so I'm fine with rebasing my branch.

Bart