Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] Patches for 2.6.33
@ 2009-11-16 10:34 Catalin Marinas
  2009-11-16 10:53 ` Russell King - ARM Linux
  0 siblings, 1 reply; 4+ messages in thread
From: Catalin Marinas @ 2009-11-16 10:34 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Russell,

Since the last pull from my branch there were four additional patches
discussed on the list. Would you consider pulling (any of) them for
2.6.33?

Thanks.


The following changes since commit c97c5aa83c41a532bc67da356d77da929bc41b9c:
  Catalin Marinas (1):
        RealView: Add sparsemem support for the RealView PBX platform

are available in the git repository at:

  git://linux-arm.org/linux-2.6.git for-rmk

Catalin Marinas (3):
      Fix the machine description printing in __error_a
      Add an earlyprintk debug console
      ARMv7: Use lazy cache flushing if hardware broadcasts cache operations

Varun Swara (1):
      Do not allow the probing of the local timer

 arch/arm/Kconfig.debug          |    8 +++++
 arch/arm/include/asm/smp_plat.h |    9 ++++++
 arch/arm/kernel/Makefile        |    1 +
 arch/arm/kernel/early_printk.c  |   57 +++++++++++++++++++++++++++++++++++++++
 arch/arm/kernel/head-common.S   |    2 +-
 arch/arm/kernel/smp_twd.c       |    1 +
 arch/arm/mm/fault-armv.c        |    2 -
 arch/arm/mm/flush.c             |    9 +++---
 8 files changed, 81 insertions(+), 8 deletions(-)
 create mode 100644 arch/arm/kernel/early_printk.c

-- 
Catalin

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [GIT PULL] Patches for 2.6.33
  2009-11-16 10:34 [GIT PULL] Patches for 2.6.33 Catalin Marinas
@ 2009-11-16 10:53 ` Russell King - ARM Linux
  2009-11-16 11:03   ` Catalin Marinas
  0 siblings, 1 reply; 4+ messages in thread
From: Russell King - ARM Linux @ 2009-11-16 10:53 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Nov 16, 2009 at 10:34:54AM +0000, Catalin Marinas wrote:
> Catalin Marinas (3):
>       Fix the machine description printing in __error_a

I think you can drop this one - doesn't 158bc5a cover it?

>       Add an earlyprintk debug console
>       ARMv7: Use lazy cache flushing if hardware broadcasts cache operations

I'm holding off on this - I think I have something similar in smp_plat.h
in my git tree, and I don't remember whether that stuff has been sent to
the list as part of my previous patch dump.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [GIT PULL] Patches for 2.6.33
  2009-11-16 10:53 ` Russell King - ARM Linux
@ 2009-11-16 11:03   ` Catalin Marinas
  2009-12-04  9:55     ` Catalin Marinas
  0 siblings, 1 reply; 4+ messages in thread
From: Catalin Marinas @ 2009-11-16 11:03 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, 2009-11-16 at 10:53 +0000, Russell King - ARM Linux wrote:
> On Mon, Nov 16, 2009 at 10:34:54AM +0000, Catalin Marinas wrote:
> > Catalin Marinas (3):
> >       Fix the machine description printing in __error_a
> 
> I think you can drop this one - doesn't 158bc5a cover it?

Yes, I didn't see it.

> >       Add an earlyprintk debug console
> >       ARMv7: Use lazy cache flushing if hardware broadcasts cache operations
> 
> I'm holding off on this - I think I have something similar in smp_plat.h
> in my git tree, and I don't remember whether that stuff has been sent to
> the list as part of my previous patch dump.

Your devel branch only has something on highmem and TLB broadcasting in
smp_plat.h but I tried applying my patch and it fails in other files
like fault-armv.c and flush.c.

Anyway, the for-rmk branch now looks like this:


The following changes since commit c97c5aa83c41a532bc67da356d77da929bc41b9c:
  Catalin Marinas (1):
        RealView: Add sparsemem support for the RealView PBX platform

are available in the git repository at:

  git://linux-arm.org/linux-2.6.git for-rmk

Catalin Marinas (1):
      Add an earlyprintk debug console

Varun Swara (1):
      Do not allow the probing of the local timer

 arch/arm/Kconfig.debug         |    8 +++++
 arch/arm/kernel/Makefile       |    1 +
 arch/arm/kernel/early_printk.c |   57 ++++++++++++++++++++++++++++++++++++++++
 arch/arm/kernel/smp_twd.c      |    1 +
 4 files changed, 67 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/kernel/early_printk.c

-- 
Catalin

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [GIT PULL] Patches for 2.6.33
  2009-11-16 11:03   ` Catalin Marinas
@ 2009-12-04  9:55     ` Catalin Marinas
  0 siblings, 0 replies; 4+ messages in thread
From: Catalin Marinas @ 2009-12-04  9:55 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Russell,

On Mon, 2009-11-16 at 11:03 +0000, Catalin Marinas wrote:
> Anyway, the for-rmk branch now looks like this:
> 
> The following changes since commit c97c5aa83c41a532bc67da356d77da929bc41b9c:
>   Catalin Marinas (1):
>         RealView: Add sparsemem support for the RealView PBX platform
> 
> are available in the git repository at:
> 
>   git://linux-arm.org/linux-2.6.git for-rmk
> 
> Catalin Marinas (1):
>       Add an earlyprintk debug console
> 
> Varun Swara (1):
>       Do not allow the probing of the local timer

Did you managed to pull these two patches? It looks like the other
patches in my for-rmk branch (including the sparsemem support for PBX)
went in during the -rc series and they are now in 2.6.32 (thanks!).

Do you plan to push the other two that were left during this merging
window? I can rebase the for-rmk branch to 2.6.32 so that it only
contains these two patches.

Thanks.

-- 
Catalin

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2009-12-04  9:55 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-16 10:34 [GIT PULL] Patches for 2.6.33 Catalin Marinas
2009-11-16 10:53 ` Russell King - ARM Linux
2009-11-16 11:03   ` Catalin Marinas
2009-12-04  9:55     ` Catalin Marinas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox