From: Greg Ungerer <gerg@linux-m68k.org>
To: torvalds@linux-foundation.org
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Linux/m68k <linux-m68k@vger.kernel.org>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [git pull] m68knommu changes for v5.10
Date: Mon, 19 Oct 2020 11:22:40 +1000 [thread overview]
Message-ID: <dae7af98-a47c-4225-b444-21d47cc27307@linux-m68k.org> (raw)
Hi Linus,
Please pull the m68knommu changes for v5.10.
I expect you will get a merge conflict on a27bc11f4b7c ("m68knommu: switch
to using asm-generic/uaccess.h") in arch/m68k/Kconfig. The resolution is
strait forward, you just need to add the single line:
select UACCESS_MEMCPY if !MMU
as per the that commit. Geert ordered that list alphabetically, so it
now needs to go near the end of that list of selects, jut above
"select VIRT_TO_BUS".
Regards
Greg
The following changes since commit 549738f15da0e5a00275977623be199fbbf7df50:
Linux 5.9-rc8 (2020-10-04 16:04:34 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git tags/m68knommu-for-v5.10
for you to fetch changes up to 9f5fd809d7a02e32c2e044acb9f6aed1c79a699b:
serial: mcf: add sysrq capability (2020-10-07 21:58:36 +1000)
----------------------------------------------------------------
m68knommu: collection of fixes for 5.10
Fixes include:
. switch to using asm-generic uaccess code
. fix sparse warnings in signal code
. fix compilation of ColdFire MMC support
. support sysrq in ColdFire serial driver
----------------------------------------------------------------
Angelo Dureghello (1):
serial: mcf: add sysrq capability
Greg Ungerer (3):
m68knommu: switch to using asm-generic/uaccess.h
m68knommu: fix sparse warnings in signal code
m68knommu: include SDHC support only when hardware has it
arch/m68k/Kconfig | 1 +
arch/m68k/coldfire/device.c | 6 +-
arch/m68k/include/asm/uaccess.h | 398 ++++++++++++++++++++++++++++++++++++-
arch/m68k/include/asm/uaccess_mm.h | 390 ------------------------------------
arch/m68k/include/asm/uaccess_no.h | 160 ---------------
arch/m68k/kernel/signal.c | 6 +-
drivers/tty/serial/mcf.c | 1 +
7 files changed, 403 insertions(+), 559 deletions(-)
delete mode 100644 arch/m68k/include/asm/uaccess_mm.h
delete mode 100644 arch/m68k/include/asm/uaccess_no.h
next reply other threads:[~2020-10-19 1:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 1:22 Greg Ungerer [this message]
2020-10-20 1:24 ` pr-tracker-bot
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=dae7af98-a47c-4225-b444-21d47cc27307@linux-m68k.org \
--to=gerg@linux-m68k.org \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.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
all inboxes | Powered by JetHome®