From: Jesper Nilsson <jesper.nilsson@axis.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Mikael Starvik <mikael.starvik@axis.com>,
Jesper Nilsson <jesper.nilsson@axis.com>
Subject: [git pull] CRIS updates
Date: Mon, 11 May 2009 17:35:47 +0200 [thread overview]
Message-ID: <20090511153547.GT21811@axis.com> (raw)
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
next reply other threads:[~2009-05-11 15:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-11 15:35 Jesper Nilsson [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-04-05 14:27 [git pull] CRIS updates Jesper Nilsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090511153547.GT21811@axis.com \
--to=jesper.nilsson@axis.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikael.starvik@axis.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.