* [GIT PULL] Thermal-SoC management fixes for v5.0-rc6 @ 2019-02-10 4:17 Eduardo Valentin 2019-02-10 4:25 ` pr-tracker-bot 0 siblings, 1 reply; 9+ messages in thread From: Eduardo Valentin @ 2019-02-10 4:17 UTC (permalink / raw) To: Linus Torvalds, Rui Zhang; +Cc: ACPI Devel Maling List, Linux PM, LKML Hello Linus, Please consider pulling from git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal fixes to receive Thermal-SoC Management fixes for v5.0-rc6 with top-most bf78f133cd39e0ed41551150909e41513958a738: thermal: cpu_cooling: Clarify error message (2019-02-05 15:50:13 -0800) on top of commit 8834f5600cf3c8db365e18a3d5cac2c2780c81e5: Linux 5.0-rc5 (2019-02-03 13:48:04 -0800) Specifics: - Minor fixes on of-thermal and cpu cooling. BR, Eduardo ---------------------------------------------------------------- Amit Kucheria (2): thermal: of-thermal: Print name of device node with error thermal: cpu_cooling: Clarify error message drivers/thermal/cpu_cooling.c | 2 +- drivers/thermal/of-thermal.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Thermal-SoC management fixes for v5.0-rc6 2019-02-10 4:17 [GIT PULL] Thermal-SoC management fixes for v5.0-rc6 Eduardo Valentin @ 2019-02-10 4:25 ` pr-tracker-bot 2019-02-11 3:19 ` Eduardo Valentin 0 siblings, 1 reply; 9+ messages in thread From: pr-tracker-bot @ 2019-02-10 4:25 UTC (permalink / raw) To: Eduardo Valentin Cc: Linus Torvalds, Rui Zhang, ACPI Devel Maling List, Linux PM, LKML The pull request you sent on Sat, 9 Feb 2019 20:17:23 -0800: > git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal fixes has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/7ad915f5ebf5b9e7ca98a7048d8f84a631fe388b Thank you! -- Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Thermal-SoC management fixes for v5.0-rc6 2019-02-10 4:25 ` pr-tracker-bot @ 2019-02-11 3:19 ` Eduardo Valentin 2019-02-11 18:34 ` Linus Torvalds 0 siblings, 1 reply; 9+ messages in thread From: Eduardo Valentin @ 2019-02-11 3:19 UTC (permalink / raw) To: pr-tracker-bot Cc: Linus Torvalds, Rui Zhang, ACPI Devel Maling List, Linux PM, LKML Hey, Thanks for the note, but.. On Sun, Feb 10, 2019 at 04:25:16AM +0000, pr-tracker-bot@kernel.org wrote: > The pull request you sent on Sat, 9 Feb 2019 20:17:23 -0800: > > > git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal fixes > > has been merged into torvalds/linux.git: > https://git.kernel.org/torvalds/c/7ad915f5ebf5b9e7ca98a7048d8f84a631fe388b I think the bot is off here because the above commit is about a merge from the linux-omap tree from Tony. 7ad915f5ebf5 ("Merge tag 'omap-for-v3.10-rc1/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes") not the above pull. In fact, this pull was not merged so far, as per the log of v5.0-rc6. I mean, this is a very late fixes pull anyways and I can always resend the pull, but I believe the bot got confused this time. > > Thank you! > > -- > Deet-doot-dot, I am a bot. > https://korg.wiki.kernel.org/userdoc/prtracker ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Thermal-SoC management fixes for v5.0-rc6 2019-02-11 3:19 ` Eduardo Valentin @ 2019-02-11 18:34 ` Linus Torvalds 2019-02-11 18:40 ` Konstantin Ryabitsev 2019-02-11 20:16 ` Konstantin Ryabitsev 0 siblings, 2 replies; 9+ messages in thread From: Linus Torvalds @ 2019-02-11 18:34 UTC (permalink / raw) To: Eduardo Valentin, Konstantin Ryabitsev Cc: pr-tracker-bot, Rui Zhang, ACPI Devel Maling List, Linux PM, LKML On Sun, Feb 10, 2019 at 7:19 PM Eduardo Valentin <edubezval@gmail.com> wrote: > > On Sun, Feb 10, 2019 at 04:25:16AM +0000, pr-tracker-bot@kernel.org wrote: > > The pull request you sent on Sat, 9 Feb 2019 20:17:23 -0800: > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal fixes > > > > has been merged into torvalds/linux.git: > > https://git.kernel.org/torvalds/c/7ad915f5ebf5b9e7ca98a7048d8f84a631fe388b > > I think the bot is off here because the above commit is about a merge > from the linux-omap tree from Tony. Indeed. .. and the pr-tracker-bot thing actually made me ignore the pull request, thinking I had left it in my inbox despite having pulled it. So it would be really good to know why pr-tracker-bot ended up replying to the wrong email, because it can cause real problems. Linus ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Thermal-SoC management fixes for v5.0-rc6 2019-02-11 18:34 ` Linus Torvalds @ 2019-02-11 18:40 ` Konstantin Ryabitsev 2019-02-11 20:05 ` Konstantin Ryabitsev 2019-02-11 20:16 ` Konstantin Ryabitsev 1 sibling, 1 reply; 9+ messages in thread From: Konstantin Ryabitsev @ 2019-02-11 18:40 UTC (permalink / raw) To: Linus Torvalds Cc: Eduardo Valentin, pr-tracker-bot, Rui Zhang, ACPI Devel Maling List, Linux PM, LKML [-- Attachment #1: Type: text/plain, Size: 1146 bytes --] On Mon, Feb 11, 2019 at 10:34:09AM -0800, Linus Torvalds wrote: >On Sun, Feb 10, 2019 at 7:19 PM Eduardo Valentin <edubezval@gmail.com> wrote: >> >> On Sun, Feb 10, 2019 at 04:25:16AM +0000, pr-tracker-bot@kernel.org wrote: >> > The pull request you sent on Sat, 9 Feb 2019 20:17:23 -0800: >> > >> > > git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal fixes >> > >> > has been merged into torvalds/linux.git: >> > https://git.kernel.org/torvalds/c/7ad915f5ebf5b9e7ca98a7048d8f84a631fe388b >> >> I think the bot is off here because the above commit is about a merge >> from the linux-omap tree from Tony. > >Indeed. > >.. and the pr-tracker-bot thing actually made me ignore the pull >request, thinking I had left it in my inbox despite having pulled it. > >So it would be really good to know why pr-tracker-bot ended up >replying to the wrong email, because it can cause real problems. Simply put, it's because "it's a pull request sent to Linus." We currently don't disambiguate between Linus showing up in "To" or in "Cc" -- is that an important differentiation that should be enforced? -K [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Thermal-SoC management fixes for v5.0-rc6 2019-02-11 18:40 ` Konstantin Ryabitsev @ 2019-02-11 20:05 ` Konstantin Ryabitsev 0 siblings, 0 replies; 9+ messages in thread From: Konstantin Ryabitsev @ 2019-02-11 20:05 UTC (permalink / raw) To: Linus Torvalds Cc: Eduardo Valentin, pr-tracker-bot, Rui Zhang, ACPI Devel Maling List, Linux PM, LKML On Mon, 11 Feb 2019 at 13:40, Konstantin Ryabitsev <konstantin@linuxfoundation.org> wrote: > >> On Sun, Feb 10, 2019 at 04:25:16AM +0000, pr-tracker-bot@kernel.org wrote: > >> > The pull request you sent on Sat, 9 Feb 2019 20:17:23 -0800: > >> > > >> > > git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal fixes > >> > > >> > has been merged into torvalds/linux.git: > >> > https://git.kernel.org/torvalds/c/7ad915f5ebf5b9e7ca98a7048d8f84a631fe388b > >> > >> I think the bot is off here because the above commit is about a merge > >> from the linux-omap tree from Tony. > > > >Indeed. > > > >.. and the pr-tracker-bot thing actually made me ignore the pull > >request, thinking I had left it in my inbox despite having pulled it. > > > >So it would be really good to know why pr-tracker-bot ended up > >replying to the wrong email, because it can cause real problems. > > Simply put, it's because "it's a pull request sent to Linus." We > currently don't disambiguate between Linus showing up in "To" or in "Cc" > -- is that an important differentiation that should be enforced? Linus: Sorry, I totally misunderstood what you were saying -- I blame the jet lag. I'll check out what's going on. -K ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Thermal-SoC management fixes for v5.0-rc6 2019-02-11 18:34 ` Linus Torvalds 2019-02-11 18:40 ` Konstantin Ryabitsev @ 2019-02-11 20:16 ` Konstantin Ryabitsev 2019-02-11 22:04 ` Linus Torvalds 1 sibling, 1 reply; 9+ messages in thread From: Konstantin Ryabitsev @ 2019-02-11 20:16 UTC (permalink / raw) To: Linus Torvalds Cc: Eduardo Valentin, pr-tracker-bot, Rui Zhang, ACPI Devel Maling List, Linux PM, LKML On Mon, Feb 11, 2019 at 10:34:09AM -0800, Linus Torvalds wrote: >> > > git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal >> > > fixes >> > >> > has been merged into torvalds/linux.git: >> > https://git.kernel.org/torvalds/c/7ad915f5ebf5b9e7ca98a7048d8f84a631fe388b >> >> I think the bot is off here because the above commit is about a merge >> from the linux-omap tree from Tony. > >Indeed. > >.. and the pr-tracker-bot thing actually made me ignore the pull >request, thinking I had left it in my inbox despite having pulled it. > >So it would be really good to know why pr-tracker-bot ended up >replying to the wrong email, because it can cause real problems. Okay, so I need guidance on the proper behaviour here. As this request didn't use the magic wording for the commit-id (as generated by git-request-pull), we ended up trying to look up the remote. The remote specified was: git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal fixes Since it's a short refname, we first try to look it up as a tag: $ git ls-remote git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal fixes^{} a6d25f4c951b8b28f2eaec6f891ff834622532f2 refs/tags/omap-for-v3.10-rc1/fixes^{} 77319669af37a1cfc844b801e83343b37e3c7e13 refs/tags/omap/fixes^{} If it finds a matching tag, the script assumes you'd meant to specify the tag, not the head. Is that the opposite of git's behaviour when applying a remote? Should we be checking for a head first, before we try the refname as a tag? I assume that's the case, but want to double-check with you all. -K ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Thermal-SoC management fixes for v5.0-rc6 2019-02-11 20:16 ` Konstantin Ryabitsev @ 2019-02-11 22:04 ` Linus Torvalds 2019-02-11 23:10 ` Konstantin Ryabitsev 0 siblings, 1 reply; 9+ messages in thread From: Linus Torvalds @ 2019-02-11 22:04 UTC (permalink / raw) To: Linus Torvalds, Eduardo Valentin, pr-tracker-bot, Rui Zhang, ACPI Devel Maling List, Linux PM, LKML On Mon, Feb 11, 2019 at 12:16 PM Konstantin Ryabitsev <konstantin@linuxfoundation.org> wrote: > > Okay, so I need guidance on the proper behaviour here. As this request > didn't use the magic wording for the commit-id (as generated by > git-request-pull), we ended up trying to look up the remote. The remote > specified was: > > git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal fixes > > Since it's a short refname, we first try to look it up as a tag: No, you don't do even that. The name is "fixes". But you seem to match it with one of these: > $ git ls-remote git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal fixes^{} > a6d25f4c951b8b28f2eaec6f891ff834622532f2 refs/tags/omap-for-v3.10-rc1/fixes^{} > 77319669af37a1cfc844b801e83343b37e3c7e13 refs/tags/omap/fixes^{} *NEITHER* of which is a tag named "fixes". One is named "omap-for-v3.10-rc1/fixes" and the other is a tag named "omap/fixes". Notice? What git will do is (a) Never *ever* match against a partial name. git matches against this list of patterns: "%.*s", "refs/%.*s", "refs/tags/%.*s", "refs/heads/%.*s", "refs/remotes/%.*s", "refs/remotes/%.*s/HEAD", so "fixes" can match "refs/heads/fixes" and "refs/tags/fixes" (or a *remote* called "fixes"), but it can never match against "refs/tags/omap/fixes". (b) If you have an actual ambiguous name, git will indeed pick the first from that list (so tags before branches, but also HEAD before a tag called HEAD), but it will generally also warn: warning: refname 'xyz' is ambiguous. So using "ls-remote" the way you are actually gives *way* more matches than it should. The ls-remote pattern is really just a grep pattern, not an actual ref lookup. So if you want to look up tag 'x', you really need to match on 'refs/tags/x' exactly. But that does explain why you thought it matched. Anyway, the _real_ merge for that pull request has now happened, and is commit aa0c38cf39de. Linus ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Thermal-SoC management fixes for v5.0-rc6 2019-02-11 22:04 ` Linus Torvalds @ 2019-02-11 23:10 ` Konstantin Ryabitsev 0 siblings, 0 replies; 9+ messages in thread From: Konstantin Ryabitsev @ 2019-02-11 23:10 UTC (permalink / raw) To: Linus Torvalds Cc: Eduardo Valentin, pr-tracker-bot, Rui Zhang, ACPI Devel Maling List, Linux PM, LKML On Mon, Feb 11, 2019 at 02:04:08PM -0800, Linus Torvalds wrote: >> Okay, so I need guidance on the proper behaviour here. As this >> request >> didn't use the magic wording for the commit-id (as generated by >> git-request-pull), we ended up trying to look up the remote. The remote >> specified was: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal fixes >> >> Since it's a short refname, we first try to look it up as a tag: > >No, you don't do even that. > >The name is "fixes". But you seem to match it with one of these: > >> $ git ls-remote git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal fixes^{} >> a6d25f4c951b8b28f2eaec6f891ff834622532f2 refs/tags/omap-for-v3.10-rc1/fixes^{} >> 77319669af37a1cfc844b801e83343b37e3c7e13 refs/tags/omap/fixes^{} > >*NEITHER* of which is a tag named "fixes". One is named >"omap-for-v3.10-rc1/fixes" and the other is a tag named "omap/fixes". Linus: Thank you for the feedback. I've implemented a fix that handles shortname refs more properly in order to avoid hitting this problem again. Regards, -K ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-02-11 23:10 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-02-10 4:17 [GIT PULL] Thermal-SoC management fixes for v5.0-rc6 Eduardo Valentin 2019-02-10 4:25 ` pr-tracker-bot 2019-02-11 3:19 ` Eduardo Valentin 2019-02-11 18:34 ` Linus Torvalds 2019-02-11 18:40 ` Konstantin Ryabitsev 2019-02-11 20:05 ` Konstantin Ryabitsev 2019-02-11 20:16 ` Konstantin Ryabitsev 2019-02-11 22:04 ` Linus Torvalds 2019-02-11 23:10 ` Konstantin Ryabitsev
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).