linux-kernel - Re: [GIT PULL] platform-drivers-x86 for 5.19-1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHk-=wgTRT6nQeJpVCKb+m=So6bLzUZQYcY6+RH5W0gZfsp+Fg@mail.gmail.com>
Date:   Thu, 26 May 2022 12:25:07 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Hans de Goede <hdegoede@...hat.com>
Cc:     Andy Shevchenko <andy@...radead.org>,
        Mark Gross <mark.gross@...el.com>,
        LKML <linux-kernel@...r.kernel.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        "Peter Zijlstra (Intel)" <peterz@...radead.org>
Subject: Re: [GIT PULL] platform-drivers-x86 for 5.19-1

On Wed, May 25, 2022 at 5:34 AM Hans de Goede <hdegoede@...hat.com> wrote:
>
> 5. run:
>
> git tag -s platform-drivers-x86-v5.19-1 for-next
> git request-pull v5.18-rc1 git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git platform-drivers-x86-v5.19-1 > pull

So there's your problem.

You're basically saying "give me a pull-request against v5.18-rc1".

Which is bogus, since you already sent me part of your pile after rc1,
and I already have it, so now your pull request will end up repeating
those parts.

So just do

     git fetch origin
     git request-pull origin/master git://git....

to let git figure out what the actual common state is with 'origin'
(and obviously you may have a different name for my upstream
repository, so replace "origin" with whatever that correct name is).

(That "git fetch origin" doesn't have to happen right before the pull
request, but it has to be done at *some* point so that your git tree
is basically aware of what I've merged from you previously).

Anyway, the important point is that you shouldn't try to remember -
incorrectly - what the last common point for us is.  Git knows - as
long as you just give it enough info.

                 Linus