From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>,
Andrei Vagin <avagin@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the mm tree with the execve tree
Date: Wed, 14 Sep 2022 16:20:59 +1000 [thread overview]
Message-ID: <20220914162059.731b0461@canb.auug.org.au> (raw)
In-Reply-To: <20220913230302.00a8c826a2d4ae9a6ef2a90d@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 845 bytes --]
Hi Andrew,
[Readded cc's]
On Tue, 13 Sep 2022 23:03:02 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Wed, 14 Sep 2022 15:55:33 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Today's linux-next merge of the mm tree got a conflict in:
> >
> > fs/exec.c
> >
> > between commit:
> >
> > 33a2d6bc3480 ("Revert "fs/exec: allow to unshare a time namespace on vfork+exec"")
> >
> > from the execve tree and commit:
> >
> > 33a2d6bc3480 ("Revert "fs/exec: allow to unshare a time namespace on vfork+exec"")
> >
> > from the mm tree.
>
> Confused. They're the same commit?
Sorry about that (still getting used to copy/paste in a VM on a Mac :-()
The latter one should have been:
65d31cfbc445 ("mm: multi-gen LRU: support page table walks")
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-09-14 6:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-14 5:55 Stephen Rothwell
[not found] ` <20220913230302.00a8c826a2d4ae9a6ef2a90d@linux-foundation.org>
2022-09-14 6:20 ` Stephen Rothwell [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=20220914162059.731b0461@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=avagin@gmail.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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
all inboxes | Powered by JetHome®