[GIT PULL] pwm fixes for 6.7-rc5

[GIT PULL] pwm fixes for 6.7-rc5

[Uwe Kleine-König]

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

Hello Linus,

the following change since commit b85ea95d086471afb4ad062012a4d73cd328fa86:

  Linux 6.7-rc1 (2023-11-12 16:19:07 -0800)

is available in the Git repository at:

  https://git.pengutronix.de/git/ukl/linux tags/pwm/for-6.7-rc5-fixes

for you to fetch as commit 4e7a8dbd2bc0aec4605a5069df7a779bd9e64db1:

  pwm: bcm2835: Fix NPD in suspend/resume (2023-11-21 11:09:32 +0100)

Please pull this as a fix for the next -rc release.

Best regards
Uwe

----------------------------------------------------------------

pwm fixes for v6.7-rc5

This fixes a null pointer exception in the bcm2835 pwm driver. The
problem was introduced by a combination of two commits merged for
v6.7-rc1 where each change alone would have been fine.

Thanks to Florian Fainelli for noticing and fixing the issue.

----------------------------------------------------------------
Florian Fainelli (1):
      pwm: bcm2835: Fix NPD in suspend/resume

 drivers/pwm/pwm-bcm2835.c | 2 ++
 1 file changed, 2 insertions(+)

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

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

Re: [GIT PULL] pwm fixes for 6.7-rc5

[Thierry Reding]

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

On Fri, Dec 08, 2023 at 03:02:53PM +0100, Uwe Kleine-König wrote:
> Hello Linus,
> 
> the following change since commit b85ea95d086471afb4ad062012a4d73cd328fa86:
> 
>   Linux 6.7-rc1 (2023-11-12 16:19:07 -0800)
> 
> is available in the Git repository at:
> 
>   https://git.pengutronix.de/git/ukl/linux tags/pwm/for-6.7-rc5-fixes
> 
> for you to fetch as commit 4e7a8dbd2bc0aec4605a5069df7a779bd9e64db1:
> 
>   pwm: bcm2835: Fix NPD in suspend/resume (2023-11-21 11:09:32 +0100)
> 
> Please pull this as a fix for the next -rc release.
> 
> Best regards
> Uwe
> 
> ----------------------------------------------------------------
> 
> pwm fixes for v6.7-rc5
> 
> This fixes a null pointer exception in the bcm2835 pwm driver. The
> problem was introduced by a combination of two commits merged for
> v6.7-rc1 where each change alone would have been fine.
> 
> Thanks to Florian Fainelli for noticing and fixing the issue.
> 
> ----------------------------------------------------------------
> Florian Fainelli (1):
>       pwm: bcm2835: Fix NPD in suspend/resume
> 
>  drivers/pwm/pwm-bcm2835.c | 2 ++
>  1 file changed, 2 insertions(+)

Uwe,

I don't know why you didn't let me know about your plans to send this
out. We should've at least discussed this.

Thierry

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

Re: [GIT PULL] pwm fixes for 6.7-rc5

[Uwe Kleine-König]

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

Hello Thierry,

On Fri, Dec 08, 2023 at 04:15:33PM +0100, Thierry Reding wrote:
> On Fri, Dec 08, 2023 at 03:02:53PM +0100, Uwe Kleine-König wrote:
> > [...]
> > 
> > Please pull this as a fix for the next -rc release.
> 
> I don't know why you didn't let me know about your plans to send this
> out. We should've at least discussed this.

I tried to discuss that but didn't get any response. I pointed out in
two mails[1] that I think this should go in before 6.7 and I announced
this PR last week[2]. Also you usually ignore me on irc.

So I don't think "you didn't let me know" is a fair suggestion and I
honestly don't know what I should do better next time.

Given your reply might confuse Linus about what to do with my PR: Do you
agree this bcm2835-pwm fix should go in before 6.7?

Best regards
Uwe

