Re: [GIT PULL] Thermal management updates for v5.4-rc1

2019-09-30 Thread Jonathan Corbet
On Fri, 27 Sep 2019 15:29:47 -0400 Doug Ledford wrote: > If you are doing linux kernel development, and you are doing a rebase, > please read Documentation/When_Not_To_Rebase.rst before rebasing your > code and sending it to Linus. You've been warned. For anybody following along at home, the pr

Re: [GIT PULL] Thermal management updates for v5.4-rc1

2019-09-28 Thread Zhang Rui
Hi, Linus, I'm really sorry about this. I thought no code change could be a reason that a rebase can be accepted, but didn't realize this is exactly the case we should avoid it. I wish I could read Documentation/maintainer/rebasing-and- merging.rst earlier so that I didn't make this mistake. Sorr

Re: [GIT PULL] Thermal management updates for v5.4-rc1

2019-09-27 Thread Doug Ledford
On Fri, 2019-09-27 at 21:52 +0200, Richard Weinberger wrote: > On Fri, Sep 27, 2019 at 9:30 PM Doug Ledford > wrote: > > Because there are literally thousands of developers working on > > kernel > > bits here and there, and you're swatting this particular fly one > > developer at a time. > > I st

Re: [GIT PULL] Thermal management updates for v5.4-rc1

2019-09-27 Thread Doug Ledford
On Fri, 2019-09-27 at 12:41 -0700, Linus Torvalds wrote: > On Fri, Sep 27, 2019 at 12:29 PM Doug Ledford > wrote: > > Because there are literally thousands of developers working on > > kernel > > bits here and there, and you're swatting this particular fly one > > developer at a time. > > Well, a

Re: [GIT PULL] Thermal management updates for v5.4-rc1

2019-09-27 Thread Richard Weinberger
On Fri, Sep 27, 2019 at 9:30 PM Doug Ledford wrote: > Because there are literally thousands of developers working on kernel > bits here and there, and you're swatting this particular fly one > developer at a time. I strongly disagree. One of the golden rules of kernel development is, read what Li

Re: [GIT PULL] Thermal management updates for v5.4-rc1

2019-09-27 Thread Linus Torvalds
On Fri, Sep 27, 2019 at 12:29 PM Doug Ledford wrote: > > Because there are literally thousands of developers working on kernel > bits here and there, and you're swatting this particular fly one > developer at a time. Well, at least these days it's also very clearly spelled out in the Documentatio

Re: [GIT PULL] Thermal management updates for v5.4-rc1

2019-09-27 Thread Doug Ledford
On Fri, 2019-09-27 at 11:34 -0700, Linus Torvalds wrote: > On Fri, Sep 27, 2019 at 6:08 AM Zhang Rui wrote: > > One thing to mention is that, all the patches have been tested in > > linux-next for weeks, but there is a conflict detected, because > > upstream has took commit eaf7b46083a7e34 ("docs:

Re: [GIT PULL] Thermal management updates for v5.4-rc1

2019-09-27 Thread Linus Torvalds
On Fri, Sep 27, 2019 at 6:08 AM Zhang Rui wrote: > > One thing to mention is that, all the patches have been tested in > linux-next for weeks, but there is a conflict detected, because > upstream has took commit eaf7b46083a7e34 ("docs: thermal: add it to the > driver API") from jc-docs tree while