2019-07-10 05:51:53

by Greg Ungerer

[permalink] [raw]
Subject: [git pull] m68knommu changes for v5.3


Hi Linus,

Can you please pull the m68knommu git tree, for-next branch.

A series of cleanups for the FLAT format binary loader, binfmt_flat,
from Christoph. The end goal is to support no-MMU on RISC-V, and the
last patch enables that.

Regards
Greg



The following changes since commit 4b972a01a7da614b4796475f933094751a295a2f:

Linux 5.2-rc6 (2019-06-22 16:01:36 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-next

for you to fetch changes up to ad97f9df0fee4ddc9ef056dda4dcbc6630d9f972:

riscv: add binfmt_flat support (2019-06-24 09:16:47 +1000)

----------------------------------------------------------------
Christoph Hellwig (17):
binfmt_flat: remove flat_reloc_valid
binfmt_flat: remove flat_set_persistent
binfmt_flat: provide a default version of flat_get_relocate_addr
binfmt_flat: remove flat_old_ram_flag
binfmt_flat: replace flat_argvp_envp_on_stack with a Kconfig variable
binfmt_flat: remove the uapi <linux/flat.h> header
binfmt_flat: remove the unused OLD_FLAT_FLAG_RAM definition
binfmt_flat: consolidate two version of flat_v2_reloc_t
binfmt_flat: use fixed size type for the on-disk format
binfmt_flat: add endianess annotations
binfmt_flat: add a ARCH_HAS_BINFMT_FLAT option
binfmt_flat: make support for old format binaries optional
binfmt_flat: provide an asm-generic/flat.h
binfmt_flat: remove the persistent argument from flat_get_addr_from_rp
binfmt_flat: move the MAX_SHARED_LIBS definition to binfmt_flat.c
binfmt_flat: don't offset the data start
riscv: add binfmt_flat support

arch/arm/Kconfig | 2 +
arch/arm/include/asm/Kbuild | 1 +
arch/c6x/Kconfig | 1 +
arch/c6x/include/asm/flat.h | 7 +-
arch/h8300/Kconfig | 3 +
arch/h8300/include/asm/flat.h | 7 +-
arch/m68k/Kconfig | 2 +
arch/m68k/include/asm/flat.h | 30 +------
arch/microblaze/Kconfig | 1 +
arch/microblaze/include/asm/flat.h | 7 +-
arch/riscv/Kconfig | 1 +
arch/riscv/include/asm/Kbuild | 1 +
arch/sh/Kconfig | 1 +
arch/sh/include/asm/flat.h | 7 +-
arch/xtensa/Kconfig | 1 +
arch/xtensa/include/asm/flat.h | 7 +-
fs/Kconfig.binfmt | 18 +++-
fs/binfmt_flat.c | 99 ++++++++++++++--------
.../arm/include/asm => include/asm-generic}/flat.h | 19 +----
include/linux/flat.h | 58 +++++++++----
include/uapi/linux/flat.h | 59 -------------
21 files changed, 145 insertions(+), 187 deletions(-)
rename {arch/arm/include/asm => include/asm-generic}/flat.h (55%)
delete mode 100644 include/uapi/linux/flat.h


2019-07-10 07:20:14

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [git pull] m68knommu changes for v5.3

Hi Linus,

On Wed, Jul 10, 2019 at 7:22 AM Greg Ungerer <[email protected]> wrote:
> Can you please pull the m68knommu git tree, for-next branch.
>
> A series of cleanups for the FLAT format binary loader, binfmt_flat,
> from Christoph. The end goal is to support no-MMU on RISC-V, and the
> last patch enables that.

Please note there will be two add/add merge conflicts in
arch/m68k/Kconfig. The correct resolution is to keep the additions from
both sides (and keep them sorted).

Sorry for the troubles.

Thanks!

> The following changes since commit 4b972a01a7da614b4796475f933094751a295a2f:
>
> Linux 5.2-rc6 (2019-06-22 16:01:36 -0700)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-next
>
> for you to fetch changes up to ad97f9df0fee4ddc9ef056dda4dcbc6630d9f972:
>
> riscv: add binfmt_flat support (2019-06-24 09:16:47 +1000)

> arch/m68k/Kconfig | 2 +

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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

2019-07-11 05:41:03

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [git pull] m68knommu changes for v5.3

The pull request you sent on Wed, 10 Jul 2019 15:22:09 +1000:

> git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-next

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/398364a35daed7361e76c3666fb9a97792edce09

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker