Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 10 May 2022 09:44:42 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg Ungerer <gerg@linux-m68k.org>,
        Geert Uytterhoeven <geert@linux-m68k.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Michael Schmitz <schmitzmic@gmail.com>
Subject: linux-next: manual merge of the m68knommu tree with the m68k tree
Message-ID: <20220510094442.26826532@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/vbD7UTZnh34VrwPfwmTliay";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/vbD7UTZnh34VrwPfwmTliay
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the m68knommu tree got a conflict in:

  arch/m68k/kernel/ptrace.c

between commit:

  c862fe70b023 ("m68k: Wire up syscall_trace_enter/leave for m68k")

from the m68k tree and commit:

  0d91043d8bdf ("m68knommu: implement minimal regset support")

from the m68knommu tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc arch/m68k/kernel/ptrace.c
index daebccdd2c09,4349b9c4dd68..000000000000
--- a/arch/m68k/kernel/ptrace.c
+++ b/arch/m68k/kernel/ptrace.c
@@@ -284,3 -292,60 +286,59 @@@ asmlinkage void syscall_trace_leave(voi
  	if (test_thread_flag(TIF_SYSCALL_TRACE))
  		ptrace_report_syscall_exit(task_pt_regs(current), 0);
  }
 -#endif /* CONFIG_COLDFIRE */
+=20
+ #if defined(CONFIG_BINFMT_ELF_FDPIC) && defined(CONFIG_ELF_CORE)
+ /*
+  * Currently the only thing that needs to use regsets for m68k is the
+  * coredump support of the elf_fdpic loader. Implement the minimum
+  * definitions required for that.
+  */
+ static int m68k_regset_get(struct task_struct *target,
+ 			   const struct user_regset *regset,
+ 			   struct membuf to)
+ {
+ 	struct pt_regs *ptregs =3D task_pt_regs(target);
+ 	u32 uregs[ELF_NGREG];
+=20
+ 	ELF_CORE_COPY_REGS(uregs, ptregs);
+ 	return membuf_write(&to, uregs, sizeof(uregs));
+ }
+=20
+ enum m68k_regset {
+ 	REGSET_GPR,
+ #ifdef CONFIG_FPU
+ 	REGSET_FPU,
+ #endif
+ };
+=20
+ static const struct user_regset m68k_user_regsets[] =3D {
+ 	[REGSET_GPR] =3D {
+ 		.core_note_type =3D NT_PRSTATUS,
+ 		.n =3D ELF_NGREG,
+ 		.size =3D sizeof(u32),
+ 		.align =3D sizeof(u16),
+ 		.regset_get =3D m68k_regset_get,
+ 	},
+ #ifdef CONFIG_FPU
+ 	[REGSET_FPU] =3D {
+ 		.core_note_type =3D NT_PRFPREG,
+ 		.n =3D sizeof(struct user_m68kfp_struct) / sizeof(u32),
+ 		.size =3D sizeof(u32),
+ 		.align =3D sizeof(u32),
+ 	}
+ #endif /* CONFIG_FPU */
+ };
+=20
+ static const struct user_regset_view user_m68k_view =3D {
+ 	.name =3D "m68k",
+ 	.e_machine =3D EM_68K,
+ 	.ei_osabi =3D ELF_OSABI,
+ 	.regsets =3D m68k_user_regsets,
+ 	.n =3D ARRAY_SIZE(m68k_user_regsets)
+ };
+=20
+ const struct user_regset_view *task_user_regset_view(struct task_struct *=
task)
+ {
+ 	return &user_m68k_view;
+ }
+ #endif /* CONFIG_BINFMT_ELF_FDPIC && CONFIG_ELF_CORE */

--Sig_/vbD7UTZnh34VrwPfwmTliay
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmJ5p2oACgkQAVBC80lX
0GyTIgf+P3qOJktWHK43hMlsjb31iad0pr3XxwqHDx4UklSB3aVAho5keKErnoEv
vZbfDZ+Uh/+LU8QzLCJnCEzn68OTbRw00z3w3Z0a9W8Gsn7qm4DILbzbzIq2k8+7
w9VAgWLSh3cFsm1BCzAxFSYeCYiULmWGxQyJoA6IgmspireqPDg3C1l47UH8qbot
++MRO4Z47jVgmrhuuxwV8COgc9nookMuXWJCnUmmpraMohW3NxzZxR3oQuZJ0rH1
uMMdYINA1ppK1Nu5N7q0imBqfvxBuyQHiSLziPEnKcuCHgYFKIf4XTyxCEm/IMOo
0YvUvVW+AqDfyjVMM1kbB3oiGzX0DQ==
=LC/E
-----END PGP SIGNATURE-----

--Sig_/vbD7UTZnh34VrwPfwmTliay--