| Message ID | 20181210103054.l467mhmxo7gbgbz6@vireshk-i7 (mailing list archive) |
|---|---|
| State | Mainlined |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | [GIT,PULL] OPP changes for 4.21-rc1 | expand |
Hi Viresh, On Mon, Dec 10, 2018 at 11:30 AM Viresh Kumar <viresh.kumar@linaro.org> wrote: > > Hi Rafael, > > I was a bit confused on how should I send this pull request as I haven't sent > any complex ones yet. > > My opp/linux-next branch contains 4.20-rc1 merged with two branches, opp/fixes > and opp/genpd/required-opps. All patches from opp/fixes have already made it to > Linus's tree. So should I still keep that branch (opp/fixes) merged in the > opp/linux-next branch (which I am requesting you to pull) ? You can keep them, but it would be good to make them not show up in the stats. To that end, I sometimes merge new material back on top of the already merged commits. > Dropping those may > result in merge conflicts (not in the current case though) as both are touching > same set of files. Of course, if there are dependencies, you need to keep the material that has been merged already as is. :-) > > -------------------------8<------------------------- > > The following changes since commit 3e27c79c4b121a64e85f26ab8957e5d0a09ff28e: > > OPP: Fix parsing of multiple phandles in "operating-points-v2" property (2018-11-23 10:47:21 +0530) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/linux-next > > for you to fetch changes up to e822eac560a89d04e26843b4908b0c2011c79de4: > > Merge branch 'opp/genpd/required-opps' into opp/linux-next (2018-11-23 10:50:18 +0530) > > ---------------------------------------------------------------- > Viresh Kumar (11): > PM / Domains: Rename genpd virtual devices as virt_dev > OPP: Identify and mark genpd OPP tables > OPP: Separate out custom OPP handler specific code > OPP: Populate required opp tables from "required-opps" property > OPP: Populate OPPs from "required-opps" property > PM / Domains: Add genpd_opp_to_performance_state() > OPP: Add dev_pm_opp_{set|put}_genpd_virt_dev() helper > OPP: Configure all required OPPs > OPP: Rename and relocate of_genpd_opp_to_performance_state() > OPP: Remove of_dev_pm_opp_find_required_opp() > Merge branch 'opp/genpd/required-opps' into opp/linux-next > > drivers/base/power/domain.c | 70 ++++------ > drivers/opp/core.c | 261 ++++++++++++++++++++++++++---------- > drivers/opp/of.c | 313 ++++++++++++++++++++++++++++++++++++++------ > drivers/opp/opp.h | 20 +++ > include/linux/pm_domain.h | 8 +- > include/linux/pm_opp.h | 16 ++- > 6 files changed, 526 insertions(+), 162 deletions(-) Pulled, but you could write a short summary of what's there in those commits. Thanks!
On 10-12-18, 12:15, Rafael J. Wysocki wrote: > Hi Viresh, > > On Mon, Dec 10, 2018 at 11:30 AM Viresh Kumar <viresh.kumar@linaro.org> wrote: > > > > Hi Rafael, > > > > I was a bit confused on how should I send this pull request as I haven't sent > > any complex ones yet. > > > > My opp/linux-next branch contains 4.20-rc1 merged with two branches, opp/fixes > > and opp/genpd/required-opps. All patches from opp/fixes have already made it to > > Linus's tree. So should I still keep that branch (opp/fixes) merged in the > > opp/linux-next branch (which I am requesting you to pull) ? > > You can keep them, but it would be good to make them not show up in > the stats. To that end, I sometimes merge new material back on top of > the already merged commits. > > > Dropping those may > > result in merge conflicts (not in the current case though) as both are touching > > same set of files. > > Of course, if there are dependencies, you need to keep the material > that has been merged already as is. :-) Okay, that's what I wanted to check. > Pulled, but you could write a short summary of what's there in those commits. Sorry about that, will keep that in mind next time. Thanks.
Hi Rafael, I was a bit confused on how should I send this pull request as I haven't sent any complex ones yet. My opp/linux-next branch contains 4.20-rc1 merged with two branches, opp/fixes and opp/genpd/required-opps. All patches from opp/fixes have already made it to Linus's tree. So should I still keep that branch (opp/fixes) merged in the opp/linux-next branch (which I am requesting you to pull) ? Dropping those may result in merge conflicts (not in the current case though) as both are touching same set of files. -- viresh -------------------------8<------------------------- The following changes since commit 3e27c79c4b121a64e85f26ab8957e5d0a09ff28e: OPP: Fix parsing of multiple phandles in "operating-points-v2" property (2018-11-23 10:47:21 +0530) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/linux-next for you to fetch changes up to e822eac560a89d04e26843b4908b0c2011c79de4: Merge branch 'opp/genpd/required-opps' into opp/linux-next (2018-11-23 10:50:18 +0530) ---------------------------------------------------------------- Viresh Kumar (11): PM / Domains: Rename genpd virtual devices as virt_dev OPP: Identify and mark genpd OPP tables OPP: Separate out custom OPP handler specific code OPP: Populate required opp tables from "required-opps" property OPP: Populate OPPs from "required-opps" property PM / Domains: Add genpd_opp_to_performance_state() OPP: Add dev_pm_opp_{set|put}_genpd_virt_dev() helper OPP: Configure all required OPPs OPP: Rename and relocate of_genpd_opp_to_performance_state() OPP: Remove of_dev_pm_opp_find_required_opp() Merge branch 'opp/genpd/required-opps' into opp/linux-next drivers/base/power/domain.c | 70 ++++------ drivers/opp/core.c | 261 ++++++++++++++++++++++++++---------- drivers/opp/of.c | 313 ++++++++++++++++++++++++++++++++++++++------ drivers/opp/opp.h | 20 +++ include/linux/pm_domain.h | 8 +- include/linux/pm_opp.h | 16 ++- 6 files changed, 526 insertions(+), 162 deletions(-)