* [git pull] CRIS updates
@ 2009-04-05 14:27 Jesper Nilsson
0 siblings, 0 replies; 2+ messages in thread
From: Jesper Nilsson @ 2009-04-05 14:27 UTC (permalink / raw)
To: Linus Torvalds, LKML, Andrew Morton
Hi,
The following changes since commit 15f7176eb1cccec0a332541285ee752b935c1c85:
Linus Torvalds (1):
Merge git://git.kernel.org/.../davem/net-2.6
are available in the git repository at:
git://repo.or.cz/cris-mirror.git for-linus
Jesper Nilsson (2):
CRISv32: Remove extraneous space between -I and the path.
Merge branch 'master' of git://git.kernel.org/.../rusty/linux-2.6-cpumask-for-cris into for-next
Rusty Russell (3):
cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: cris
cpumask: Use accessors code.: cris
cpumask: use mm_cpumask() wrapper: cris
Stoyan Gaydarov (1):
BUG to BUG_ON changes
Thomas Gleixner (1):
cris: convert obsolete hw_interrupt_type to struct irq_chip
arch/cris/arch-v10/kernel/irq.c | 2 +-
arch/cris/arch-v32/boot/compressed/Makefile | 6 +++---
arch/cris/arch-v32/kernel/irq.c | 2 +-
arch/cris/arch-v32/kernel/smp.c | 10 +++++-----
arch/cris/arch-v32/mm/tlb.c | 2 +-
arch/cris/kernel/setup.c | 2 +-
arch/cris/mm/init.c | 3 +--
7 files changed, 13 insertions(+), 14 deletions(-)
/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@axis.com
^ permalink raw reply [flat|nested] 2+ messages in thread
* [git pull] CRIS updates
@ 2009-05-11 15:35 Jesper Nilsson
0 siblings, 0 replies; 2+ messages in thread
From: Jesper Nilsson @ 2009-05-11 15:35 UTC (permalink / raw)
To: Linus Torvalds, LKML, Andrew Morton, Mikael Starvik,
Jesper Nilsson
Hi,
Four small fixes, although the merge of the boot files looks
larger than it is.
The following changes since commit a939b96cccdb65df80a52447ec8e4a6d79c56dbb:
Linus Torvalds (1):
Merge branch 'for-linus' of git://git.kernel.org/.../rafael/suspend-2.6
are available in the git repository at:
git://repo.or.cz/cris-mirror.git for-linus
Jesper Nilsson (4):
CRIS: Merge machine dependent boot/compressed and boot/rescue
CRISv32: Remove obsolete vcs_hook.o from Makefile
CRIS: Wire up syscalls signalfd4 to writev.
CRISv32: Fix typo compile error in ARTPEC-3 gpio driver.
arch/cris/Makefile | 14 +-
arch/cris/arch-v10/boot/compressed/Makefile | 27 ---
arch/cris/arch-v10/boot/compressed/README | 25 --
arch/cris/arch-v10/boot/compressed/misc.c | 246 --------------------
arch/cris/arch-v10/kernel/entry.S | 14 +-
arch/cris/arch-v32/boot/Makefile | 20 --
arch/cris/arch-v32/boot/compressed/Makefile | 26 --
arch/cris/arch-v32/boot/rescue/Makefile | 26 --
arch/cris/arch-v32/drivers/mach-a3/gpio.c | 4 +-
arch/cris/arch-v32/kernel/Makefile | 2 -
arch/cris/arch-v32/kernel/entry.S | 8 +
arch/cris/{arch-v10 => }/boot/.gitignore | 0
arch/cris/{arch-v10 => }/boot/Makefile | 8 +-
arch/cris/boot/compressed/Makefile | 38 +++
arch/cris/{arch-v32 => }/boot/compressed/README | 0
.../compressed/decompress_v10.lds} | 0
.../compressed/decompress_v32.lds} | 0
.../head.S => boot/compressed/head_v10.S} | 4 +-
.../head.S => boot/compressed/head_v32.S} | 10 +-
arch/cris/{arch-v32 => }/boot/compressed/misc.c | 193 +++++++++++-----
arch/cris/{arch-v10 => }/boot/rescue/Makefile | 22 ++-
.../boot/rescue/head.S => boot/rescue/head_v10.S} | 2 +-
.../boot/rescue/head.S => boot/rescue/head_v32.S} | 0
.../cris/{arch-v10 => }/boot/rescue/kimagerescue.S | 0
.../rescue.lds => boot/rescue/rescue_v10.lds} | 0
.../rescue.lds => boot/rescue/rescue_v32.lds} | 0
arch/cris/{arch-v10 => }/boot/rescue/testrescue.S | 0
arch/cris/{arch-v10 => }/boot/tools/build.c | 0
arch/cris/include/asm/unistd.h | 12 +-
29 files changed, 240 insertions(+), 461 deletions(-)
delete mode 100644 arch/cris/arch-v10/boot/compressed/Makefile
delete mode 100644 arch/cris/arch-v10/boot/compressed/README
delete mode 100644 arch/cris/arch-v10/boot/compressed/misc.c
delete mode 100644 arch/cris/arch-v32/boot/Makefile
delete mode 100644 arch/cris/arch-v32/boot/compressed/Makefile
delete mode 100644 arch/cris/arch-v32/boot/rescue/Makefile
rename arch/cris/{arch-v10 => }/boot/.gitignore (100%)
rename arch/cris/{arch-v10 => }/boot/Makefile (65%)
create mode 100644 arch/cris/boot/compressed/Makefile
rename arch/cris/{arch-v32 => }/boot/compressed/README (100%)
rename arch/cris/{arch-v10/boot/compressed/decompress.lds => boot/compressed/decompress_v10.lds} (100%)
rename arch/cris/{arch-v32/boot/compressed/decompress.lds => boot/compressed/decompress_v32.lds} (100%)
rename arch/cris/{arch-v10/boot/compressed/head.S => boot/compressed/head_v10.S} (97%)
rename arch/cris/{arch-v32/boot/compressed/head.S => boot/compressed/head_v32.S} (94%)
rename arch/cris/{arch-v32 => }/boot/compressed/misc.c (65%)
rename arch/cris/{arch-v10 => }/boot/rescue/Makefile (63%)
rename arch/cris/{arch-v10/boot/rescue/head.S => boot/rescue/head_v10.S} (99%)
rename arch/cris/{arch-v32/boot/rescue/head.S => boot/rescue/head_v32.S} (100%)
rename arch/cris/{arch-v10 => }/boot/rescue/kimagerescue.S (100%)
rename arch/cris/{arch-v10/boot/rescue/rescue.lds => boot/rescue/rescue_v10.lds} (100%)
rename arch/cris/{arch-v32/boot/rescue/rescue.lds => boot/rescue/rescue_v32.lds} (100%)
rename arch/cris/{arch-v10 => }/boot/rescue/testrescue.S (100%)
rename arch/cris/{arch-v10 => }/boot/tools/build.c (100%)
Thanks!
/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@axis.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-05-11 15:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-11 15:35 [git pull] CRIS updates Jesper Nilsson
-- strict thread matches above, loose matches on Subject: below --
2009-04-05 14:27 Jesper Nilsson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox