From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753359AbZLAGp6 (ORCPT ); Tue, 1 Dec 2009 01:45:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752936AbZLAGp5 (ORCPT ); Tue, 1 Dec 2009 01:45:57 -0500 Received: from courier.cs.helsinki.fi ([128.214.9.1]:51109 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752150AbZLAGp5 (ORCPT ); Tue, 1 Dec 2009 01:45:57 -0500 Message-ID: <4B14BBAB.90105@cs.helsinki.fi> Date: Tue, 01 Dec 2009 08:46:03 +0200 From: Pekka Enberg User-Agent: Thunderbird 2.0.0.23 (Macintosh/20090812) MIME-Version: 1.0 To: Stephen Rothwell CC: Tejun Heo , Rusty Russell , Christoph Lameter , Ingo Molnar , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the percpu tree with the slab tree References: <20091201174349.f72f36bd.sfr@canb.auug.org.au> In-Reply-To: <20091201174349.f72f36bd.sfr@canb.auug.org.au> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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