linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Tiezhu Yang <yangtiezhu@loongson.cn>
Subject: Re: linux-next: manual merge of the mm-nonmm-stable tree with the userns tree
Date: Thu, 12 May 2022 13:02:20 -0700	[thread overview]
Message-ID: <20220512130220.c9ec9b150c9d5f3848ef3389@linux-foundation.org> (raw)
In-Reply-To: <20220512182215.2b7c4383@canb.auug.org.au>

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.


      reply	other threads:[~2022-05-12 20:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220512130220.c9ec9b150c9d5f3848ef3389@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=ebiederm@xmission.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=yangtiezhu@loongson.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).