[SRU][Lunar][linux, linux-kvm][PATCH 0/1] Remove duplication of devm_pwmchip_add function definition

Roxana Nicolescu roxana.nicolescu at canonical.com
Tue Oct 17 08:27:21 UTC 2023


BugLink: https://bugs.launchpad.net/bugs/2039542

SRU Justification:

[Impact]

* Upstream commit 88da4e8113110d5f4ebdd2f8cd0899e300cd1954 "pwm: Add a stub for devm_pwmchip_add()", was applied the second time during the latest upstream patchset (#LP: 2037005) for cycle 2023.10.02.
* `git am` did not detect that the changes were applied, leading to the same function definition being duplicated.
* This was not caught when the main kernel was built because this code is under CONFIG_PWM=n. The main kernel and pretty much every kernel apart from linux-kvm, has CONFIG_PWM=y.
* The problem was caught when lunar:linux-kvm was cranked and build failed with the following error:

In file included from /build/lunar/drivers/acpi/acpi_lpss.c:23:
/build/lunar/include/linux/pwm.h:486:19: error: redefinition of 'devm_pwmchip_add'
  486 | static inline int devm_pwmchip_add(struct device *dev, struct pwm_chip *chip)
      | ^~~~~~~~~~~~~~~~
/build/lunar/include/linux/pwm.h:481:19: note: previous definition of 'devm_pwmchip_add' with type 'int(struct device *, struct pwm_chip *)'
  481 | static inline int devm_pwmchip_add(struct device *dev, struct pwm_chip *chip)
      | ^~~~~~~~~~~~~~~~

[Fix]
* Revert the commit.
* Because this affects only linux:kvm, it is necessary to apply this fix for lunar:linux-kvm for cycle 2023.10.02, but the main kernel can wait for the next cycle.

[Test plan]
* Since linux-kvm was the only kernel that had this issue, I applied the patch to kvm after I rebased the latest changes from the parent and did a build test.
* I also did a build test for linux:main just to make sure

[Where problems could occur]
* This change is pretty non-invasive, so nowhere

Roxana Nicolescu (1):
  Revert "pwm: Add a stub for devm_pwmchip_add()"

 include/linux/pwm.h | 5 -----
 1 file changed, 5 deletions(-)

-- 
2.34.1




More information about the kernel-team mailing list