Skip to content

Follow pwm_apply_might_sleep() rename in gpio-pwm and ir-rx51 #6223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

peat-psuwit
Copy link
Contributor

raspberrypi/linux#6018 introduces commit b23e6d7 ("pwm: Rename pwm_apply_state() to pwm_apply_might_sleep()"), but didn't rename these 2 modules which use the renamed function. Rename them to allow building them in NixOS which tries to build every module as a module.

@pelwell
Copy link
Contributor

pelwell commented Jun 17, 2024

I'll take the first of these commits, but a commit equivalent to your ir-rx51 patch is already present - see a10c3d5ff9a343c0b898215253750fedc38ac765.

Fixes: b23e6d7 ("pwm: Rename pwm_apply_state() to pwm_apply_might_sleep()")
Signed-off-by: Ratchanan Srirattanamet <[email protected]>
@peat-psuwit peat-psuwit force-pushed the rpi-6.6.y_-_pwm_apply_might_sleep branch from 2343105 to 58564a2 Compare June 17, 2024 19:01
@peat-psuwit
Copy link
Contributor Author

I see. The commit with the right content gets included as part of 6.6.33 merge. Sorry for not checking before creating the PR (the branch has been sitting for a while).

I've rebased the branch and removed the second commit.

@pelwell pelwell merged commit cd92a95 into raspberrypi:rpi-6.6.y Jun 18, 2024
11 of 12 checks passed
@pelwell
Copy link
Contributor

pelwell commented Jun 18, 2024

I fixed up the commit message - gpio-pwm is a downstream driver, which is why it wasn't included in the mass rename.

popcornmix added a commit to raspberrypi/firmware that referenced this pull request Jun 18, 2024
kernel: configs: Enable BLK_DEV_RBD
See: raspberrypi/linux#6226

kernel: Beefier command queue recovery
See: raspberrypi/linux#6221

kernel: ax25: Fix refcount imbalance on inbound connections
See: raspberrypi/linux#6213

kernel: Add SunFounder PiPower 3 dtoverlay
See: raspberrypi/linux#6227

kernel: Follow pwm_apply_might_sleep() rename in gpio-pwm and ir-rx51
See: raspberrypi/linux#6223
popcornmix added a commit to raspberrypi/rpi-firmware that referenced this pull request Jun 18, 2024
kernel: configs: Enable BLK_DEV_RBD
See: raspberrypi/linux#6226

kernel: Beefier command queue recovery
See: raspberrypi/linux#6221

kernel: ax25: Fix refcount imbalance on inbound connections
See: raspberrypi/linux#6213

kernel: Add SunFounder PiPower 3 dtoverlay
See: raspberrypi/linux#6227

kernel: Follow pwm_apply_might_sleep() rename in gpio-pwm and ir-rx51
See: raspberrypi/linux#6223
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants