[GIT PULL 5.11-rc8] LED fix

[GIT PULL 5.11-rc8] LED fix

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]

Hi!

I have single fixlet for you at

  git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/ for-rc8-5.11

Please pull it. It should be one patch, and one-line fixing build
problem.

    leds: rt8515: add V4L2_FLASH_LED_CLASS dependency

Unfortunately, for some reason request-pull is not willing to
cooperate, so I'm just doing this manually.

pavel@duo:/data/l/linux-leds$ git request-pull master git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/ 92bf22614b21a2706f4993b278017e437f7785b3 > /tmp/delme for-rc8-5.11 
warn: No match for commit 92bf22614b21a2706f4993b278017e437f7785b3 found at git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/
warn: Are you sure you pushed '92bf22614b21a2706f4993b278017e437f7785b3' there?
pavel@duo:/data/l/linux-leds$

I see 92bf... using https. Are mirrors out of sync or what? 

https://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/commit/?h=for-rc8-5.11

Best regards,
							Pavel


-- 
http://www.livejournal.com/~pavelmachek

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: [GIT PULL 5.11-rc8] LED fix

[Linus Torvalds]

On Sun, Feb 14, 2021 at 9:13 AM Pavel Machek <pavel@ucw.cz> wrote:
>
> Unfortunately, for some reason request-pull is not willing to
> cooperate, so I'm just doing this manually.

The reason request-pull doesn't cooperate is actually spelled out explicitly:

> pavel@duo:/data/l/linux-leds$ git request-pull master git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/ 92bf22614b21a2706f4993b278017e437f7785b3 > /tmp/delme for-rc8-5.11
> warn: No match for commit 92bf22614b21a2706f4993b278017e437f7785b3 found at git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/
> warn: Are you sure you pushed '92bf22614b21a2706f4993b278017e437f7785b3' there?

Commit 92bf22614b21 is my rc7 commit. And it's not in your tree (which
is based on rc1).

Why are you giving raw commit ID's to git request-pull? Particularly
ones that aren't even in your upstream tree? Git figures things out on
its own, why do you point to the rc7 commit that has nothing to do
with what you're pushing?

And yes, that commit exists on kernel.org through my tree, but it's
not reachable from any tips in yours (because your work was based on
earlier state - which is as it should be).

              Linus

Re: [GIT PULL 5.11-rc8] LED fix

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1730 bytes --]

Hi!

> > Unfortunately, for some reason request-pull is not willing to
> > cooperate, so I'm just doing this manually.
> 
> The reason request-pull doesn't cooperate is actually spelled out explicitly:
> 
> > pavel@duo:/data/l/linux-leds$ git request-pull master git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/ 92bf22614b21a2706f4993b278017e437f7785b3 > /tmp/delme for-rc8-5.11
> > warn: No match for commit 92bf22614b21a2706f4993b278017e437f7785b3 found at git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/
> > warn: Are you sure you pushed '92bf22614b21a2706f4993b278017e437f7785b3' there?
> 
> Commit 92bf22614b21 is my rc7 commit. And it's not in your tree (which
> is based on rc1).
> 
> Why are you giving raw commit ID's to git request-pull? Particularly
> ones that aren't even in your upstream tree? Git figures things out on
> its own, why do you point to the rc7 commit that has nothing to do
> with what you're pushing?

I find raw commit IDs easier to work with than the tags.

> And yes, that commit exists on kernel.org through my tree, but it's
> not reachable from any tips in yours (because your work was based on
> earlier state - which is as it should be).

I don't understand.

I want you to apply dbeb02a0bc41b9e9b9c05e460890351efecf1352 .

92bf22614b21 is my rc7, and it is parent of the commit I want you to
apply. It is listed as so on
https://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/commit/?h=for-rc8-5.11 . I would call that "reachable"...?

So I guess I could update master to rc7 to get rid of this error and
retry request-pull?

Best regards,
								Pavel
-- 
http://www.livejournal.com/~pavelmachek

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [GIT PULL 5.11-rc8] LED fix

[Linus Torvalds]

On Sun, Feb 14, 2021 at 12:31 PM Pavel Machek <pavel@ucw.cz> wrote:
>
> 92bf22614b21 is my rc7, and it is parent of the commit I want you to
> apply.

Oh, right you are. I looked at your leds-cleanup-for-pavel branch for
some reason, which was much older.

Anyway, it does the remote lookup with git ls-remote, and doesn't find
any matching ref for that 92bf22614 commit you gave it as a base, so
that's why it complains. You _could_ fix that by just pushing all the
tags you have locally to your remote too.

Have you changed your behavior wrt git request-pull lately? Because
that whole model you use is broken.

The "end" commit shouldn't be my tag (and it shouldn't be a SHA1). It
should be *your* branch name.

So what you *should* have used is something like

    git request-pull master
git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/
for-rc8-5.11

(assuming "master" is the upstream branch - which would be my
v5.11-rc7) without any odd SHA games or anything like that.

              Linus

Re: [GIT PULL 5.11-rc8] LED fix

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]

Hi!

> On Sun, Feb 14, 2021 at 12:31 PM Pavel Machek <pavel@ucw.cz> wrote:
> >
> > 92bf22614b21 is my rc7, and it is parent of the commit I want you to
> > apply.
> 
> Oh, right you are. I looked at your leds-cleanup-for-pavel branch for
> some reason, which was much older.
> 
> Anyway, it does the remote lookup with git ls-remote, and doesn't find
> any matching ref for that 92bf22614 commit you gave it as a base, so
> that's why it complains. You _could_ fix that by just pushing all the
> tags you have locally to your remote too.
> 
> Have you changed your behavior wrt git request-pull lately? Because
> that whole model you use is broken.

This was really one-off and I found the git messages quite confusing.
> 
> The "end" commit shouldn't be my tag (and it shouldn't be a SHA1). It
> should be *your* branch name.
> 
> So what you *should* have used is something like
> 
>     git request-pull master
> git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/
> for-rc8-5.11
> 
> (assuming "master" is the upstream branch - which would be my
> v5.11-rc7) without any odd SHA games or anything like that.

Yes, pushing master should work. I tried to fall back to SHAs as I
find them less confusing.

Best regards,
								Pavel

-- 
http://www.livejournal.com/~pavelmachek

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: [GIT PULL 5.11-rc8] LED fix

[pr-tracker-bot]

The pull request you sent on Sun, 14 Feb 2021 18:13:28 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/ for-rc8-5.11

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/28a17338738839494752c5da3e12c889a55219db

Thank you!

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