* [GIT PULL] pwm: Changes for v5.12-rc1
@ 2021-02-25 19:34 Thierry Reding
2021-02-25 20:28 ` Linus Torvalds
2021-02-25 20:29 ` pr-tracker-bot
0 siblings, 2 replies; 3+ messages in thread
From: Thierry Reding @ 2021-02-25 19:34 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Uwe Kleine-König, Lee Jones, linux-pwm, linux-kernel
Hi Linus,
The following changes since commit 6eefb79d6f5bc4086bd02c76f1072dd4a8d9d9f6:
pwm: sun4i: Remove erroneous else branch (2020-12-17 14:23:49 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git tags/pwm/for-5.12-rc1
for you to fetch changes up to 9a9dd7e473517b68412fd2da3da8a4aeb4ecb38a:
pwm: lpc18xx-sct: remove unneeded semicolon (2021-02-22 15:20:43 +0100)
As I was generating the pull request I noticed that I forgot to fast-
forward this to v5.11-rc1 after the last merge window. However, I did
not think a last-minute rebase was appropriate. I did go back and ran
my test builds on a rebase on top of v5.11-rc1 and everything checked
out, so I think this is safe to merge. Also, linux-next would have
caught any problems related to this. I'll make sure to properly roll
forward the branch next time.
Thanks,
Thierry
----------------------------------------------------------------
pwm: Changes for v5.12-rc1
The ZTE ZX platform is being removed, so the PWM driver is no longer
needed and removed as well. Other than that this contains a small set of
fixes and cleanups across a couple of drivers.
----------------------------------------------------------------
Arnd Bergmann (1):
pwm: Remove ZTE ZX driver
Jeff LaBundy (1):
pwm: iqs620a: Correct a stale state variable
Simon South (5):
pwm: rockchip: Enable APB clock during register access while probing
pwm: rockchip: rockchip_pwm_probe(): Remove superfluous clk_unprepare()
pwm: rockchip: Replace "bus clk" with "PWM clk"
pwm: rockchip: Eliminate potential race condition when probing
pwm: rockchip: Enable clock before calling clk_get_rate()
Uwe Kleine-König (1):
pwm: iqs620a: Fix overflow and optimize calculations
Yang Li (1):
pwm: lpc18xx-sct: remove unneeded semicolon
Documentation/devicetree/bindings/pwm/pwm-zx.txt | 22 --
drivers/pwm/Kconfig | 10 -
drivers/pwm/Makefile | 1 -
drivers/pwm/pwm-iqs620a.c | 94 ++++----
drivers/pwm/pwm-lpc18xx-sct.c | 2 +-
drivers/pwm/pwm-rockchip.c | 32 ++-
drivers/pwm/pwm-zx.c | 278 -----------------------
7 files changed, 65 insertions(+), 374 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-zx.txt
delete mode 100644 drivers/pwm/pwm-zx.c
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL] pwm: Changes for v5.12-rc1
2021-02-25 19:34 [GIT PULL] pwm: Changes for v5.12-rc1 Thierry Reding
@ 2021-02-25 20:28 ` Linus Torvalds
2021-02-25 20:29 ` pr-tracker-bot
1 sibling, 0 replies; 3+ messages in thread
From: Linus Torvalds @ 2021-02-25 20:28 UTC (permalink / raw)
To: Thierry Reding
Cc: Uwe Kleine-König, Lee Jones, linux-pwm, Linux Kernel Mailing List
On Thu, Feb 25, 2021 at 11:34 AM Thierry Reding
<thierry.reding@gmail.com> wrote:
>
> As I was generating the pull request I noticed that I forgot to fast-
> forward this to v5.11-rc1 after the last merge window.
Honestly, there is very little reason to ever do the fast-forward if
the new development doesn't depend on new features, and I have
absolutely no issues pulling something like this that is simply just a
continuation of a previous development tree.
So you did the right thing in not re-basing, this looks fine to me.
Obviously, every once in a while a development tree would want to
update to a newer base, just because of various infrastructure changes
that could otherwise cause semantic conflicts etc if you end up basing
stuff on something _truly_ ancient. But a release or two? No problem
at all.
Thanks,
Linus
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [GIT PULL] pwm: Changes for v5.12-rc1
2021-02-25 19:34 [GIT PULL] pwm: Changes for v5.12-rc1 Thierry Reding
2021-02-25 20:28 ` Linus Torvalds
@ 2021-02-25 20:29 ` pr-tracker-bot
1 sibling, 0 replies; 3+ messages in thread
From: pr-tracker-bot @ 2021-02-25 20:29 UTC (permalink / raw)
To: Thierry Reding
Cc: Linus Torvalds, Uwe Kleine-König, Lee Jones, linux-pwm,
linux-kernel
The pull request you sent on Thu, 25 Feb 2021 20:34:26 +0100:
> git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git tags/pwm/for-5.12-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/2c87f7a38f930ef6f6a7bdd04aeb82ce3971b54b
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-25 20:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-25 19:34 [GIT PULL] pwm: Changes for v5.12-rc1 Thierry Reding
2021-02-25 20:28 ` Linus Torvalds
2021-02-25 20:29 ` pr-tracker-bot
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).