linux-kernel - Re: linux-next: manual merge of the percpu 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 for Android: free password hash cracker in your pocket

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

Message-ID: <4AEAB9B1.4000304@kernel.org>
Date:	Fri, 30 Oct 2009 11:02:25 +0100
From:	Tejun Heo <tj@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Rusty Russell <rusty@...tcorp.com.au>,
	Christoph Lameter <cl@...ux-foundation.org>,
	Ingo Molnar <mingo@...e.hu>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Jiri Kosina <jkosina@...e.cz>
Subject: Re: linux-next: manual merge of the percpu tree with Linus' tree

Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the percpu tree got a conflict in mm/percpu.c
> between commit 403a91b1659cb149dbddc5885f892734ae4542d8 ("percpu: allow
> pcpu_alloc() to be called with IRQs off") from Linus' tree and commit
> 0f5e4816dbf38ce9488e611ca2296925c1e90d5e ("percpu: remove some sparse
> warnings") from the percpu tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

I'll pull master into for-next in a few days so that we can do sparse
cleanup pass over the whole tree on the latest tree.

Thanks.

-- 
tejun
--
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/