mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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>,
	gerg@kernel.org
Subject: [git pull] m68knommu changes for v5.19
Date: Mon, 30 May 2022 14:57:24 +1000	[thread overview]
Message-ID: <707bdfb5-a6d5-df4b-4b47-735bde4ec8fd@linux-m68k.org> (raw)

Hi Linus,

Please pull the m68knommu changes for v5.19.

There is a collection of changes to add elf-fdpic loader support for m68k.
Also a collection of various fixes. They include typo corrections, undefined
symbol compilation fixes, removal of the ISA_DMA_API support and removal of
unused code.

I expect you will get a merge conflict in arch/m68k/kernel/ptrace.c.
The change to add some regset support conflicts with recent changes to
syscall_trace_enter/leave. The changes themselves don't interfere with
each other, just the diff context. Remove the conflicting line
"#endif /* CONFIG_COLDFIRE */" to resolve.

Regards
Greg



The following changes since commit 42226c989789d8da4af1de0c31070c96726d990c:

   Linux 5.18-rc7 (2022-05-15 18:08:58 -0700)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git tags/m68knommu-for-v5.19

for you to fetch changes up to 6b8be804ff376f6657ccdf6b29974e7c793d88c4:

   m68knommu: fix 68000 CPU link with no platform selected (2022-05-25 00:04:11 +1000)

----------------------------------------------------------------
m68knommu: changes for linux 5.19

. correctly set up ZERO_PAGE pointer
. drop ISA_DMA_API support
. fix comment typos
. fixes for undefined symbols
. remove unused code and variables
. elf-fdpic loader support for m68k

----------------------------------------------------------------
Arnd Bergmann (1):
       m68k: coldfire: drop ISA_DMA_API support

Greg Ungerer (9):
       m68knommu: set ZERO_PAGE() to the allocated zeroed page
       m68knommu: use asm-generic/mmu.h for nommu setups
       m68knommu: implement minimal regset support
       m68knommu: add definitions to support elf_fdpic program loader
       m68knommu: allow elf_fdpic loader to be selected
       m68knommu: fix undefined reference to `_init_sp'
       m68knommu: fix undefined reference to `mach_get_rtc_pll'
       m68k: removed unused "mach_get_ss"
       m68knommu: fix 68000 CPU link with no platform selected

Julia Lawall (1):
       m68k: fix typos in comments

  arch/m68k/Kconfig.bus               |  10 -
  arch/m68k/Kconfig.cpu               |   2 +-
  arch/m68k/Kconfig.machine           |   1 +
  arch/m68k/coldfire/Makefile         |   2 +-
  arch/m68k/coldfire/dma.c            |  43 ----
  arch/m68k/coldfire/intc.c           |   2 +-
  arch/m68k/coldfire/m53xx.c          |   2 +-
  arch/m68k/coldfire/pci.c            |   2 +-
  arch/m68k/hp300/config.c            |   7 -
  arch/m68k/include/asm/dma.h         | 483 ------------------------------------
  arch/m68k/include/asm/elf.h         |   9 +
  arch/m68k/include/asm/machdep.h     |   1 -
  arch/m68k/include/asm/mmu.h         |   4 +-
  arch/m68k/include/asm/pgtable_no.h  |   3 +-
  arch/m68k/include/uapi/asm/ptrace.h |   5 +
  arch/m68k/kernel/ptrace.c           |  58 +++++
  arch/m68k/kernel/setup_mm.c         |   9 -
  arch/m68k/kernel/setup_no.c         |   1 -
  arch/m68k/kernel/time.c             |   9 +
  arch/m68k/mm/motorola.c             |   1 -
  arch/m68k/q40/config.c              |   7 -
  drivers/mmc/host/Kconfig            |   2 +-
  fs/Kconfig.binfmt                   |   2 +-
  sound/core/Makefile                 |   2 -
  sound/isa/Kconfig                   |   2 +-
  25 files changed, 93 insertions(+), 576 deletions(-)
  delete mode 100644 arch/m68k/coldfire/dma.c

             reply	other threads:[~2022-05-30  4:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-30  4:57 Greg Ungerer [this message]
2022-05-30 18:28 ` 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=707bdfb5-a6d5-df4b-4b47-735bde4ec8fd@linux-m68k.org \
    --to=gerg@linux-m68k.org \
    --cc=geert@linux-m68k.org \
    --cc=gerg@kernel.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®