linux-kernel - linux-next: manual merge of the rcu tree with Linus' 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110927151454.9892b23391f20bea20741c21@canb.auug.org.au>
Date:	Tue, 27 Sep 2011 15:14:54 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hidetoshi Seto <seto.hidetoshi@...fujitsu.com>,
	Borislav Petkov <borislav.petkov@....com>,
	Frederic Weisbecker <fweisbec@...il.com>
Subject: linux-next: manual merge of the rcu tree with Linus' tree

Hi Paul,

Today's linux-next merge of the rcu tree got a conflict in
arch/x86/kernel/cpu/mcheck/mce.c between commit b77e70bf3535 ("x86, mce:
Replace MCE_SELF_VECTOR by irq_work") from Linus' tree and commit
ef14aea88fee ("x86: Call idle notifier after irq_enter()") from the rcu
tree.

The commit in Linus' tree seem to superced the need for the rcu tree
patch ... so I effectively dropped the rcu tree change to this file.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped