| Message ID | 51E536C5.1020609@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 07/16/2013 02:04 PM, Daniel Lezcano wrote: > > Hi, > > The first PR was against the linux-pm-next tree including the patch: > > "cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq" > > This patch has been dropped in the meantime. > > Here is a new PR where my tree has been rebased against linux-pm-next > and adding the patch mentioned above. > > As stated by Rafael, I will handle the ARM specific patches from now. > > The following changes since commit 48f99d5a97d32d70c0738d6e314d9f4dbefd89bf: > > Merge branch 'pm-cpuidle-next' into linux-next (2013-07-16 02:41:06 +0200) > > are available in the git repository at: > > > git://git.linaro.org/people/dlezcano/linux.git cpuidle/arm-next > > for you to fetch changes up to 2b7e79f4a75e803184f483985a25cc751a990f06: > > ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle > (2013-07-16 13:57:24 +0200) ping ? > ---------------------------------------------------------------- > Daniel Lezcano (2): > ARM: davinci: cpuidle: Fix target residency > ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle > > Linus Walleij (2): > ARM: ux500: cpuidle: Instantiate the driver from platform device > ARM: ux500: cpuidle: Remove pointless include > > Sahara (1): > cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq > > arch/arm/mach-davinci/cpuidle.c | 2 +- > arch/arm/mach-ux500/Makefile | 1 - > drivers/cpuidle/Kconfig | 20 +++++--------- > drivers/cpuidle/Kconfig.arm | 29 > ++++++++++++++++++++ > drivers/cpuidle/Makefile | 9 ++++-- > .../cpuidle.c => drivers/cpuidle/cpuidle-ux500.c | 19 +++++++------ > drivers/mfd/db8500-prcmu.c | 4 +++ > 7 files changed, 58 insertions(+), 26 deletions(-) > create mode 100644 drivers/cpuidle/Kconfig.arm > rename arch/arm/mach-ux500/cpuidle.c => drivers/cpuidle/cpuidle-ux500.c > (90%) > >
On Friday, July 26, 2013 12:07:03 AM Daniel Lezcano wrote: > On 07/16/2013 02:04 PM, Daniel Lezcano wrote: > > > > Hi, > > > > The first PR was against the linux-pm-next tree including the patch: > > > > "cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq" > > > > This patch has been dropped in the meantime. > > > > Here is a new PR where my tree has been rebased against linux-pm-next > > and adding the patch mentioned above. > > > > As stated by Rafael, I will handle the ARM specific patches from now. > > > > The following changes since commit 48f99d5a97d32d70c0738d6e314d9f4dbefd89bf: > > > > Merge branch 'pm-cpuidle-next' into linux-next (2013-07-16 02:41:06 +0200) > > > > are available in the git repository at: > > > > > > git://git.linaro.org/people/dlezcano/linux.git cpuidle/arm-next > > > > for you to fetch changes up to 2b7e79f4a75e803184f483985a25cc751a990f06: > > > > ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle > > (2013-07-16 13:57:24 +0200) > > ping ? Sorry, something distracted me. I'll pull it later today unless there are any problems (in which case I'll let you know). Thanks, Rafael > > ---------------------------------------------------------------- > > Daniel Lezcano (2): > > ARM: davinci: cpuidle: Fix target residency > > ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle > > > > Linus Walleij (2): > > ARM: ux500: cpuidle: Instantiate the driver from platform device > > ARM: ux500: cpuidle: Remove pointless include > > > > Sahara (1): > > cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq > > > > arch/arm/mach-davinci/cpuidle.c | 2 +- > > arch/arm/mach-ux500/Makefile | 1 - > > drivers/cpuidle/Kconfig | 20 +++++--------- > > drivers/cpuidle/Kconfig.arm | 29 > > ++++++++++++++++++++ > > drivers/cpuidle/Makefile | 9 ++++-- > > .../cpuidle.c => drivers/cpuidle/cpuidle-ux500.c | 19 +++++++------ > > drivers/mfd/db8500-prcmu.c | 4 +++ > > 7 files changed, 58 insertions(+), 26 deletions(-) > > create mode 100644 drivers/cpuidle/Kconfig.arm > > rename arch/arm/mach-ux500/cpuidle.c => drivers/cpuidle/cpuidle-ux500.c > > (90%) > > > > > > >
On Friday, July 26, 2013 12:29:08 AM Rafael J. Wysocki wrote: > On Friday, July 26, 2013 12:07:03 AM Daniel Lezcano wrote: > > On 07/16/2013 02:04 PM, Daniel Lezcano wrote: > > > > > > Hi, > > > > > > The first PR was against the linux-pm-next tree including the patch: > > > > > > "cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq" > > > > > > This patch has been dropped in the meantime. > > > > > > Here is a new PR where my tree has been rebased against linux-pm-next > > > and adding the patch mentioned above. > > > > > > As stated by Rafael, I will handle the ARM specific patches from now. > > > > > > The following changes since commit 48f99d5a97d32d70c0738d6e314d9f4dbefd89bf: > > > > > > Merge branch 'pm-cpuidle-next' into linux-next (2013-07-16 02:41:06 +0200) > > > > > > are available in the git repository at: > > > > > > > > > git://git.linaro.org/people/dlezcano/linux.git cpuidle/arm-next > > > > > > for you to fetch changes up to 2b7e79f4a75e803184f483985a25cc751a990f06: > > > > > > ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle > > > (2013-07-16 13:57:24 +0200) > > > > ping ? > > Sorry, something distracted me. I'll pull it later today unless there are any > problems (in which case I'll let you know). Well, there are some. It is based on my linux-next branch, but please rebase it on top of 3.11-rc2. Generally, please send me pull requests based on -rc kernels only (or major releases). Thanks, Rafael
On Friday, July 26, 2013 12:41:09 AM Rafael J. Wysocki wrote: > On Friday, July 26, 2013 12:29:08 AM Rafael J. Wysocki wrote: > > On Friday, July 26, 2013 12:07:03 AM Daniel Lezcano wrote: > > > On 07/16/2013 02:04 PM, Daniel Lezcano wrote: > > > > > > > > Hi, > > > > > > > > The first PR was against the linux-pm-next tree including the patch: > > > > > > > > "cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq" > > > > > > > > This patch has been dropped in the meantime. > > > > > > > > Here is a new PR where my tree has been rebased against linux-pm-next > > > > and adding the patch mentioned above. > > > > > > > > As stated by Rafael, I will handle the ARM specific patches from now. > > > > > > > > The following changes since commit 48f99d5a97d32d70c0738d6e314d9f4dbefd89bf: > > > > > > > > Merge branch 'pm-cpuidle-next' into linux-next (2013-07-16 02:41:06 +0200) > > > > > > > > are available in the git repository at: > > > > > > > > > > > > git://git.linaro.org/people/dlezcano/linux.git cpuidle/arm-next > > > > > > > > for you to fetch changes up to 2b7e79f4a75e803184f483985a25cc751a990f06: > > > > > > > > ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle > > > > (2013-07-16 13:57:24 +0200) > > > > > > ping ? > > > > Sorry, something distracted me. I'll pull it later today unless there are any > > problems (in which case I'll let you know). > > Well, there are some. > > It is based on my linux-next branch, but please rebase it on top of 3.11-rc2. > > Generally, please send me pull requests based on -rc kernels only (or major > releases). Unless your material depends on new things in my linux-next branch, in which case please let me know and I'll set up a stable branch for you to base things on. Thanks, Rafael
On 07/26/2013 02:07 AM, Rafael J. Wysocki wrote: > On Friday, July 26, 2013 12:41:09 AM Rafael J. Wysocki wrote: >> On Friday, July 26, 2013 12:29:08 AM Rafael J. Wysocki wrote: >>> On Friday, July 26, 2013 12:07:03 AM Daniel Lezcano wrote: >>>> On 07/16/2013 02:04 PM, Daniel Lezcano wrote: >>>>> >>>>> Hi, >>>>> >>>>> The first PR was against the linux-pm-next tree including the patch: >>>>> >>>>> "cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq" >>>>> >>>>> This patch has been dropped in the meantime. >>>>> >>>>> Here is a new PR where my tree has been rebased against linux-pm-next >>>>> and adding the patch mentioned above. >>>>> >>>>> As stated by Rafael, I will handle the ARM specific patches from now. >>>>> >>>>> The following changes since commit 48f99d5a97d32d70c0738d6e314d9f4dbefd89bf: >>>>> >>>>> Merge branch 'pm-cpuidle-next' into linux-next (2013-07-16 02:41:06 +0200) >>>>> >>>>> are available in the git repository at: >>>>> >>>>> >>>>> git://git.linaro.org/people/dlezcano/linux.git cpuidle/arm-next >>>>> >>>>> for you to fetch changes up to 2b7e79f4a75e803184f483985a25cc751a990f06: >>>>> >>>>> ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle >>>>> (2013-07-16 13:57:24 +0200) >>>> >>>> ping ? >>> >>> Sorry, something distracted me. I'll pull it later today unless there are any >>> problems (in which case I'll let you know). >> >> Well, there are some. >> >> It is based on my linux-next branch, but please rebase it on top of 3.11-rc2. >> >> Generally, please send me pull requests based on -rc kernels only (or major >> releases). > > Unless your material depends on new things in my linux-next branch, in which > case please let me know and I'll set up a stable branch for you to base things > on. Hi Rafael, I rebased my branch on top of 3.11-rc2, you can try to pull it again. I thought it would have been easier for us if I could based my PRs on top of your linux-next branch, so acting as a proxy for ARM patches. I am maintaining the clocksource drivers and I am basing my tree on top of tip/core. I guess you are rebasing your tree often and this is an issue for you, right ? Thanks -- Daniel
On Saturday, July 27, 2013 08:13:31 AM Daniel Lezcano wrote: > On 07/26/2013 02:07 AM, Rafael J. Wysocki wrote: > > On Friday, July 26, 2013 12:41:09 AM Rafael J. Wysocki wrote: > >> On Friday, July 26, 2013 12:29:08 AM Rafael J. Wysocki wrote: > >>> On Friday, July 26, 2013 12:07:03 AM Daniel Lezcano wrote: > >>>> On 07/16/2013 02:04 PM, Daniel Lezcano wrote: > >>>>> > >>>>> Hi, > >>>>> > >>>>> The first PR was against the linux-pm-next tree including the patch: > >>>>> > >>>>> "cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq" > >>>>> > >>>>> This patch has been dropped in the meantime. > >>>>> > >>>>> Here is a new PR where my tree has been rebased against linux-pm-next > >>>>> and adding the patch mentioned above. > >>>>> > >>>>> As stated by Rafael, I will handle the ARM specific patches from now. > >>>>> > >>>>> The following changes since commit 48f99d5a97d32d70c0738d6e314d9f4dbefd89bf: > >>>>> > >>>>> Merge branch 'pm-cpuidle-next' into linux-next (2013-07-16 02:41:06 +0200) > >>>>> > >>>>> are available in the git repository at: > >>>>> > >>>>> > >>>>> git://git.linaro.org/people/dlezcano/linux.git cpuidle/arm-next > >>>>> > >>>>> for you to fetch changes up to 2b7e79f4a75e803184f483985a25cc751a990f06: > >>>>> > >>>>> ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle > >>>>> (2013-07-16 13:57:24 +0200) > >>>> > >>>> ping ? > >>> > >>> Sorry, something distracted me. I'll pull it later today unless there are any > >>> problems (in which case I'll let you know). > >> > >> Well, there are some. > >> > >> It is based on my linux-next branch, but please rebase it on top of 3.11-rc2. > >> > >> Generally, please send me pull requests based on -rc kernels only (or major > >> releases). > > > > Unless your material depends on new things in my linux-next branch, in which > > case please let me know and I'll set up a stable branch for you to base things > > on. > > Hi Rafael, > > I rebased my branch on top of 3.11-rc2, you can try to pull it again. Pulled, thanks! Next time, can you please add a general description of what the patches do and why they do that to the pull request? > I thought it would have been easier for us if I could based my PRs on > top of your linux-next branch, so acting as a proxy for ARM patches. I > am maintaining the clocksource drivers and I am basing my tree on top of > tip/core. > > I guess you are rebasing your tree often and this is an issue for you, > right ? Yes, my linux-next branch may contain commits that will be modified later (e.g. ACKs added, fixes folded in etc.). Anyway, as I said, as long as the material you have for me doesn't depend on anything new in my tree, it's better to base it on top of an -rc kernel. In case it does depend on that, I've put the entire outstanding cpuidle material into my pm-cpuidle branch (including your ARM commits just pulled). Thanks, Rafael
On 07/27/2013 02:37 PM, Rafael J. Wysocki wrote: > On Saturday, July 27, 2013 08:13:31 AM Daniel Lezcano wrote: >> On 07/26/2013 02:07 AM, Rafael J. Wysocki wrote: >>> On Friday, July 26, 2013 12:41:09 AM Rafael J. Wysocki wrote: >>>> On Friday, July 26, 2013 12:29:08 AM Rafael J. Wysocki wrote: >>>>> On Friday, July 26, 2013 12:07:03 AM Daniel Lezcano wrote: >>>>>> On 07/16/2013 02:04 PM, Daniel Lezcano wrote: >>>>>>> >>>>>>> Hi, >>>>>>> >>>>>>> The first PR was against the linux-pm-next tree including the patch: >>>>>>> >>>>>>> "cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq" >>>>>>> >>>>>>> This patch has been dropped in the meantime. >>>>>>> >>>>>>> Here is a new PR where my tree has been rebased against linux-pm-next >>>>>>> and adding the patch mentioned above. >>>>>>> >>>>>>> As stated by Rafael, I will handle the ARM specific patches from now. >>>>>>> >>>>>>> The following changes since commit 48f99d5a97d32d70c0738d6e314d9f4dbefd89bf: >>>>>>> >>>>>>> Merge branch 'pm-cpuidle-next' into linux-next (2013-07-16 02:41:06 +0200) >>>>>>> >>>>>>> are available in the git repository at: >>>>>>> >>>>>>> >>>>>>> git://git.linaro.org/people/dlezcano/linux.git cpuidle/arm-next >>>>>>> >>>>>>> for you to fetch changes up to 2b7e79f4a75e803184f483985a25cc751a990f06: >>>>>>> >>>>>>> ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle >>>>>>> (2013-07-16 13:57:24 +0200) >>>>>> >>>>>> ping ? >>>>> >>>>> Sorry, something distracted me. I'll pull it later today unless there are any >>>>> problems (in which case I'll let you know). >>>> >>>> Well, there are some. >>>> >>>> It is based on my linux-next branch, but please rebase it on top of 3.11-rc2. >>>> >>>> Generally, please send me pull requests based on -rc kernels only (or major >>>> releases). >>> >>> Unless your material depends on new things in my linux-next branch, in which >>> case please let me know and I'll set up a stable branch for you to base things >>> on. >> >> Hi Rafael, >> >> I rebased my branch on top of 3.11-rc2, you can try to pull it again. > > Pulled, thanks! > > Next time, can you please add a general description of what the patches do and > why they do that to the pull request? Yes, sure. I will do. >> I thought it would have been easier for us if I could based my PRs on >> top of your linux-next branch, so acting as a proxy for ARM patches. I >> am maintaining the clocksource drivers and I am basing my tree on top of >> tip/core. >> >> I guess you are rebasing your tree often and this is an issue for you, >> right ? > > Yes, my linux-next branch may contain commits that will be modified later > (e.g. ACKs added, fixes folded in etc.). > > Anyway, as I said, as long as the material you have for me doesn't depend on > anything new in my tree, it's better to base it on top of an -rc kernel. > > In case it does depend on that, I've put the entire outstanding cpuidle > material into my pm-cpuidle branch (including your ARM commits just pulled). Ok, thanks. -- Daniel
On 07/27/2013 02:37 PM, Rafael J. Wysocki wrote: > On Saturday, July 27, 2013 08:13:31 AM Daniel Lezcano wrote: >> On 07/26/2013 02:07 AM, Rafael J. Wysocki wrote: >>> On Friday, July 26, 2013 12:41:09 AM Rafael J. Wysocki wrote: >>>> On Friday, July 26, 2013 12:29:08 AM Rafael J. Wysocki wrote: >>>>> On Friday, July 26, 2013 12:07:03 AM Daniel Lezcano wrote: >>>>>> On 07/16/2013 02:04 PM, Daniel Lezcano wrote: >>>>>>> [ ... ] > Next time, can you please add a general description of what the patches do and > why they do that to the pull request? > >> I thought it would have been easier for us if I could based my PRs on >> top of your linux-next branch, so acting as a proxy for ARM patches. I >> am maintaining the clocksource drivers and I am basing my tree on top of >> tip/core. >> >> I guess you are rebasing your tree often and this is an issue for you, >> right ? > > Yes, my linux-next branch may contain commits that will be modified later > (e.g. ACKs added, fixes folded in etc.). > > Anyway, as I said, as long as the material you have for me doesn't depend on > anything new in my tree, it's better to base it on top of an -rc kernel. > > In case it does depend on that, I've put the entire outstanding cpuidle > material into my pm-cpuidle branch (including your ARM commits just pulled). Hi Rafael, is it possible to update the pm-cpuidle branch ? so I can base my pull request on it. There will be a (trivial) conflict in the Makefile and Kconfig.arm if I base my PR on v3.12-rc5. Thanks -- Daniel
On Wednesday, October 16, 2013 06:35:24 PM Daniel Lezcano wrote: > On 07/27/2013 02:37 PM, Rafael J. Wysocki wrote: > > On Saturday, July 27, 2013 08:13:31 AM Daniel Lezcano wrote: > >> On 07/26/2013 02:07 AM, Rafael J. Wysocki wrote: > >>> On Friday, July 26, 2013 12:41:09 AM Rafael J. Wysocki wrote: > >>>> On Friday, July 26, 2013 12:29:08 AM Rafael J. Wysocki wrote: > >>>>> On Friday, July 26, 2013 12:07:03 AM Daniel Lezcano wrote: > >>>>>> On 07/16/2013 02:04 PM, Daniel Lezcano wrote: > >>>>>>> > > [ ... ] > > > Next time, can you please add a general description of what the patches do and > > why they do that to the pull request? > > > >> I thought it would have been easier for us if I could based my PRs on > >> top of your linux-next branch, so acting as a proxy for ARM patches. I > >> am maintaining the clocksource drivers and I am basing my tree on top of > >> tip/core. > >> > >> I guess you are rebasing your tree often and this is an issue for you, > >> right ? > > > > Yes, my linux-next branch may contain commits that will be modified later > > (e.g. ACKs added, fixes folded in etc.). > > > > Anyway, as I said, as long as the material you have for me doesn't depend on > > anything new in my tree, it's better to base it on top of an -rc kernel. > > > > In case it does depend on that, I've put the entire outstanding cpuidle > > material into my pm-cpuidle branch (including your ARM commits just pulled). > > Hi Rafael, > > is it possible to update the pm-cpuidle branch ? so I can base my pull > request on it. There will be a (trivial) conflict in the Makefile and > Kconfig.arm if I base my PR on v3.12-rc5. Updated, but you can base it on 3.12-rc5 if you need to. Thanks!
Hi, The first PR was against the linux-pm-next tree including the patch: "cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq" This patch has been dropped in the meantime. Here is a new PR where my tree has been rebased against linux-pm-next and adding the patch mentioned above. As stated by Rafael, I will handle the ARM specific patches from now. The following changes since commit 48f99d5a97d32d70c0738d6e314d9f4dbefd89bf: Merge branch 'pm-cpuidle-next' into linux-next (2013-07-16 02:41:06 +0200) are available in the git repository at: git://git.linaro.org/people/dlezcano/linux.git cpuidle/arm-next for you to fetch changes up to 2b7e79f4a75e803184f483985a25cc751a990f06: ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle (2013-07-16 13:57:24 +0200) ---------------------------------------------------------------- Daniel Lezcano (2): ARM: davinci: cpuidle: Fix target residency ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle Linus Walleij (2): ARM: ux500: cpuidle: Instantiate the driver from platform device ARM: ux500: cpuidle: Remove pointless include Sahara (1): cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq arch/arm/mach-davinci/cpuidle.c | 2 +- arch/arm/mach-ux500/Makefile | 1 - drivers/cpuidle/Kconfig | 20 +++++--------- drivers/cpuidle/Kconfig.arm | 29 ++++++++++++++++++++ drivers/cpuidle/Makefile | 9 ++++-- .../cpuidle.c => drivers/cpuidle/cpuidle-ux500.c | 19 +++++++------ drivers/mfd/db8500-prcmu.c | 4 +++ 7 files changed, 58 insertions(+), 26 deletions(-) create mode 100644 drivers/cpuidle/Kconfig.arm rename arch/arm/mach-ux500/cpuidle.c => drivers/cpuidle/cpuidle-ux500.c (90%)