linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] at91: cleanup for 4.1 #4
Date: Fri, 3 Apr 2015 11:05:56 -0700	[thread overview]
Message-ID: <20150403180556.GK23023@localhost> (raw)
In-Reply-To: <1427108651-566-1-git-send-email-nicolas.ferre@atmel.com>

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

  reply	other threads:[~2015-04-03 18:05 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-23 11:04 [GIT PULL] at91: cleanup for 4.1 #4 Nicolas Ferre
2015-04-03 18:05 ` Olof Johansson [this message]
2015-04-05 20:17   ` [GIT PULL] at91: cleanup for 4.1 #4 (bis) Nicolas Ferre
2015-04-13 23:52     ` Arnd Bergmann
2015-04-05 20:26   ` [GIT PULL] at91: clocksource-driver for 4.1 #2 Nicolas Ferre
2015-04-13 23:53     ` Arnd Bergmann

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=20150403180556.GK23023@localhost \
    --to=olof@lixom.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).