Messages in this thread | | | Date | Wed, 14 Sep 2022 15:55:33 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the mm tree with the execve tree |
| |
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); [unhandled content-type:application/pgp-signature] | |