* Pending patches for -rc
@ 2010-06-30 10:12 Russell King - ARM Linux
2010-06-30 10:48 ` Catalin Marinas
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Russell King - ARM Linux @ 2010-06-30 10:12 UTC (permalink / raw)
To: linux-arm-kernel
Given Linus' concerns about the code which is going in during the -rc
period, and the clamp-down we had for -rc3, I've re-reviewed the
changes which I have in my master branch. The following changes do not
feel like critical rc material:
ARM: mx3: pcm037: remove unused variable
pcm037/pcm043/pca100: fix ULPI-related build warnings
eukrea_mbimx27-baseboard: add generic-bl and platform-lcd controls
eukrea_mbimx27-baseboard: add timings for DVI output
cpuimx27 and mbimx27: allow fine control of UART4 and SDHC2 usage
mach-cpuimx27: add USB Host2 and OTG support
mach-cpuimx27: register wdt and w1_master resources
mxcmmc: add card detect through DAT3 possibility
eukrea_mbimx27: use card detect through DAT3 for SDHC1
MX2X: Add Keypad device definition for MX2X arch
eukrea_mbimx27: add support for the keyboard
eukrea_mbimx27: add audio codec
mxc_nand: add support for platform defined partitions
mx25: add platform code for imx-keypad
mx25pdk: add keypad support
mx5: Add i2c to Freescale MX51 Babbage HW
mx5: Register i2c on Freescale MX51 Babbage HW
ARM: 6189/1: Add support for the MOVW/MOVT relocations in Thumb-2
ARM: 6190/1: Remove dummy loads from the original relocation address
ARM: 6191/1: Do not compile the Thumb-2 module relocations on an ARM kernel
The diffstat looks like this (worst offenders):
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 181 +++++++++++++++++++++++---
arch/arm/mach-mx2/mach-cpuimx27.c | 93 +++++++++++++-
arch/arm/mach-mx5/devices.c | 58 ++++++++
arch/arm/plat-mxc/clock.c | 37 ++++--
arch/arm/mach-mx25/mach-mx25pdk.c | 36 +++++
arch/arm/kernel/module.c | 34 +++++
arch/arm/mach-mx3/mach-mx31lilly.c | 34 ++++--
drivers/mtd/nand/mxc_nand.c | 33 +----
44 files changed, 659 insertions(+), 139 deletions(-)
and I think that if I try to push these to Linus, we'll be on the receipt
of another complaint - quite rightfully too - the above does not look like
bug fixes.
Therefore, I won't be pushing my master branch to Linus, but instead merging
it into -devel and re-starting my master branch afresh.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Pending patches for -rc
2010-06-30 10:12 Pending patches for -rc Russell King - ARM Linux
@ 2010-06-30 10:48 ` Catalin Marinas
2010-06-30 15:07 ` Nicolas Pitre
2010-07-01 9:56 ` Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Catalin Marinas @ 2010-06-30 10:48 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 2010-06-30 at 11:12 +0100, Russell King - ARM Linux wrote:
> ARM: 6189/1: Add support for the MOVW/MOVT relocations in Thumb-2
Thumb-2 modules of certain size may get these relocations and they'll
fail to load.
> ARM: 6190/1: Remove dummy loads from the original relocation address
> ARM: 6191/1: Do not compile the Thumb-2 module relocations on an ARM
> kernel
These two aren't critical, I agree.
BTW, should these patches be re-submitted or you would carry them to the
next merging window?
--
Catalin
^ permalink raw reply [flat|nested] 4+ messages in thread
* Pending patches for -rc
2010-06-30 10:12 Pending patches for -rc Russell King - ARM Linux
2010-06-30 10:48 ` Catalin Marinas
@ 2010-06-30 15:07 ` Nicolas Pitre
2010-07-01 9:56 ` Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Nicolas Pitre @ 2010-06-30 15:07 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 30 Jun 2010, Russell King - ARM Linux wrote:
> 44 files changed, 659 insertions(+), 139 deletions(-)
>
> and I think that if I try to push these to Linus, we'll be on the receipt
> of another complaint - quite rightfully too - the above does not look like
> bug fixes.
>
> Therefore, I won't be pushing my master branch to Linus, but instead merging
> it into -devel and re-starting my master branch afresh.
I completely agree. I think that "ARM: 6189/1: Add support for the
MOVW/MOVT relocations in Thumb-2" could remain though. All the rest
from your list could certainly be deferred to the next merge window.
Nicolas
^ permalink raw reply [flat|nested] 4+ messages in thread
* Pending patches for -rc
2010-06-30 10:12 Pending patches for -rc Russell King - ARM Linux
2010-06-30 10:48 ` Catalin Marinas
2010-06-30 15:07 ` Nicolas Pitre
@ 2010-07-01 9:56 ` Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2010-07-01 9:56 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 30, 2010 at 11:12:23AM +0100, Russell King - ARM Linux wrote:
> Given Linus' concerns about the code which is going in during the -rc
> period, and the clamp-down we had for -rc3, I've re-reviewed the
> changes which I have in my master branch. The following changes do not
> feel like critical rc material:
I agree for the bulk of the i.MX patches. There is one patch I'd like to
have for 2.6.36, find it here:
The following changes since commit 980019d74e4b2428362b36a0506519d6d9460800:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (2010-06-30 15:45:59 -0700)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git imx-for-2.6.35
Daniel Mack (1):
ARM: mx3: mx31lilly: fix build error for !CONFIG_USB_ULPI
arch/arm/mach-mx3/mach-mx31lilly.c | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-01 9:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-30 10:12 Pending patches for -rc Russell King - ARM Linux
2010-06-30 10:48 ` Catalin Marinas
2010-06-30 15:07 ` Nicolas Pitre
2010-07-01 9:56 ` Sascha Hauer
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).