[lkml]   [2012]   [Jul]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the tip tree with the vfs tree
Hi all,

Today's linux-next merge of the tip tree got a conflict in kernel/fork.c
between commit 7ab538da1f8a ("trim task_work: get rid of hlist") from the
vfs tree and commit 0ea86208345b ("sched, mm: Rework sched_{fork,exec}
node assignment") from the tip tree.

Just context changes. I fixed it up (see below) and can carry the fix as
Stephen Rothwell

diff --cc kernel/fork.c
index bebabad,1a69745..0000000
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@@ -1414,8 -1415,7 +1415,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);
+ p->task_works = NULL;

/* Now that the task is set up, run cgroup callbacks if
* necessary. We need to run them before the task is visible
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2012-07-05 07:41    [W:0.033 / U:33.176 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site