From: "Rafael J. Wysocki" <email@example.com> To: Bjorn Helgaas <firstname.lastname@example.org> Cc: "Rafael J. Wysocki" <email@example.com>, LKML <firstname.lastname@example.org>, Linux PCI <email@example.com>, Linux PM <firstname.lastname@example.org>, Mika Westerberg <email@example.com> Subject: Re: [PATCH 0/5] PCI: PM: Cleanups related to power state changes Date: Tue, 5 Nov 2019 23:48:47 +0100 [thread overview] Message-ID: <CAJZ5v0hdHsP-sWB4ZAXOqwq7cwduZi2yanxPBoZm75G7gcWkdQ@mail.gmail.com> (raw) In-Reply-To: <20191105223521.GA42216@google.com> On Tue, Nov 5, 2019 at 11:35 PM Bjorn Helgaas <firstname.lastname@example.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.
next prev parent reply other threads:[~2019-11-05 22:49 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-05 10:11 Rafael J. Wysocki 2019-11-05 10:13 ` [PATCH 1/5] PCI: PM: Move power state update away from pci_power_up() Rafael J. Wysocki 2019-11-05 10:27 ` [PATCH 2/5] PCI: PM: Use pci_power_up() in pci_set_power_state() Rafael J. Wysocki 2019-11-05 10:29 ` [PATCH 3/5] PCI: PM: Fold __pci_start_power_transition() into its caller Rafael J. Wysocki 2019-11-05 10:30 ` [PATCH 4/5] PCI: PM: Avoid exporting __pci_complete_power_transition() Rafael J. Wysocki 2019-11-05 10:32 ` [PATCH 5/5] PCI: PM: Fold __pci_complete_power_transition() into its caller Rafael J. Wysocki 2019-11-05 16:09 ` Christoph Hellwig 2019-11-05 16:15 ` Rafael J. Wysocki 2019-11-05 11:28 ` [PATCH 0/5] PCI: PM: Cleanups related to power state changes Rafael J. Wysocki 2019-11-05 22:35 ` Bjorn Helgaas 2019-11-05 22:48 ` Rafael J. Wysocki [this message] 2019-11-05 13:02 ` Mika Westerberg 2019-11-05 16:32 ` [PATCH update 5/5] PCI: PM: Fold __pci_complete_power_transition() into its caller Rafael J. Wysocki 2019-11-06 19:02 ` [PATCH 0/5] PCI: PM: Cleanups related to power state changes Bjorn Helgaas 2019-11-07 13:33 ` Rafael J. Wysocki 2019-11-08 11:49 ` Rafael J. Wysocki 2019-11-08 20:13 ` Bjorn Helgaas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAJZ5v0hdHsP-sWB4ZAXOqwq7cwduZi2yanxPBoZm75G7gcWkdQ@mail.gmail.com \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: [PATCH 0/5] PCI: PM: Cleanups related to power state changes' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
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).