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

Message-ID: <CACMJSesVtZqZeodT5Fd5kmugxGYJn4KjnAzHpcvyGx8Rz53DbA@mail.gmail.com>
Date: Mon, 3 Mar 2025 09:33:24 +0100
From: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Bartosz Golaszewski <brgl@...ev.pl>, Dan Carpenter <dan.carpenter@...aro.org>, 
	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
 gpio-brgl-fixes tree

On Mon, 3 Mar 2025 at 06:57, 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/gpio/gpiolib.c
>
> between commit:
>
>   64407f4b5807 ("gpiolib: Fix Oops in gpiod_direction_input_nonotify()")
>
> from the gpio-brgl-fixes tree and commit:
>
>   e623c4303ed1 ("gpiolib: sanitize the return value of gpio_chip::get_direction()")
>
> from the gpio-brgl tree.
>
> I fixed it up (I think - see below) 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
>

Hi Stephen!

Thanks, I pulled in v6.14-rc5 into my for-next branch and fixed the
conflicts there, next should be fine tomorrow.

Bartosz