On Thu, 12 May 2022 18:22:15 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the mm-nonmm-stable tree got a conflict in:
>
> include/linux/ptrace.h
>
> between commit:
>
> c200e4bb44e8 ("ptrace/um: Replace PT_DTRACE with TIF_SINGLESTEP")
>
> from the userns tree and commit:
>
> a9866bef5171 ("ptrace: fix wrong comment of PT_DTRACE")
>
> from the mm-nonmm-stable tree.
>
> I fixed it up (the former removed the line modified by the latter, so I
> just removed it) 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.
Thanks.
Eric, I'll send that patch to you for inclusion in the userns tree,
please.
