Hi Al, Today's linux-next merge of the signal tree got a conflict in kernel/fork.c between commit 0ea86208345b (sched, mm: Rework sched_ {fork,exec} node assignment"") from the tip tree and commit 4d82c317564d ("task_work_add: generic process-context callbacks") from the signal tree. I fixed it up (as discussed - see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc kernel/fork.c index 5f7d197,1a1faaf..0000000 --- a/kernel/fork.c +++ b/kernel/fork.c @@@ -1419,6 -1409,8 +1419,7 @@@ static struct task_struct *copy_process * We dont wake it up yet. */ p->group_leader = p; - INIT_LIST_HEAD(&p->thread_group); + INIT_HLIST_HEAD(&p->task_works); /* Now that the task is set up, run cgroup callbacks if * necessary. We need to run them before the task is visible
Attachment:
pgpOZUBx6AW8I.pgp
Description: PGP signature