On Mon, Mar 23, 2015 at 12:04:11PM +0100, Nicolas Ferre wrote:
> Arnd, Olof, Kevin,
>
> Another cleanup pull-request for fixing some issues and stacking more PM
> cleanup.
> It is based on the previous "at91-cleanup3" tag sent last week (not inclueded
> yet).
>
> Thanks, best regards,
>
> The following changes since commit 8590ca655a19f9e124b52bfbf28f14eb16a05bec:
>
> ARM: at91: remove useless include (2015-03-16 17:03:08 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git tags/at91-cleanup4
>
> for you to fetch changes up to dd905bbb09383f9f62d7a6296f11788d8c283c86:
>
> ARM: at91/pm: move AT91_MEMCTRL_* to pm.h (2015-03-23 11:16:00 +0100)
>
> ----------------------------------------------------------------
> Fourth batch of cleanup for 4.1:
> - 2 issues revealed by the kbuild test robot fixed
> - move of some functions and macros into relevant files to be able to
> streamline the at91 specific header afterwards
>
> ----------------------------------------------------------------
> Alexandre Belloni (4):
> ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected
> clocksource: atmel-st: select MFD_SYSCON
> ARM: at91/pm: move the standby functions to pm.c
> ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
Having a linear cleanup branch doesn't work all that well when you mix in
driver changes like you did in the last version. I.e. I chose to merge that
branch in as a driver branch, but now you're stacking new cleanuips on top.
If the pm changes are independent of the clocksource one (which they seem to
be), then it's better to do base them on the cleanup2 branch instead of
cleanup3.
Would you mind respinning that way? We should still be able to take them
for 4.1.
-Olof
Arnd, Olof, Kevin,
This is a re-spin of my 4th "cleanup" pull-request following the comments made
by Olof. So, now these patches about PM are based on the "at91-cleanup2" that
you would merge in your next/cleanup branch.
I'm preparing another pull-request for the other patch that would stack on our
at91/clocksource-driver branch.
Thanks for your advice, bye.
The following changes since commit 598e085590fc5ac1fecff00e842a8a6c2ae010e5:
ARM: at91: remove old setup (2015-03-13 18:01:10 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git tags/at91-cleanup4_bis
for you to fetch changes up to 2e57dc087c27b8b0bd4a9e5f2c6f28f3cd0b47ff:
ARM: at91/pm: move AT91_MEMCTRL_* to pm.h (2015-04-05 21:59:52 +0200)
----------------------------------------------------------------
Fourth batch of cleanup for 4.1:
- 1 issues revealed by the kbuild test robot fixed
- move of some functions and macros into relevant files to be able to
streamline the at91 specific header afterwards
----------------------------------------------------------------
Alexandre Belloni (3):
ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected
ARM: at91/pm: move the standby functions to pm.c
ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
arch/arm/mach-at91/Makefile | 3 +
arch/arm/mach-at91/include/mach/at91_ramc.h | 4 --
arch/arm/mach-at91/pm.c | 89 ++++++++++++++++++++++++++
arch/arm/mach-at91/pm.h | 96 ++---------------------------
4 files changed, 96 insertions(+), 96 deletions(-)
--
Nicolas Ferre
Arnd, Olof, Kevin,
This is the patch that was extracted from my previous pull request and that
would go on top of your at91/clocksource-driver branch.
Thanks, best regards,
The following changes since commit 8590ca655a19f9e124b52bfbf28f14eb16a05bec:
ARM: at91: remove useless include (2015-03-16 17:03:08 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git tags/at91-clocksource-driver2
for you to fetch changes up to 7ab7ef741a467e7af50c9b7446ec992bec9ea6a7:
clocksource: atmel-st: select MFD_SYSCON (2015-04-05 22:19:50 +0200)
----------------------------------------------------------------
A fix for the ST clocksource driver Kconfig option
----------------------------------------------------------------
Alexandre Belloni (1):
clocksource: atmel-st: select MFD_SYSCON
drivers/clocksource/Kconfig | 1 +
1 file changed, 1 insertion(+)
--
Nicolas Ferre
On Sunday 05 April 2015, Nicolas Ferre wrote:
> Fourth batch of cleanup for 4.1:
> - 1 issues revealed by the kbuild test robot fixed
> - move of some functions and macros into relevant files to be able to
> streamline the at91 specific header afterwards
>
As we should really have the bug fix in the next/multiplatform branch,
I've pulled all of this in.
Sorry for the delay, I hope we don't get into trouble for adding
this too late.
Arnd
On Sunday 05 April 2015, Nicolas Ferre wrote:
> A fix for the ST clocksource driver Kconfig option
Pulled into next/drivers, thanks!
Arnd