Messages in this thread |  | | From | Linus Torvalds <> | | Date | Tue, 24 May 2022 10:17:03 -0700 | | Subject | Re: [GIT PULL] platform-drivers-x86 for 5.19-1 |
| |
On Mon, May 23, 2022 at 11:47 PM Hans de Goede <hdegoede@redhat.com> wrote: > > I did do a "git remote update origin" recently (recent-ish), but > AFAIK that does not help.
Hmm. Did you pass in 'origin' to git request-pull too?
> I did read somewhere that in cases like this some maintainers > create a branch with a merge of their for-next branch [..]
No, that's only necessary for when the branch has merges and can have multiple merge bases as a result - that will make 'git diff' unable to find an unambiguous place to start the diff from (see Documentation/maintainer/messy-diffstat.rst for the details).
But your tree doesn't have that issue, and you can also see the old commits in your shortlog (and the "messy diffstat" is _only_ about the diff, not about the commit list). And you can see the same effect in the shortlog, ie I merged your earlier fixes pull request in commit 9be9ed2612b5 ("Merge tag 'platform-drivers-x86-v5.18-4' of git://..."), and it already had
* tag 'platform-drivers-x86-v5.18-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/pla> platform/surface: aggregator: Fix initialization order when compiling as builtin module platform/surface: gpe: Add support for Surface Pro 8 platform/x86/intel: Fix 'rmmod pmt_telemetry' panic platform/x86: thinkpad_acpi: Correct dual fan probe platform/x86: thinkpad_acpi: Add a s2idle resume quirk for a number of laptops platform/x86: thinkpad_acpi: Convert btusb DMI list to quirks
but notice how your pll request had those commits listed again (ie it had, for example:
Maximilian Luz (2): platform/surface: gpe: Add support for Surface Pro 8 platform/surface: aggregator: Fix initialization order when compiling as builtin module
in there).
And while merges can confuse the diffstat, the actual commit list doesn't care: it does a proper set operation, and having multiple merge bases doesn't matter.
This all is not a huge deal - I figured out what was going on, so it wasn't a problem.
I just mentioned it because that whole "Linus figures it out" does take some time and effort, and I'm really really lazy and much prefer to just do the pull and look at the result and go "Yeah, looks good" and go on to the next one...
Thanks, Linus
|  |