Re: [GIT PULL] gpio fixes for v7.2-rc1

[Linus Torvalds]

On Thu, 25 Jun 2026 at 02:07, Bartosz Golaszewski
<bartosz.golaszewski@xxxxxxxxxxxxxxxx> wrote:
>
>   a) Pull Lee's tag directly into my tree
>   b) Pull your merge commit
>   c) Rebase my branch and force-push
>
> I decided to go with b) as it doesn't result in two merges of the same tag in
> git history.

I think your tree looks ok, but I do suspect (a) would have been the
slightly cleaner option.

It's not a problem to pull a tag twice, and you would have avoided
getting all the _other_ random merge-window updates from my tree that
could cause entirely unrelated issues.

So (a) would have been a more surgical "minimal merge" than pulling
from upstream.

It would also have resulted in a cleaner commit message rather than a
"Merge commit '<random SHA>'.

But hey, it's ok as it is, and I appreciate the explanation.

Odd git histories that I notice after-the-fact make me go "Why?".

While odd git histories with an explanation for them typically make me
go "Oh, ok", makes sense.

Thanks,
              Linus