Hi all,
Today's linux-next merge of the userns tree got a conflict in:
kernel/fork.c
between commit:
d109de6eb40d ("fork/vm: Move common PF_IO_WORKER behavior to new flag")
from the vhost tree and commit:
329b30af470a ("kthread: Generalize pf_io_worker so it can point to struct kthread")
from the userns 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 kernel/fork.c
index e3e7150bcb1a,6f0293cb29c9..000000000000
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@@ -2012,15 -2032,6 +2012,9 @@@ static __latent_entropy struct task_str
siginitsetinv(&p->blocked, sigmask(SIGKILL)|sigmask(SIGSTOP));
}
+ if (args->worker_flags & USER_WORKER)
+ p->flags |= PF_USER_WORKER;
+
- /*
- * This _must_ happen before we call free_task(), i.e. before we jump
- * to any of the bad_fork_* labels. This is to avoid freeing
- * p->set_child_tid which is (ab)used as a kthread's data pointer for
- * kernel threads (PF_KTHREAD).
- */
p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? args->child_tid : NULL;
/*
* Clear TID on mm_release()?
Attachment:
pgpKXwAIa9dUD.pgp
Description: OpenPGP digital signature
