Re: What's queued for 2.6.24

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, Sep 23, 2007 at 12:01:59PM +0200, Mike Rapoport wrote:
> On 9/23/07, Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx> wrote:
> > On Sun, Sep 23, 2007 at 10:41:52AM +0200, Mike Rapoport wrote:
> > > Is there any chance to queue CM-X270 support too?
> >
> > Were all the points addressed?  If so, send it to the patch system.
> 
> Important points were addressed already before 2.6.22, but I've missed
> the merge window by two days :(
> As for the recent comments, I'm not sure what to do with DMA bouncing
> (in the ITE 8152 driver). I cannot see how to make it work otherwise.

However, I've just looked at it and there's one big problem that stands
in the way of merging it - it doesn't take any account of the PXA
changes already merged, which were detailed in the _first_ email of
this thread.

Given that 2.6.23 is likely to be released sometime during the coming
week and I'm not going to be reading mail this week, you probably have
a couple of hours to update your patches.

Patching 4573/1...
patching file arch/arm/configs/cm_x270_defconfig
patching file arch/arm/mach-pxa/Kconfig
Hunk #1 FAILED at 41.
1 out of 1 hunk FAILED -- saving rejects to file arch/arm/mach-pxa/Kconfig.rej
patching file arch/arm/mach-pxa/Makefile
Hunk #1 FAILED at 19.
Hunk #2 FAILED at 37.
2 out of 2 hunks FAILED -- saving rejects to file arch/arm/mach-pxa/Makefile.rej
patching file arch/arm/mach-pxa/cm-x270-pci.c
patching file arch/arm/mach-pxa/cm-x270-pci.h
patching file arch/arm/mach-pxa/cm-x270.c
patching file drivers/leds/Kconfig
patching file drivers/leds/Makefile
patching file drivers/leds/leds-cm-x270.c
patching file include/asm-arm/arch-pxa/cm-x270.h
patching file include/asm-arm/arch-pxa/dma.h
patching file include/asm-arm/arch-pxa/hardware.h
Hunk #1 succeeded at 194 (offset 68 lines).
patching file include/asm-arm/arch-pxa/irqs.h
Hunk #1 succeeded at 210 (offset -6 lines).
patching file include/asm-arm/arch-pxa/memory.h


-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php

[Index of Archives]     [Linux Kernel]     [Linux ARM (vger)]     [Linux ARM MSM]     [Linux Omap]     [CentOS ARM]     [Linux Arm]     [Linux Tegra]     [Fedora ARM]     [Linux for Samsung SOC]     [eCos]     [Linux Fastboot]     [Gcc Help]     [Git]     [DCCP]     [IETF Announce]     [Security]     [Linux MIPS]     [Yosemite Campsites]     [Photos]