From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Greg Ungerer <gerg@uclinux.org>,
Linux/m68k <linux-m68k@lists.linux-m68k.org>,
Linux Kernel Development <linux-kernel@vger.kernel.org>
Subject: [git pull] m68k updates for 3.8
Date: Thu, 13 Dec 2012 20:44:14 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.00.1212132040040.14664@ayla.of.borg> (raw)
Hi Linus,
The following changes since commit 29594404d7fe73cd80eaa4ee8c43dcc53970c60e:
Linus Torvalds (1):
Linux 3.7
are available in the git repository at:
ra.kernel.org:/pub/scm/linux/kernel/git/geert/linux-m68k.git for-linus
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git for-linus
Greg Ungerer (13):
m68k: switch to using the asm-generic hw_irq.h
m68k: switch to using the asm-generic spinlock.h
m68k: switch to using the asm-generic shmparam.h
m68k: switch to using the asm-generic auxvec.h
m68k: switch to using the asm-generic msgbuf.h
m68k: switch to using the asm-generic sembuf.h
m68k: switch to using the asm-generic shmbuf.h
m68k: switch to using the asm-generic socket.h
m68k: switch to using the asm-generic sockios.h
m68k: switch to using the asm-generic termbits.h
m68k: switch to using the asm-generic termios.h
m68k: merge MMU and non-MMU versions of mm/init.c
m68k: move to a single instance of free_initmem()
Kees Cook (1):
arch/m68k: remove CONFIG_EXPERIMENTAL
Thomas Bogendoerfer (2):
m68k/sun3: Get interrupts working again
m68k/sun3: Fix instruction faults
Summarized:
- Two fixes for Sun-3
- Several clean ups
There will be a trivial merge conflict in
arch/m68k/include/uapi/asm/socket.h, as we switched to the generic
version, while you already pulled the net tree that added SO_GET_FILTER
everywhere. Just remove the offending file to fix it.
Thanks for pulling!
arch/m68k/Kconfig.bus | 4 +-
arch/m68k/Kconfig.cpu | 3 +-
arch/m68k/Kconfig.debug | 2 +-
arch/m68k/Kconfig.devices | 6 +-
arch/m68k/include/asm/Kbuild | 4 +
arch/m68k/include/asm/hw_irq.h | 6 -
arch/m68k/include/asm/shmparam.h | 6 -
arch/m68k/include/asm/spinlock.h | 6 -
arch/m68k/include/asm/termios.h | 50 --------
arch/m68k/include/uapi/asm/Kbuild | 17 ++--
arch/m68k/include/uapi/asm/auxvec.h | 4 -
arch/m68k/include/uapi/asm/msgbuf.h | 31 -----
arch/m68k/include/uapi/asm/sembuf.h | 25 ----
arch/m68k/include/uapi/asm/shmbuf.h | 42 ------
arch/m68k/include/uapi/asm/socket.h | 72 -----------
arch/m68k/include/uapi/asm/sockios.h | 13 --
arch/m68k/include/uapi/asm/termbits.h | 201 -----------------------------
arch/m68k/include/uapi/asm/termios.h | 44 -------
arch/m68k/kernel/traps.c | 2 +-
arch/m68k/mm/init.c | 224 ++++++++++++++++++++++++++++++++-
arch/m68k/mm/init_mm.c | 176 --------------------------
arch/m68k/mm/init_no.c | 145 ---------------------
arch/m68k/mm/mcfmmu.c | 4 -
arch/m68k/mm/motorola.c | 14 --
arch/m68k/mm/sun3mmu.c | 4 -
arch/m68k/sun3/sun3ints.c | 29 +----
26 files changed, 247 insertions(+), 887 deletions(-)
delete mode 100644 arch/m68k/include/asm/hw_irq.h
delete mode 100644 arch/m68k/include/asm/shmparam.h
delete mode 100644 arch/m68k/include/asm/spinlock.h
delete mode 100644 arch/m68k/include/asm/termios.h
delete mode 100644 arch/m68k/include/uapi/asm/auxvec.h
delete mode 100644 arch/m68k/include/uapi/asm/msgbuf.h
delete mode 100644 arch/m68k/include/uapi/asm/sembuf.h
delete mode 100644 arch/m68k/include/uapi/asm/shmbuf.h
delete mode 100644 arch/m68k/include/uapi/asm/socket.h
delete mode 100644 arch/m68k/include/uapi/asm/sockios.h
delete mode 100644 arch/m68k/include/uapi/asm/termbits.h
delete mode 100644 arch/m68k/include/uapi/asm/termios.h
delete mode 100644 arch/m68k/mm/init_mm.c
delete mode 100644 arch/m68k/mm/init_no.c
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next reply other threads:[~2012-12-13 19:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-13 19:44 Geert Uytterhoeven [this message]
2012-12-14 9:08 ` [git pull] m68k updates for 3.8 Rob Landley
[not found] <1355476134.18402.5@driftwood>
2012-12-14 12:04 ` Greg Ungerer
2012-12-14 21:48 ` Rob Landley
[not found] ` <1355521700.18402.7@driftwood>
2012-12-15 0:01 ` Al Viro
2012-12-15 12:09 ` Greg Ungerer
[not found] ` <50CC687F.6060305@westnet.com.au>
2012-12-16 10:19 ` Geert Uytterhoeven
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=alpine.DEB.2.00.1212132040040.14664@ayla.of.borg \
--to=geert@linux-m68k.org \
--cc=akpm@linux-foundation.org \
--cc=gerg@uclinux.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox