| Message ID | 2771503.n70vfTtcVb@kreacher |
|---|---|
| Headers | show |
| Series | PCI: PM: Cleanups related to power state changes | expand |
On Tuesday, November 5, 2019 11:11:57 AM CET Rafael J. Wysocki wrote: > Hi, > > This series rearranges some PCI power management code to make it somewhat > easier to follow and explicitly consolidate the power-up (transitions to > D0) code path. > > It is not intended to change the functionality of the code. This series applies on top of 5.4-rc6 with your pci/pm-2 branch from today merged on top of it. I guess I can make it apply on top of pci/pm-2, but there were some PCI PM changes in 5.4-rc later than -rc1 in that area and they need to be taken into account anyway. Cheers!
On Tue, Nov 05, 2019 at 11:11:57AM +0100, Rafael J. Wysocki wrote: > Hi, > > This series rearranges some PCI power management code to make it somewhat > easier to follow and explicitly consolidate the power-up (transitions to > D0) code path. > > It is not intended to change the functionality of the code. The whole series looks good to me, Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
On Tue, Nov 05, 2019 at 12:28:47PM +0100, Rafael J. Wysocki wrote: > On Tuesday, November 5, 2019 11:11:57 AM CET Rafael J. Wysocki wrote: > > Hi, > > > > This series rearranges some PCI power management code to make it somewhat > > easier to follow and explicitly consolidate the power-up (transitions to > > D0) code path. > > > > It is not intended to change the functionality of the code. > > This series applies on top of 5.4-rc6 with your pci/pm-2 branch from today > merged on top of it. > > I guess I can make it apply on top of pci/pm-2, but there were some PCI PM > changes in 5.4-rc later than -rc1 in that area and they need to be taken > into account anyway. I applied the commits from pci/pm-2 to pci/pm (pci/pm-2 was really just to get the 0-day robot to build test it). pci/pm is based on v5.4-rc1, which doesn't have 45144d42f299 ("PCI: PM: Fix pci_power_up()"), which appeared in -rc4. All my branches are based on -rc1. I *could* rebase them all to -rc4, but that's quite a bit of work and affects Lorenzo as well, so I'd rather not. What's the git expert's way of doing this? I guess worst case I could rebase this series to apply on pci/pm (-rc1-based), accept that Linus will see a conflict, and resolve it during his merge. Bjorn
On Tue, Nov 5, 2019 at 11:35 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > On Tue, Nov 05, 2019 at 12:28:47PM +0100, Rafael J. Wysocki wrote: > > On Tuesday, November 5, 2019 11:11:57 AM CET Rafael J. Wysocki wrote: > > > Hi, > > > > > > This series rearranges some PCI power management code to make it somewhat > > > easier to follow and explicitly consolidate the power-up (transitions to > > > D0) code path. > > > > > > It is not intended to change the functionality of the code. > > > > This series applies on top of 5.4-rc6 with your pci/pm-2 branch from today > > merged on top of it. > > > > I guess I can make it apply on top of pci/pm-2, but there were some PCI PM > > changes in 5.4-rc later than -rc1 in that area and they need to be taken > > into account anyway. > > I applied the commits from pci/pm-2 to pci/pm (pci/pm-2 was really > just to get the 0-day robot to build test it). > > pci/pm is based on v5.4-rc1, which doesn't have 45144d42f299 ("PCI: > PM: Fix pci_power_up()"), which appeared in -rc4. > > All my branches are based on -rc1. I *could* rebase them all to -rc4, > but that's quite a bit of work and affects Lorenzo as well, so I'd > rather not. What's the git expert's way of doing this? It is not necessary to rebase. I would just merge the current pci/pm on top of v5.4-rc4 (or any later -rc), commit my patches on top of that and push the result as the new pci/pm. That should be a fast-forward update.
On Tue, Nov 05, 2019 at 11:11:57AM +0100, Rafael J. Wysocki wrote: > Hi, > > This series rearranges some PCI power management code to make it somewhat > easier to follow and explicitly consolidate the power-up (transitions to > D0) code path. > > It is not intended to change the functionality of the code. Applied with Mika's reviewed-by to pci/pm for v5.5, thanks! Thanks for the git tips, too!
On Wednesday, November 6, 2019 8:02:50 PM CET Bjorn Helgaas wrote: > On Tue, Nov 05, 2019 at 11:11:57AM +0100, Rafael J. Wysocki wrote: > > Hi, > > > > This series rearranges some PCI power management code to make it somewhat > > easier to follow and explicitly consolidate the power-up (transitions to > > D0) code path. > > > > It is not intended to change the functionality of the code. > > Applied with Mika's reviewed-by to pci/pm for v5.5, thanks! Thank you! > Thanks for the git tips, too! You're vwelcome. :-)
On Wednesday, November 6, 2019 8:02:50 PM CET Bjorn Helgaas wrote: > On Tue, Nov 05, 2019 at 11:11:57AM +0100, Rafael J. Wysocki wrote: > > Hi, > > > > This series rearranges some PCI power management code to make it somewhat > > easier to follow and explicitly consolidate the power-up (transitions to > > D0) code path. > > > > It is not intended to change the functionality of the code. > > Applied with Mika's reviewed-by to pci/pm for v5.5, thanks! Any chance to push this out, though? That would help with integration/testing a bit ...
On Fri, Nov 08, 2019 at 12:49:59PM +0100, Rafael J. Wysocki wrote: > On Wednesday, November 6, 2019 8:02:50 PM CET Bjorn Helgaas wrote: > > On Tue, Nov 05, 2019 at 11:11:57AM +0100, Rafael J. Wysocki wrote: > > > Hi, > > > > > > This series rearranges some PCI power management code to make it somewhat > > > easier to follow and explicitly consolidate the power-up (transitions to > > > D0) code path. > > > > > > It is not intended to change the functionality of the code. > > > > Applied with Mika's reviewed-by to pci/pm for v5.5, thanks! > > Any chance to push this out, though? That would help with integration/testing > a bit ... Done, thanks for the reminder.