* linux-next: manual merge of the mm-nonmm-stable tree with the userns tree
@ 2022-05-12 8:22 Stephen Rothwell
2022-05-12 20:02 ` Andrew Morton
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2022-05-12 8:22 UTC (permalink / raw)
To: Andrew Morton, Eric W. Biederman
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Tiezhu Yang
[-- Attachment #1: Type: text/plain, Size: 807 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the mm-nonmm-stable tree with the userns tree
2022-05-12 8:22 linux-next: manual merge of the mm-nonmm-stable tree with the userns tree Stephen Rothwell
@ 2022-05-12 20:02 ` Andrew Morton
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2022-05-12 20:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Eric W. Biederman, Linux Kernel Mailing List,
Linux Next Mailing List, Tiezhu Yang
On Thu, 12 May 2022 18:22:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-12 20:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-12 8:22 linux-next: manual merge of the mm-nonmm-stable tree with the userns tree Stephen Rothwell
2022-05-12 20:02 ` Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).