Re: [GIT PULL 2/4] soc: drivers for 7.3

Re: [GIT PULL 2/4] soc: drivers for 7.3

[Linus Torvalds]

On Tue, 18 Aug 2026 at 14:17, Arnd Bergmann <arnd@arndb.de> wrote:
>
>  .mailmap                                           |    6 +-
>  Documentation/ABI/testing/debugfs-vfio             |   26 +
>  .../ABI/testing/sysfs-bus-pci-drivers-xhci_hcd     |    2 +-
[...]
>  tools/virtio/linux/mod_devicetable.h               |   14 +
>  tools/virtio/linux/virtio_features.h               |   79 ++
>  2565 files changed, 15693 insertions(+), 8154 deletions(-)

Well, that diffstat was just garbage.  The real one looks something like this:

   121 files changed, 4566 insertions(+), 1492 deletions(-)

and actually mentions files that make sense.

This garbage diffstat is normal when you have multiple merge bases -
git will pick the first one it finds as the base for the diff, and the
diff will then contain random other contents that came from entirely
different trees.

But the fact that you have multiple merge bases also means that you
know how to merge with git, and so typically a quality pull request
would involve doing a pre-merge test in order to get the proper "this
is the diffstat you will see after a merge".

I don't actually require that kind of better pull request, but it
would make your PRs look nicer.

Hint hint,

           Linus

Re: [GIT PULL 2/4] soc: drivers for 7.3

[Arnd Bergmann]

On Wed, Aug 19, 2026, at 04:46, Linus Torvalds wrote:
> On Tue, 18 Aug 2026 at 14:17, Arnd Bergmann <arnd@arndb.de> wrote:
>>
>>  .mailmap                                           |    6 +-
>>  Documentation/ABI/testing/debugfs-vfio             |   26 +
>>  .../ABI/testing/sysfs-bus-pci-drivers-xhci_hcd     |    2 +-
> [...]
>>  tools/virtio/linux/mod_devicetable.h               |   14 +
>>  tools/virtio/linux/virtio_features.h               |   79 ++
>>  2565 files changed, 15693 insertions(+), 8154 deletions(-)
>
> Well, that diffstat was just garbage.  The real one looks something like this:
>
>    121 files changed, 4566 insertions(+), 1492 deletions(-)
>
...
>
> I don't actually require that kind of better pull request, but it
> would make your PRs look nicer.

Thanks for letting me know, I really should have caught this
while sending the pull request. I was fairly sure that I had
not introduced any backmerges or octopus merges myself, so
I didn't pay enough attention when preparing the pull requests.

What what I can tell, the thing that tripped me up was commit
980a8bfe7bae ("Merge branches 'for-next/scmi/fixes' and
'for-next/ffa/fixes'"), which I pulled in as part of a normal
downstream branch.

      Arnd 

Re: [GIT PULL 2/4] soc: drivers for 7.3

[pr-tracker-bot]

The pull request you sent on Tue, 18 Aug 2026 23:16:41 +0200:

> https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/soc-drivers-7.3

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/368cf60c36a3a311474de08e52dc6314df3b06ce

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html