lkml.org 
[lkml]   [2022]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [GIT PULL] platform-drivers-x86 for 5.19-1
From
Hi Linus,

On 5/24/22 05:49, Linus Torvalds wrote:
> On Sun, May 22, 2022 at 1:00 PM Hans de Goede <hdegoede@redhat.com> wrote:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git tags/platform-drivers-x86-v5.19-1
>
> Hmm.
>
> Your diffstat doesn't match what I get, and it seems to be because
> you've generated the diffstat based off v5.18-rc1, but you already
> sent me two pull requests with fixes since.
>
> So your diffstat contained the diffs from those fixes I had already gotten.
>
> If you just do "git fetch origin" (replace 'origin' with whatever you
> call the upstream tree) before doing the pull request, git would have
> figured that out.

I did do a "git remote update origin" recently (recent-ish), but
AFAIK that does not help.

I did read somewhere that in cases like this some maintainers
create a branch with a merge of their for-next branch into
say v5.18 in there and then they do a diffstat between the
merge and v5.18 and manually edit the pull-req to replace
the diffstat.

That makes sense to do if say some files have moved / been renamed
after rc1, but that seems overkill in this case since my fixes
pull-reqs weren't that big and did not include any moves/renames ?

Regards,

Hans

\
 
 \ /
  Last update: 2022-05-24 08:48    [W:2.353 / U:0.224 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site