From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Greg Ungerer <gerg@linux-m68k.org>,
linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [git pull] m68k updates for 4.19
Date: Wed, 8 Aug 2018 15:33:19 +0200 [thread overview]
Message-ID: <20180808133319.26298-1-geert@linux-m68k.org> (raw)
Hi Linus,
The following changes since commit d72e90f33aa4709ebecc5005562f52335e106a60:
Linux 4.18-rc6 (2018-07-22 14:12:20 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-for-v4.19-tag1
for you to fetch changes up to 71a896687b851477bfe2e7022cd4b597ab4f900d:
m68k/defconfig: Update defconfigs for v4.18-rc6 (2018-07-29 10:55:53 +0200)
----------------------------------------------------------------
m68k updates for 4.19
- Enable mac_scsi PDMA on PowerBook 500,
- Generic dma_noncoherent_ops conversion,
- Time handling improvements,
- I/O accessor improvements,
- Conversion to MEMBLOCK and NO_BOOTMEM, to bring m68k in line with
other mainstream architectures,
- Miscellaneous fixes and cleanups,
- Defconfig updates.
Notes:
- This is based on v4.18-rc6 not -rc1 due to -rc6 triggering a defconfig
refresh,
- There is a minor conflict with the powerpc tree in arch/m68k/mac/misc.c,
cfr.
https://lore.kernel.org/lkml/20180802094154.6d88f03c@canb.auug.org.au/,
- The net and input changes have been acked by the respective maintainers.
Thanks for pulling!
----------------------------------------------------------------
Arnd Bergmann (2):
m68k: mac: Use time64_t in RTC handling
m68k: Remove unused set_clock_mmss() helpers
Christoph Hellwig (1):
m68k: Use generic dma_noncoherent_ops
Finn Thain (2):
m68k/mac: Enable PDMA for PowerBook 500 series
nubus: Set default dma mask for nubus_board devices
Geert Uytterhoeven (6):
m68k/io: Add missing ioremap define guards, fix typo
net: mac8390: Use standard memcpy_{from,to}io()
Input: hilkbd - Add casts to HP9000/300 I/O accessors
m68k/io: Move mem*io define guards to <asm/kmap.h>
m68k/io: Switch mmu variant to <asm-generic/io.h>
m68k/defconfig: Update defconfigs for v4.18-rc6
Mike Rapoport (3):
m68k/bitops: convert __ffs to match generic declaration
m68k/page_no.h: force __va argument to be unsigned long
m68k: switch to MEMBLOCK + NO_BOOTMEM
arch/m68k/Kconfig | 5 +++
arch/m68k/apollo/config.c | 8 ----
arch/m68k/atari/config.c | 5 ---
arch/m68k/atari/time.c | 63 ----------------------------
arch/m68k/bvme6000/config.c | 45 --------------------
arch/m68k/configs/amiga_defconfig | 32 +++++++++------
arch/m68k/configs/apollo_defconfig | 30 ++++++++------
arch/m68k/configs/atari_defconfig | 29 +++++++------
arch/m68k/configs/bvme6000_defconfig | 30 ++++++++------
arch/m68k/configs/hp300_defconfig | 30 ++++++++------
arch/m68k/configs/mac_defconfig | 30 ++++++++------
arch/m68k/configs/multi_defconfig | 32 +++++++++------
arch/m68k/configs/mvme147_defconfig | 30 ++++++++------
arch/m68k/configs/mvme16x_defconfig | 30 ++++++++------
arch/m68k/configs/q40_defconfig | 30 ++++++++------
arch/m68k/configs/sun3_defconfig | 28 ++++++++-----
arch/m68k/configs/sun3x_defconfig | 30 ++++++++------
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/asm/bitops.h | 8 +++-
arch/m68k/include/asm/dma-mapping.h | 12 ------
arch/m68k/include/asm/io.h | 7 ++++
arch/m68k/include/asm/io_mm.h | 42 ++-----------------
arch/m68k/include/asm/io_no.h | 12 ------
arch/m68k/include/asm/kmap.h | 9 +++-
arch/m68k/include/asm/machdep.h | 1 -
arch/m68k/include/asm/macintosh.h | 1 -
arch/m68k/include/asm/page_no.h | 2 +-
arch/m68k/kernel/dma.c | 68 ++++--------------------------
arch/m68k/kernel/setup_mm.c | 15 ++-----
arch/m68k/kernel/setup_no.c | 21 ++--------
arch/m68k/mac/config.c | 21 +---------
arch/m68k/mac/misc.c | 80 ++++++++++++++++--------------------
arch/m68k/mm/init.c | 1 -
arch/m68k/mm/mcfmmu.c | 13 +++---
arch/m68k/mm/motorola.c | 35 +++++-----------
arch/m68k/mvme147/config.c | 7 ----
arch/m68k/mvme16x/config.c | 8 ----
arch/m68k/q40/config.c | 30 --------------
arch/m68k/sun3/config.c | 4 --
drivers/input/keyboard/hilkbd.c | 4 +-
drivers/net/ethernet/8390/mac8390.c | 20 ++++-----
drivers/nubus/bus.c | 3 ++
42 files changed, 335 insertions(+), 577 deletions(-)
delete mode 100644 arch/m68k/include/asm/dma-mapping.h
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
reply other threads:[~2018-08-08 13:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20180808133319.26298-1-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=akpm@linux-foundation.org \
--cc=gerg@linux-m68k.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;
as well as URLs for NNTP newsgroup(s).