[1] https://lore.kernel.org/linux-pwm/20231128205548.hfvknhimerqdunpx@pengutronix.de/
    https://lore.kernel.org/linux-pwm/20231121112029.gyv3gqirlycysyr4@pengutronix.de/
[2] https://lore.kernel.org/linux-pwm/20231130061353.65nfjd7uwbpiswv2@pengutronix.de/

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

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

Re: [GIT PULL] pwm fixes for 6.7-rc5

[pr-tracker-bot]

The pull request you sent on Fri, 8 Dec 2023 15:02:53 +0100:

> https://git.pengutronix.de/git/ukl/linux tags/pwm/for-6.7-rc5-fixes

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

Thank you!

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

Re: [GIT PULL] pwm fixes for 6.7-rc5

[Thierry Reding]

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

On Fri, Dec 08, 2023 at 07:15:03PM +0100, Uwe Kleine-König wrote:
> Hello Thierry,
> 
> On Fri, Dec 08, 2023 at 04:15:33PM +0100, Thierry Reding wrote:
> > On Fri, Dec 08, 2023 at 03:02:53PM +0100, Uwe Kleine-König wrote:
> > > [...]
> > > 
> > > Please pull this as a fix for the next -rc release.
> > 
> > I don't know why you didn't let me know about your plans to send this
> > out. We should've at least discussed this.
> 
> I tried to discuss that but didn't get any response. I pointed out in
> two mails[1] that I think this should go in before 6.7 and I announced
> this PR last week[2]. Also you usually ignore me on irc.

I'm no longer able to keep up with IRC, sorry. Email is the most
reliable way for me to communicate, although obviously that also doesn't
work all the time since I missed that last email from you where you
"announced" that you were going to send a PR.

> So I don't think "you didn't let me know" is a fair suggestion and I
> honestly don't know what I should do better next time.
> 
> Given your reply might confuse Linus about what to do with my PR: Do you
> agree this bcm2835-pwm fix should go in before 6.7?

Of course it should go into 6.7 and it would've gone in. I usually pick
patches up into linux-next first because that's what most people will
end up running and where they will first notice when it's been taken
care of. Then I will typically try to batch things up and will usually
wait until around -rc6 before sending this type of trivial fix to avoid
sending multiple PRs for simple one-line fixes like this.

Linus has already pulled this and that's fine. But we now also see this
patch duplicated in linux-next and it's all leading to extra work where
people need to report this and I have to rebase my tree just because we
didn't communicate properly.

Thierry

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

Re: [GIT PULL] pwm fixes for 6.7-rc5

[Uwe Kleine-König]

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

Hello Thierry,

On Mon, Dec 11, 2023 at 11:36:44AM +0100, Thierry Reding wrote:
> On Fri, Dec 08, 2023 at 07:15:03PM +0100, Uwe Kleine-König wrote:
> > On Fri, Dec 08, 2023 at 04:15:33PM +0100, Thierry Reding wrote:
> > > On Fri, Dec 08, 2023 at 03:02:53PM +0100, Uwe Kleine-König wrote:
> > > > [...]
> > > > 
> > > > Please pull this as a fix for the next -rc release.
> > > 
> > > I don't know why you didn't let me know about your plans to send this
> > > out. We should've at least discussed this.
> > 
> > I tried to discuss that but didn't get any response. I pointed out in
> > two mails[1] that I think this should go in before 6.7 and I announced
> > this PR last week[2]. Also you usually ignore me on irc.
> 
> I'm no longer able to keep up with IRC, sorry. Email is the most
> reliable way for me to communicate, although obviously that also doesn't
> work all the time since I missed that last email from you where you
> "announced" that you were going to send a PR.
> 
> > So I don't think "you didn't let me know" is a fair suggestion and I
> > honestly don't know what I should do better next time.
> > 
> > Given your reply might confuse Linus about what to do with my PR: Do you
> > agree this bcm2835-pwm fix should go in before 6.7?
> 
> Of course it should go into 6.7 and it would've gone in. I usually pick
> patches up into linux-next first because that's what most people will
> end up running and where they will first notice when it's been taken
> care of.

