* pull request for .34
@ 2010-02-18 10:15 Uwe Kleine-König
2010-02-18 10:27 ` Russell King - ARM Linux
0 siblings, 1 reply; 5+ messages in thread
From: Uwe Kleine-König @ 2010-02-18 10:15 UTC (permalink / raw)
To: linux-arm-kernel
Hello Russell,
I collected the raw_spinlock conversion patches by Thomas[1] and put them
together with my patches in my repository.
All the patches have been posted on this list without anyone having
objections.
I have a patch stack that makes imx21 and imx27 use runtime physoffset,
but I'm not sure yet if I can complete bringing it into shape for the
merge window.
Best regards
Uwe
[1] I only fixed one subject not to contain a patch name
The following changes since commit b0483e78e5c4c9871fc5541875b3bc006846d46b:
Linus Torvalds (1):
Merge git://git.kernel.org/.../gregkh/tty-2.6
are available in the git repository at:
git://git.pengutronix.de/git/ukl/linux-2.6.git for-rmk
Thomas Gleixner (12):
arm: Convert dma_spin_lock to raw_spinlock
arm: Convert stop_lock to raw_spinlock
arm: convert die_lock and undef_lock to raw_spinlocks
arm: Convert l2x0_lock to raw_spinlock
arm: Convert cpu_asid_lock to raw_spinlock
arm: Convert xscale minicache_lock to raw_spinlock
arm: Convert v4 minicache_lock to raw_spinlock
arm: Convert v6_lock to raw_spinlock
arm: Convert footbridge gpio and led locks to raw_spinlock
arm: Convert integrator cm_lock and v3_lock to raw_spinlock
arm: Convert ixp4xx pci_lock to raw_spinlock
arm: Convert shark leds_lock to raw_spinlock
Uwe Kleine-K?nig (13):
arm/zImage: fix comments for cache_on, cache_off and cache_clean_flush
arm/zImage: some comments for __armv3_mpu_cache_on
arm/zImage: __armv3_mpu_cache_flush: respect should-be-zero specification
arm/zImage: annotate debug functions about corrupted registers
arm/zImage: don't define unused symbol initrd_phys
arm: deprecate support for old way to pass kernel parameters
arm/zImage: don't hard code the stack size twice
arm/uImage: require passing a LOADADDR when building with RUNTIME_PHYSOFFSET
arm: Allow PHYS_OFFSET to be runtime determined
arm: remove bit-rotten STANDALONE_DEBUG for decompressor
arm/ixp2000: fix type of ixp2000_timer_interrupt
Merge branch 'arm/booting' into for-rmk
Merge branch 'arm/raw_spinlock' into for-rmk
Documentation/arm/Booting | 1 +
arch/arm/Kconfig | 9 +++
arch/arm/boot/Makefile | 6 ++-
arch/arm/boot/compressed/Makefile | 10 +--
arch/arm/boot/compressed/Makefile.debug | 23 -------
arch/arm/boot/compressed/head.S | 76 +++++++++++++++++++--
arch/arm/boot/compressed/misc.c | 27 --------
arch/arm/include/asm/dma.h | 6 +-
arch/arm/include/asm/memory.h | 5 ++
arch/arm/kernel/Makefile | 4 +-
arch/arm/kernel/compat.c | 7 --
arch/arm/kernel/compat.h | 2 -
arch/arm/kernel/dma.c | 2 +-
arch/arm/kernel/head.S | 31 +++++++--
arch/arm/kernel/setup.c | 21 ++++++-
arch/arm/kernel/smp.c | 6 +-
arch/arm/kernel/traps.c | 20 +++---
arch/arm/mach-footbridge/include/mach/hardware.h | 2 +-
arch/arm/mach-footbridge/netwinder-hw.c | 14 ++--
arch/arm/mach-footbridge/netwinder-leds.c | 10 ++--
arch/arm/mach-integrator/core.c | 6 +-
arch/arm/mach-integrator/pci_v3.c | 14 ++--
arch/arm/mach-ixp2000/core.c | 2 +-
arch/arm/mach-ixp4xx/common-pci.c | 22 +++---
arch/arm/mach-shark/leds.c | 6 +-
arch/arm/mm/cache-l2x0.c | 30 ++++----
arch/arm/mm/context.c | 6 +-
arch/arm/mm/copypage-v4mc.c | 6 +-
arch/arm/mm/copypage-v6.c | 10 ++--
arch/arm/mm/copypage-xscale.c | 6 +-
drivers/char/ds1620.c | 8 +-
drivers/char/nwflash.c | 4 +-
drivers/mtd/maps/dc21285.c | 4 +-
sound/oss/waveartist.c | 4 +-
34 files changed, 232 insertions(+), 178 deletions(-)
delete mode 100644 arch/arm/boot/compressed/Makefile.debug
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 5+ messages in thread
* pull request for .34
2010-02-18 10:15 pull request for .34 Uwe Kleine-König
@ 2010-02-18 10:27 ` Russell King - ARM Linux
2010-02-18 11:01 ` Uwe Kleine-König
0 siblings, 1 reply; 5+ messages in thread
From: Russell King - ARM Linux @ 2010-02-18 10:27 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Feb 18, 2010 at 11:15:38AM +0100, Uwe Kleine-K?nig wrote:
> I collected the raw_spinlock conversion patches by Thomas[1] and put them
> together with my patches in my repository.
Thomas asked me about a pull request for his patches, and I said no
because they're spread across many different mach-* directories. So
this isn't helpful.
What also isn't helpful is bundling it up with the load address change
stuff which I'm not pulling for .34.
^ permalink raw reply [flat|nested] 5+ messages in thread
* pull request for .34
2010-02-18 10:27 ` Russell King - ARM Linux
@ 2010-02-18 11:01 ` Uwe Kleine-König
2010-02-22 10:58 ` Uwe Kleine-König
0 siblings, 1 reply; 5+ messages in thread
From: Uwe Kleine-König @ 2010-02-18 11:01 UTC (permalink / raw)
To: linux-arm-kernel
Hello Russell,
On Thu, Feb 18, 2010 at 10:27:57AM +0000, Russell King - ARM Linux wrote:
> On Thu, Feb 18, 2010 at 11:15:38AM +0100, Uwe Kleine-K?nig wrote:
> > I collected the raw_spinlock conversion patches by Thomas[1] and put them
> > together with my patches in my repository.
>
> Thomas asked me about a pull request for his patches, and I said no
> because they're spread across many different mach-* directories. So
> this isn't helpful.
Hmm, if this was on the list then sorry, I missed it.
> What also isn't helpful is bundling it up with
I just thought that I might make it easier for you. And they are not
more bundled than in the case where you pull them together, are they?
> the load address change
> stuff which I'm not pulling for .34.
That's the first objection I hear (or read) about that. I'm not sure
what is meant by "load address change stuff", I assume it's the runtime
physoffset. I look forward to more concrete feed-back.
> arm/zImage: fix comments for cache_on, cache_off and cache_clean_flush
> arm/zImage: some comments for __armv3_mpu_cache_on
> arm/zImage: __armv3_mpu_cache_flush: respect should-be-zero specification
> arm/zImage: annotate debug functions about corrupted registers
> arm/zImage: don't define unused symbol initrd_phys
> arm: deprecate support for old way to pass kernel parameters
> arm/zImage: don't hard code the stack size twice
> arm/uImage: require passing a LOADADDR when building with RUNTIME_PHYSOFFSET
> arm: Allow PHYS_OFFSET to be runtime determined
> arm: remove bit-rotten STANDALONE_DEBUG for decompressor
> arm/ixp2000: fix type of ixp2000_timer_interrupt
Is it OK for you to take all but the two concering RUNTIME_PHYSOFFSET?
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 5+ messages in thread
* pull request for .34
2010-02-18 11:01 ` Uwe Kleine-König
@ 2010-02-22 10:58 ` Uwe Kleine-König
2010-04-17 19:06 ` Uwe Kleine-König
0 siblings, 1 reply; 5+ messages in thread
From: Uwe Kleine-König @ 2010-02-22 10:58 UTC (permalink / raw)
To: linux-arm-kernel
Hello Russell,
On Thu, Feb 18, 2010 at 12:01:35PM +0100, Uwe Kleine-K?nig wrote:
> > What also isn't helpful is bundling it up with
> [...]
> > the load address change
> > stuff which I'm not pulling for .34.
> That's the first objection I hear (or read) about that. I'm not sure
> what is meant by "load address change stuff", I assume it's the runtime
> physoffset. I look forward to more concrete feed-back.
should I repost?
I hope I didn't upset you in any way, if so it wasn't intended and I ask
you to please point out the problem that I can sort that out.
Otherwise I just assume it's lack of time.
> > arm/zImage: fix comments for cache_on, cache_off and cache_clean_flush
> > arm/zImage: some comments for __armv3_mpu_cache_on
> > arm/zImage: __armv3_mpu_cache_flush: respect should-be-zero specification
> > arm/zImage: annotate debug functions about corrupted registers
> > arm/zImage: don't define unused symbol initrd_phys
> > arm: deprecate support for old way to pass kernel parameters
> > arm/zImage: don't hard code the stack size twice
> > arm/uImage: require passing a LOADADDR when building with RUNTIME_PHYSOFFSET
> > arm: Allow PHYS_OFFSET to be runtime determined
> > arm: remove bit-rotten STANDALONE_DEBUG for decompressor
> > arm/ixp2000: fix type of ixp2000_timer_interrupt
> Is it OK for you to take all but the two concering RUNTIME_PHYSOFFSET?
As I havn't got a reply up to now, I just retry without those:
The following changes since commit 499a2673713c85734a54c37dd90b4b729de399c4:
Linus Torvalds (1):
Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input
are available in the git repository at:
git://git.pengutronix.de/git/ukl/linux-2.6.git arm/booting
Uwe Kleine-K?nig (8):
arm/zImage: fix comments for cache_on, cache_off and cache_clean_flush
arm/zImage: some comments for __armv3_mpu_cache_on
arm/zImage: __armv3_mpu_cache_flush: respect should-be-zero specification
arm/zImage: annotate debug functions about corrupted registers
arm/zImage: don't define unused symbol initrd_phys
arm: deprecate support for old way to pass kernel parameters
arm/zImage: don't hard code the stack size twice
arm: remove bit-rotten STANDALONE_DEBUG for decompressor
arch/arm/Kconfig | 6 ++++++
arch/arm/boot/compressed/Makefile | 9 +++------
arch/arm/boot/compressed/Makefile.debug | 23 -----------------------
arch/arm/boot/compressed/head.S | 26 ++++++++++++++++++--------
arch/arm/boot/compressed/misc.c | 27 ---------------------------
arch/arm/kernel/Makefile | 4 +++-
arch/arm/kernel/compat.c | 7 -------
arch/arm/kernel/compat.h | 2 --
arch/arm/kernel/setup.c | 11 +++++++++++
9 files changed, 41 insertions(+), 74 deletions(-)
delete mode 100644 arch/arm/boot/compressed/Makefile.debug
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 5+ messages in thread
* pull request for .34
2010-02-22 10:58 ` Uwe Kleine-König
@ 2010-04-17 19:06 ` Uwe Kleine-König
0 siblings, 0 replies; 5+ messages in thread
From: Uwe Kleine-König @ 2010-04-17 19:06 UTC (permalink / raw)
To: linux-arm-kernel
Hello Russell,
On Mon, Feb 22, 2010 at 11:58:09AM +0100, Uwe Kleine-K?nig wrote:
> On Thu, Feb 18, 2010 at 12:01:35PM +0100, Uwe Kleine-K?nig wrote:
> > > What also isn't helpful is bundling it up with
> > [...]
> > > the load address change
> > > stuff which I'm not pulling for .34.
> > That's the first objection I hear (or read) about that. I'm not sure
> > what is meant by "load address change stuff", I assume it's the runtime
> > physoffset. I look forward to more concrete feed-back.
> should I repost?
>
> I hope I didn't upset you in any way, if so it wasn't intended and I ask
> you to please point out the problem that I can sort that out.
> Otherwise I just assume it's lack of time.
>
> > > arm/zImage: fix comments for cache_on, cache_off and cache_clean_flush
> > > arm/zImage: some comments for __armv3_mpu_cache_on
> > > arm/zImage: __armv3_mpu_cache_flush: respect should-be-zero specification
> > > arm/zImage: annotate debug functions about corrupted registers
> > > arm/zImage: don't define unused symbol initrd_phys
> > > arm: deprecate support for old way to pass kernel parameters
> > > arm/zImage: don't hard code the stack size twice
> > > arm/uImage: require passing a LOADADDR when building with RUNTIME_PHYSOFFSET
> > > arm: Allow PHYS_OFFSET to be runtime determined
> > > arm: remove bit-rotten STANDALONE_DEBUG for decompressor
> > > arm/ixp2000: fix type of ixp2000_timer_interrupt
> > Is it OK for you to take all but the two concering RUNTIME_PHYSOFFSET?
> As I havn't got a reply up to now, I just retry without those:
>
> The following changes since commit 499a2673713c85734a54c37dd90b4b729de399c4:
> Linus Torvalds (1):
> Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input
>
> are available in the git repository at:
>
> git://git.pengutronix.de/git/ukl/linux-2.6.git arm/booting
>
> Uwe Kleine-K?nig (8):
> arm/zImage: fix comments for cache_on, cache_off and cache_clean_flush
> arm/zImage: some comments for __armv3_mpu_cache_on
> arm/zImage: __armv3_mpu_cache_flush: respect should-be-zero specification
> arm/zImage: annotate debug functions about corrupted registers
> arm/zImage: don't define unused symbol initrd_phys
> arm: deprecate support for old way to pass kernel parameters
> arm/zImage: don't hard code the stack size twice
> arm: remove bit-rotten STANDALONE_DEBUG for decompressor
>
> arch/arm/Kconfig | 6 ++++++
> arch/arm/boot/compressed/Makefile | 9 +++------
> arch/arm/boot/compressed/Makefile.debug | 23 -----------------------
> arch/arm/boot/compressed/head.S | 26 ++++++++++++++++++--------
> arch/arm/boot/compressed/misc.c | 27 ---------------------------
> arch/arm/kernel/Makefile | 4 +++-
> arch/arm/kernel/compat.c | 7 -------
> arch/arm/kernel/compat.h | 2 --
> arch/arm/kernel/setup.c | 11 +++++++++++
> 9 files changed, 41 insertions(+), 74 deletions(-)
> delete mode 100644 arch/arm/boot/compressed/Makefile.debug
Anything new on that? When merging that branch today into linus/master
it generates some merge conflicts. If you cared to point out the
problems you see, I'd respin the series.
It took me quite some time to be convinced I did everything correct for
the runtime determined physoffset patch. I'd be disappointed if this
was for nothing. :-(
Thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-04-17 19:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-18 10:15 pull request for .34 Uwe Kleine-König
2010-02-18 10:27 ` Russell King - ARM Linux
2010-02-18 11:01 ` Uwe Kleine-König
2010-02-22 10:58 ` Uwe Kleine-König
2010-04-17 19:06 ` Uwe Kleine-König
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).