From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: at91: pm.h cleanup (was: [PATCH 1/4] at91 : coding style fixes)
Date: Thu, 26 Jan 2012 20:33:50 +0000 [thread overview]
Message-ID: <20120126203350.GD11941@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <4F217CCD.5000104@atmel.com>
On Thu, Jan 26, 2012 at 05:18:21PM +0100, Nicolas Ferre wrote:
> Daniel,
>
> I have rebased your patch series on top of:
>
> - at91 late device/board patches that are planned for 3.3
> - at91-fixes branch (should go also in 3.3)
> * rmk/for-next branch (with a merge conflict resolved)
> * the removal of CAP9 SoC family
>
> You can find the resulting code in our git tree:
>
> git://github.com/at91linux/linux-at91.git at91-pm_cleanup
>
> I hope that I will be able to send this branch to arm-soc soon with a
> minimum of future rebase (when the two first series cited above will be
> in Linus' tree actually).
No you won't, not if you're including rmk/for-next in it.
Take a moment to think about that: rmk/for-next is NOT a topic branch.
It is purely a branch published for the sake of SFR. It gets torn down
and regenerated regularly. You can't base work off it. It's all explained
here:
http://www.arm.linux.org.uk/developer/git-arm.php
next prev parent reply other threads:[~2012-01-26 20:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-24 23:56 [PATCH 1/4] at91 : coding style fixes Daniel Lezcano
2012-01-24 23:56 ` [PATCH 2/4] at91 : declare header name Daniel Lezcano
2012-01-24 23:56 ` [PATCH 3/4] at91 : remove wait_for_interrupt definition Daniel Lezcano
2012-01-25 0:18 ` Russell King - ARM Linux
2012-01-25 14:39 ` Daniel Lezcano
2012-02-27 12:50 ` Russell King - ARM Linux
2012-02-27 13:07 ` Daniel Lezcano
2012-02-27 14:52 ` Rob Lee
2012-01-24 23:56 ` [PATCH 4/4] at91 : implement the standby function for pm/cpuidle Daniel Lezcano
2012-01-26 16:18 ` at91: pm.h cleanup (was: [PATCH 1/4] at91 : coding style fixes) Nicolas Ferre
2012-01-26 20:33 ` Russell King - ARM Linux [this message]
2012-01-26 23:34 ` Russell King - ARM Linux
2012-01-27 9:43 ` at91: pm.h cleanup Nicolas Ferre
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=20120126203350.GD11941@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--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).