| Message ID | 1433533151-6301-1-git-send-email-dinh.linux@gmail.com |
|---|---|
| State | New |
| Headers | show |
On 06/10/2015 06:01 PM, Kevin Hilman wrote: > dinh.linux@gmail.com writes: > >> Hi Arnd, Kevin, Olof, >> >> This is an updated pull request for the supend-to-ram patch that has the >> EDAC code removed in order to avoid a merge conflict. >> >> Thanks, >> Dinh >> >> The following changes since commit c65b99f046843d2455aa231747b5a07a999a9f3d: >> >> Linux 4.1-rc6 (2015-05-31 19:01:07 -0700) > > Why v4.1-rc6? > > Are there specific dependencies there? If not, we prefer these pulls to > be on older -rc tags (typically nothing past where arm-soc/master is). No dependency, I just saw that arm-soc/for-next was at -rc6. I remember seeing an email that you should based to an early -rc, or the same -rc as the for-next branch? > > If there are no deps, could you respin this against -rc2/-rc3, or you > could also rebase on top of your previous socfpga_updates_for_v4.2 as > well (which itself is based on -rc2.) > Yes, I can do that as, I have an additional patch to be included. Thanks, Dinh
dinh.linux@gmail.com writes: > Hi Arnd, Kevin, Olof, > > This is an updated pull request for the supend-to-ram patch that has the > EDAC code removed in order to avoid a merge conflict. > > Thanks, > Dinh > > The following changes since commit c65b99f046843d2455aa231747b5a07a999a9f3d: > > Linux 4.1-rc6 (2015-05-31 19:01:07 -0700) Why v4.1-rc6? Are there specific dependencies there? If not, we prefer these pulls to be on older -rc tags (typically nothing past where arm-soc/master is). If there are no deps, could you respin this against -rc2/-rc3, or you could also rebase on top of your previous socfpga_updates_for_v4.2 as well (which itself is based on -rc2.) Kevin
On 06/10/2015 06:03 PM, Kevin Hilman wrote: > On Wed, Jun 10, 2015 at 4:01 PM, Kevin Hilman <khilman@kernel.org> wrote: >> dinh.linux@gmail.com writes: >> >>> Hi Arnd, Kevin, Olof, >>> >>> This is an updated pull request for the supend-to-ram patch that has the >>> EDAC code removed in order to avoid a merge conflict. >>> >>> Thanks, >>> Dinh >>> >>> The following changes since commit c65b99f046843d2455aa231747b5a07a999a9f3d: >>> >>> Linux 4.1-rc6 (2015-05-31 19:01:07 -0700) >> >> Why v4.1-rc6? >> >> Are there specific dependencies there? If not, we prefer these pulls to >> be on older -rc tags (typically nothing past where arm-soc/master is). >> >> If there are no deps, could you respin this against -rc2/-rc3, or you >> could also rebase on top of your previous socfpga_updates_for_v4.2 as >> well (which itself is based on -rc2.) > > Actually, no need to respin since this is just a single patch. I've > picked it from your branch and applied it to socfpga/soc and merged > into next/soc. But please keep in mind the above for future pull > reqs. Thanks. > Ok, will do. Thanks, Dinh
On Wed, Jun 10, 2015 at 4:01 PM, Kevin Hilman <khilman@kernel.org> wrote: > dinh.linux@gmail.com writes: > >> Hi Arnd, Kevin, Olof, >> >> This is an updated pull request for the supend-to-ram patch that has the >> EDAC code removed in order to avoid a merge conflict. >> >> Thanks, >> Dinh >> >> The following changes since commit c65b99f046843d2455aa231747b5a07a999a9f3d: >> >> Linux 4.1-rc6 (2015-05-31 19:01:07 -0700) > > Why v4.1-rc6? > > Are there specific dependencies there? If not, we prefer these pulls to > be on older -rc tags (typically nothing past where arm-soc/master is). > > If there are no deps, could you respin this against -rc2/-rc3, or you > could also rebase on top of your previous socfpga_updates_for_v4.2 as > well (which itself is based on -rc2.) Actually, no need to respin since this is just a single patch. I've picked it from your branch and applied it to socfpga/soc and merged into next/soc. But please keep in mind the above for future pull reqs. Thanks. Kevin
Dinh Nguyen <dinguyen@opensource.altera.com> writes: > On 06/10/2015 06:01 PM, Kevin Hilman wrote: >> dinh.linux@gmail.com writes: >> >>> Hi Arnd, Kevin, Olof, >>> >>> This is an updated pull request for the supend-to-ram patch that has the >>> EDAC code removed in order to avoid a merge conflict. >>> >>> Thanks, >>> Dinh >>> >>> The following changes since commit c65b99f046843d2455aa231747b5a07a999a9f3d: >>> >>> Linux 4.1-rc6 (2015-05-31 19:01:07 -0700) >> >> Why v4.1-rc6? >> >> Are there specific dependencies there? If not, we prefer these pulls to >> be on older -rc tags (typically nothing past where arm-soc/master is). > > No dependency, I just saw that arm-soc/for-next was at -rc6. I remember > seeing an email that you should based to an early -rc, or the same -rc > as the for-next branch? Same -rc as the master branch preferably. Thanks, Kevin
Hi Arnd, Kevin, Olof, This is an updated pull request for the supend-to-ram patch that has the EDAC code removed in order to avoid a merge conflict. Thanks, Dinh The following changes since commit c65b99f046843d2455aa231747b5a07a999a9f3d: Linux 4.1-rc6 (2015-05-31 19:01:07 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git socfpga_updates_for_v4.2_part2_v2 for you to fetch changes up to ae03cc09f379f1bd69cd0534fb2c40c087e7cea1: ARM: socfpga: support suspend to ram (2015-06-05 08:27:43 -0500) ---------------------------------------------------------------- SoCFPGA update for v4.2, part 2 - Add support for suspend to RAM ---------------------------------------------------------------- Alan Tull (1): ARM: socfpga: support suspend to ram arch/arm/mach-socfpga/Kconfig | 10 ++- arch/arm/mach-socfpga/Makefile | 1 + arch/arm/mach-socfpga/core.h | 6 +- arch/arm/mach-socfpga/pm.c | 149 +++++++++++++++++++++++++++++++++++ arch/arm/mach-socfpga/self-refresh.S | 136 ++++++++++++++++++++++++++++++++ arch/arm/mach-socfpga/socfpga.c | 6 +- 6 files changed, 305 insertions(+), 3 deletions(-) create mode 100644 arch/arm/mach-socfpga/pm.c create mode 100644 arch/arm/mach-socfpga/self-refresh.S