* linux-next: manual merge of the mm tree with the execve tree
@ 2022-09-14 5:55 Stephen Rothwell
[not found] ` <20220913230302.00a8c826a2d4ae9a6ef2a90d@linux-foundation.org>
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2022-09-14 5:55 UTC (permalink / raw)
To: Andrew Morton, Kees Cook
Cc: Andrei Vagin, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1294 bytes --]
Hi all,
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.
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.
--
Cheers,
Stephen Rothwell
diff --cc fs/exec.c
index 3f69e5c1a622,afe55d0c3bcf..000000000000
--- a/fs/exec.c
+++ b/fs/exec.c
@@@ -1023,9 -1029,12 +1026,9 @@@ static int exec_mmap(struct mm_struct *
activate_mm(active_mm, mm);
if (IS_ENABLED(CONFIG_ARCH_WANT_IRQS_OFF_ACTIVATE_MM))
local_irq_enable();
- tsk->mm->vmacache_seqnum = 0;
- vmacache_flush(tsk);
task_unlock(tsk);
+ lru_gen_use_mm(mm);
+
- if (vfork)
- timens_on_fork(tsk->nsproxy, tsk);
-
if (old_mm) {
mmap_read_unlock(old_mm);
BUG_ON(active_mm != old_mm);
[-- 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 tree with the execve tree
[not found] ` <20220913230302.00a8c826a2d4ae9a6ef2a90d@linux-foundation.org>
@ 2022-09-14 6:20 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2022-09-14 6:20 UTC (permalink / raw)
To: Andrew Morton
Cc: Kees Cook, Andrei Vagin, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-14 6:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-14 5:55 linux-next: manual merge of the mm tree with the execve tree Stephen Rothwell
[not found] ` <20220913230302.00a8c826a2d4ae9a6ef2a90d@linux-foundation.org>
2022-09-14 6:20 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox