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

Message-ID: <CAMRc=Md7Znq6Lww3-i+sRW1LZMD78s7vnVYnDwVKQsjn7OMhvg@mail.gmail.com>
Date: Fri, 4 Jul 2025 11:00:49 +0200
From: Bartosz Golaszewski <brgl@...ev.pl>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Dmitry Torokhov <dmitry.torokhov@...il.com>, 
	Bartosz Golaszewski <bartosz.golaszewski@...aro.org>, Lee Jones <lee@...nel.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Nuno Sá <nuno.sa@...log.com>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the input tree

On Fri, Jul 4, 2025 at 10:56 AM 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/input/keyboard/adp5589-keys.c
>
> between commit:
>
>   43a8440f3969 ("Input: adp5589 - use new GPIO line value setter callbacks")
>
> from the input tree and commit:
>
>   3bdbd0858df6 ("Input: adp5589: remove the driver")
>
> from the gpio-brgl tree.
>
> I fixed it up (I removed the file) 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.
>

Ah, I pulled a tag from Lee's MFD tree containing 3bdbd0858df6
("Input: adp5589: remove the driver") but I don't have 43a8440f3969
("Input: adp5589 - use new GPIO line value setter callbacks") from
Dmitry's tree. Dmitry: is it too late to get an immutable branch with
these changes? Or otherwise you can drop 43a8440f3969 from your 6.17
branch.

Bartosz