Getting a commit into Linus's tree makes it appear in next, too. Then
people who have sent a fix will notice that it's been taken care of in a
suitable manner.

> Then I will typically try to batch things up and will usually
> wait until around -rc6 before sending this type of trivial fix to avoid
> sending multiple PRs for simple one-line fixes like this.

In my book it's wrong to delay a fix of a null pointer dereference that
is known since one day after -rc1 until -rc6. And for me being trivial
is another reason to not delay it.

Also batching fixes for pwm seems a bit pointless to me. Looking at the
commits to drivers/pwm that were applied out of a merge window I
found:

 - v6.3-rc6~21^2~6..v6.3-rc6~21^2
   6 commits from a single series

 - v5.14-rc2~22^2~5..v5.14-rc2~22^2
   5 commits from a single series

 - v5.10-rc7~24
   a single commit

 - v5.4-rc7~18^2
   a single commit

 - v5.4-rc6~4^2
   a single commit

 - v5.3-rc4~28^2
   a single commit

 - Some SPDX changes around v5.2 that didn't go in via the pwm tree

 - v4.11-rc7~28^2~3..v4.11-rc7~28^2
   three independent commits. I wonder about the third one, looks like
   an accident that shouldn't have go in at that point

 - v4.9-rc8~16^2~2..v4.9-rc8~16^2
   two commits
   According to the date stamp of the older of the two, it was sent
   before 4.8-rc6, so that one should probably have go in before
   v4.9-rc1.

 - v4.7-rc4~16^2~3..v4.7-rc4~16^2
   three independent commits

 - v4.6-rc4~17^2
   a single commit

 - v4.1-rc5~25^2
   a single commit

 - v3.18-rc2~21^2~18..v3.18-rc2~21^2
   a late merge of the -rc1 PR

 - v3.15-rc2~16^2~7
   not merged via pwm

 - v3.14-rc5~18^2
   a single commit

 - v3.10-rc2~8^2~18
   a single commit

 - v3.6-rc3~4^2
   Several commits after the pwm framework was introduced in v3.6-rc1

So after the first release containing the pwm framework the pwm
subsystem doesn't seem to be prone to many fixes where batching saves
relevant overhead. I rather prefer to have fixes go in in a timely
manner in the earliest -rc possible such that they stand to profit from
the stabilisation period before a release. (What would -rc2 to -rc5 be
good for otherwise?)

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

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

Re: [GIT PULL] pwm fixes for 6.7-rc5

[Uwe Kleine-König]

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

Hello Thierry,

On Mon, Dec 11, 2023 at 05:07:30PM +0100, Uwe Kleine-König wrote:
> On Mon, Dec 11, 2023 at 11:36:44AM +0100, Thierry Reding wrote:
> > On Fri, Dec 08, 2023 at 07:15:03PM +0100, Uwe Kleine-König wrote:
> > > On Fri, Dec 08, 2023 at 04:15:33PM +0100, Thierry Reding wrote:
> > > > On Fri, Dec 08, 2023 at 03:02:53PM +0100, Uwe Kleine-König wrote:
> > > > > [...]
> > > > > 
> > > > > Please pull this as a fix for the next -rc release.
> > > > 
> > > > I don't know why you didn't let me know about your plans to send this
> > > > out. We should've at least discussed this.
> > > 
> > > I tried to discuss that but didn't get any response. I pointed out in
> > > two mails[1] that I think this should go in before 6.7 and I announced
> > > this PR last week[2]. Also you usually ignore me on irc.
> > 
> > I'm no longer able to keep up with IRC, sorry. Email is the most
> > reliable way for me to communicate, although obviously that also doesn't
> > work all the time since I missed that last email from you where you
> > "announced" that you were going to send a PR.

One point I forgot to mention: As you seem to have noticed the two
earlier mails about this fix: A simple "I'll care for that" in reply to
one of them would have been nice.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

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