* linux-next: manual merge of the gpio-brgl tree with the input tree
@ 2025-07-04 8:56 Stephen Rothwell
2025-07-04 9:00 ` Bartosz Golaszewski
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2025-07-04 8:56 UTC (permalink / raw)
To: Bartosz Golaszewski, Dmitry Torokhov
Cc: Bartosz Golaszewski, Lee Jones, Linux Kernel Mailing List,
Linux Next Mailing List, Nuno Sá
[-- Attachment #1: Type: text/plain, Size: 759 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the gpio-brgl tree with the input tree
2025-07-04 8:56 linux-next: manual merge of the gpio-brgl tree with the input tree Stephen Rothwell
@ 2025-07-04 9:00 ` Bartosz Golaszewski
2025-07-04 12:47 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Bartosz Golaszewski @ 2025-07-04 9:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dmitry Torokhov, Bartosz Golaszewski, Lee Jones,
Linux Kernel Mailing List, Linux Next Mailing List, Nuno Sá
On Fri, Jul 4, 2025 at 10:56 AM Stephen Rothwell <sfr@canb•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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the gpio-brgl tree with the input tree
2025-07-04 9:00 ` Bartosz Golaszewski
@ 2025-07-04 12:47 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2025-07-04 12:47 UTC (permalink / raw)
To: Bartosz Golaszewski
Cc: Dmitry Torokhov, Bartosz Golaszewski, Lee Jones,
Linux Kernel Mailing List, Linux Next Mailing List, Nuno Sá
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
Hi Bartosz,
On Fri, 4 Jul 2025 11:00:49 +0200 Bartosz Golaszewski <brgl@bgdev•pl> wrote:
>
> 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.
It really not a big problem, Linus can be told about this when he
merges the trees ...
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-07-04 12:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-04 8:56 linux-next: manual merge of the gpio-brgl tree with the input tree Stephen Rothwell
2025-07-04 9:00 ` Bartosz Golaszewski
2025-07-04 12:47 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox