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

[Geert Uytterhoeven]

Hi Linus,

On Wed, Jul 10, 2019 at 7:22 AM Greg Ungerer <gerg@xxxxxxxxxxxxxx> 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 -- geert@xxxxxxxxxxxxxx

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