linux-kernel - Re: [GIT PULL rcu/next] RCU commits for 3.9

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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20130206114925.GF8696@gmail.com>
Date:	Wed, 6 Feb 2013 12:49:25 +0100
From:	Ingo Molnar <mingo@...nel.org>
To:	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>,
	Frédéric Weisbecker 
	<fweisbec@...il.com>
Cc:	mingo@...e.hu, linux-kernel@...r.kernel.org, josh@...htriplett.org,
	rostedt@...dmis.org, rbraun@...en.net, zhong@...ux.vnet.ibm.com,
	markus@...ppelsdorf.de, sasha.levin@...cle.com,
	cody@...ux.vnet.ibm.com, dave@...ux.vnet.ibm.com,
	fweisbec@...il.com, akpm@...ux-foundation.org, tglx@...utronix.de
Subject: Re: [GIT PULL rcu/next] RCU commits for 3.9


btw., I got a non-trivial conflicts in 
kernel/context_tracking.c, with the following commits 
interacting between the RCU tree (tip:core/rcu) and the 
scheduler tree (tip:sched/core):

 6a61671bb2f3 cputime: Safely read cputime of full dynticks CPUs
 abf917cd91cb cputime: Generic on-demand virtual cputime accounting
 4eacdf18374e context_tracking: Add comments on interface and internals
 95a79fd458b8 context_tracking: Export context state for generic vtime

I think I managed to resolve the conflicts (will push it out in 
an hour or two, after some testing) - but please double check me 
on it...

Thanks,

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/