linux-kernel - linux-next: manual merge of the akpm-current tree with the rcu 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]

Message-ID: <20140908185336.4e5b6baf@canb.auug.org.au>
Date:	Mon, 8 Sep 2014 18:53:36 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Stefan Hengelein <stefan.hengelein@....de>,
	Andreas Ruprecht <rupran@...server.de>,
	Josh Triplett <josh@...htriplett.org>
Subject: linux-next: manual merge of the akpm-current tree with the rcu tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
init/Kconfig between commit d2cf0d24cb2d ("rcu: Fix attempt to avoid
unsolicited offloading of callbacks") from the rcu tree and commit
0c67534a7708 ("init/Kconfig: move RCU_NOCB_CPU dependencies to choice")
from the akpm-current tree.

I fixed it up (a version of the akpm-current tree commit also exists in
the rcu tree, so I used that) and can carry the fix as necessary (no
action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)