Public bug reported: 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 ** Affects: linux (Ubuntu) Importance: Undecided Status: Invalid ** Affects: linux-kvm (Ubuntu) Importance: Undecided Status: New ** Affects: linux (Ubuntu Lunar) Importance: Undecided Assignee: Roxana Nicolescu (roxanan) Status: In Progress ** Affects: linux-kvm (Ubuntu Lunar) Importance: Undecided Assignee: Roxana Nicolescu (roxanan) Status: In Progress ** Tags: sru-20231002 ** Also affects: linux-kvm (Ubuntu) Importance: Undecided Status: New ** Also affects: linux (Ubuntu Lunar) Importance: Undecided Status: New ** Also affects: linux-kvm (Ubuntu Lunar) Importance: Undecided Status: New ** Changed in: linux (Ubuntu) Status: New => Invalid ** Changed in: linux-kvm (Ubuntu Lunar) Status: New => Invalid ** Changed in: linux (Ubuntu Lunar) Status: New => In Progress ** Changed in: linux-kvm (Ubuntu Lunar) Status: Invalid => In Progress ** Changed in: linux (Ubuntu Lunar) Assignee: (unassigned) => Roxana Nicolescu (roxanan) ** Changed in: linux-kvm (Ubuntu Lunar) Assignee: (unassigned) => Roxana Nicolescu (roxanan) ** Tags added: sru-20231002 ** Description changed: SRU Justification: [Impact] - * Commit 88da4e8113110d5f4ebdd2f8cd0899e300cd1954 "pwm: Add a stub for devm_pwmchip_add()" was applied the second time during the latest upstream patchset (#LP: 2037005). `git am` did not detect 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 kvm, has CONFIG_PWM=y. - The problem was caught when lunar:linux-kvm was cranked and build failed for the current 2023.10.02 cycle + * 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 + * Revert the commit. [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 + * 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 ** Description changed: 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) - | ^~~~~~~~~~~~~~~~ + 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) - | ^~~~~~~~~~~~~~~~ - + 481 | static inline int devm_pwmchip_add(struct device *dev, struct pwm_chip *chip) + | ^~~~~~~~~~~~~~~~ + ``` [Fix] - * Revert the commit. + * 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 -- You received this bug notification because you are a member of Kernel Packages, which is subscribed to linux in Ubuntu. https://bugs.launchpad.net/bugs/2039542 Title: Remove duplication of devm_pwmchip_add function definition Status in linux package in Ubuntu: Invalid Status in linux-kvm package in Ubuntu: New Status in linux source package in Lunar: In Progress Status in linux-kvm source package in Lunar: In Progress Bug description: 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 To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2039542/+subscriptions -- Mailing list: https://launchpad.net/~kernel-packages Post to : kernel-packages@lists.launchpad.net Unsubscribe : https://launchpad.net/~kernel-packages More help : https://help.launchpad.net/ListHelp