From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 00/20] arch_idle() cleanup and mach/system.h removal
Date: Fri, 13 Jan 2012 10:43:59 +0000 [thread overview]
Message-ID: <20120113104358.GR1068@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1324288069-21940-1-git-send-email-nico@fluxnic.net>
On Mon, Dec 19, 2011 at 04:47:29AM -0500, Nicolas Pitre wrote:
> This is the logical continuation of the arch_reset() work that Russell did
> and therefore this must be applied on top of Russell's "reset" branch.
>
> Most arch_idle() implementations are simply a call to cpu_do_idle() and
> can be eliminated in favor of a common call. However, some platforms
> require special idle handling and the arm_pm_idle hook is made available
> for those cases.
Right, it's time for a decision. I was going to send the remainder of
what's in my tree today.
However, that decision has been made for me with the latest conflict
debacle between my tree and Linus' tree due to Samsung stuff, the timing
of the merge window, the timing of linux-next, and the number of merges
between what I was planning to push today and Linus' tree.
Essentially:
1. on Monday a patch was submitted to fix some of the fallout in Exynos
for the restart cleanups. I applied this last night, and pushed it
out. This morning, sfr reported that he had to drop that change
because it was already fixed. I've had to back this change out.
2. There is not going to be another -next tree until after the weekend,
so my new tree will not have had -next exposure.
3. The merge window is due to close Wednesday.
4. There are conflicts in these files:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-exynos/common.c
arch/arm/mach-mx5/mm.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-s5pc100/common.c
arch/arm/mach-s5pv210/common.c
5. I don't think this idle stuff was in the -next tree Linus pulled when
he opened the merge window. (This is the big one which says no to it.)
So, sending a pull request for the idle stuff in the last two days of
the merge window, for a change which is quite big, which conflicts,
which wasn't in -next before the merge window is just asking for trouble,
and I'm not going to do it.
next prev parent reply other threads:[~2012-01-13 10:43 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-19 9:47 [PATCH 00/20] arch_idle() cleanup and mach/system.h removal Nicolas Pitre
2011-12-19 9:47 ` [PATCH 01/20] ARM: clean up idle handlers Nicolas Pitre
2011-12-19 19:07 ` Tony Lindgren
2011-12-19 19:43 ` Nicolas Pitre
2011-12-20 0:41 ` Stephen Warren
2011-12-25 1:42 ` Shawn Guo
2011-12-25 1:48 ` Shawn Guo
2012-01-03 3:34 ` Nicolas Pitre
2011-12-19 9:47 ` [PATCH 02/20] ARM: mach-s5pv210: use standard arch_idle() Nicolas Pitre
2011-12-19 9:47 ` [PATCH 03/20] ARM: mach-s5pc100: " Nicolas Pitre
2011-12-19 9:47 ` [PATCH 04/20] ARM: mach-exynos: " Nicolas Pitre
2011-12-19 9:47 ` [PATCH 05/20] ARM: mach-at91: move special idle code out of line Nicolas Pitre
2011-12-19 9:47 ` [PATCH 06/20] ARM: mach-clps711x: " Nicolas Pitre
2011-12-19 9:47 ` [PATCH 07/20] ARM: mach-ebsa110: " Nicolas Pitre
2011-12-19 9:47 ` [PATCH 08/20] ARM: mach-gemini: " Nicolas Pitre
2011-12-19 17:55 ` Tony Lindgren
2011-12-19 9:47 ` [PATCH 09/20] ARM: mach-h720x: " Nicolas Pitre
2011-12-19 9:47 ` [PATCH 10/20] ARM: s3c24xx: move special idle code to " Nicolas Pitre
2011-12-19 9:47 ` [PATCH 11/20] ARM: plat-mxc: hook special idle handlers to arm_pm_idle Nicolas Pitre
2011-12-25 1:53 ` Shawn Guo
2012-01-03 3:32 ` Nicolas Pitre
2011-12-19 9:47 ` [PATCH 12/20] ARM: mach-msm: " Nicolas Pitre
2011-12-19 17:56 ` Tony Lindgren
2011-12-19 18:07 ` Nicolas Pitre
2011-12-19 23:21 ` David Brown
2011-12-19 9:47 ` [PATCH 13/20] ARM: mach-ixp23xx: properly disable CPU idle call Nicolas Pitre
2011-12-19 9:47 ` [PATCH 14/20] ARM: mach-ixp4xx: " Nicolas Pitre
2011-12-19 9:47 ` [PATCH 15/20] ARM: mach-shark: " Nicolas Pitre
2011-12-19 9:47 ` [PATCH 16/20] ARM: mach-w90x900: " Nicolas Pitre
2011-12-19 9:47 ` [PATCH 17/20] ARM: mach-s3c64xx: " Nicolas Pitre
2011-12-20 15:03 ` Mark Brown
2011-12-20 18:54 ` Nicolas Pitre
2011-12-20 23:36 ` Mark Brown
2011-12-19 9:47 ` [PATCH 18/20] ARM: mach-tegra: " Nicolas Pitre
2011-12-19 9:47 ` [PATCH 19/20] ARM: substitute arch_idle() Nicolas Pitre
2011-12-19 19:08 ` Tony Lindgren
2011-12-19 9:47 ` [PATCH 20/20] ARM: big removal of now unused arch_reset() Nicolas Pitre
2011-12-19 18:15 ` H Hartley Sweeten
2011-12-19 18:21 ` Nicolas Pitre
2011-12-19 19:08 ` Tony Lindgren
2011-12-19 23:22 ` David Brown
2011-12-24 23:22 ` Linus Walleij
2011-12-19 18:57 ` [PATCH 00/20] arch_idle() cleanup and mach/system.h removal Jamie Iles
2011-12-19 19:25 ` Nicolas Pitre
2012-01-13 10:43 ` Russell King - ARM Linux [this message]
2012-01-13 13:54 ` Nicolas Pitre
2012-01-13 14:07 ` Russell King - ARM Linux
2012-01-13 19:31 ` Nicolas Pitre
2012-01-21 3:20 ` Nicolas Pitre
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=20120113104358.GR1068@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).