linux-kernel - linux-next: manual merge of the tip tree with the vfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Thu, 5 Jul 2012 15:00:12 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Al Viro <viro@...iv.linux.org.uk>
Subject: linux-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
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

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

Content of type "application/pgp-signature" skipped