linux-kernel - Re: linux-next: manual merge of the percpu tree with the slab 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-prev] [day] [month] [year] [list]

Message-ID: <4B14BBAB.90105@cs.helsinki.fi>
Date:	Tue, 01 Dec 2009 08:46:03 +0200
From:	Pekka Enberg <penberg@...helsinki.fi>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Tejun Heo <tj@...nel.org>, 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
Subject: Re: linux-next: manual merge of the percpu tree with the slab tree

Stephen Rothwell kirjoitti:
> Hi all,
> 
> Today's linux-next merge of the percpu tree got a conflict in mm/slab.c
> between commit ce79ddc8e2376a9a93c7d42daf89bfcbb9187e62 ("SLAB: Fix
> lockdep annotations for CPU hotplug") from the slab tree and commit
> 1871e52c76dd95895caeb772f845a1718dcbcd75 ("percpu: make percpu symbols
> under kernel/ and mm/ unique") from the percpu tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

The fixup looks good to me. Thanks, Stephen!

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