Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757024AbZGFIBS (ORCPT ); Mon, 6 Jul 2009 04:01:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753569AbZGFIBG (ORCPT ); Mon, 6 Jul 2009 04:01:06 -0400 Received: from courier.cs.helsinki.fi ([128.214.9.1]:55901 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752425AbZGFIBE (ORCPT ); Mon, 6 Jul 2009 04:01:04 -0400 Subject: Re: linux-next: manual merge of the tip tree with the slab tree From: Pekka Enberg To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Paul E. McKenney" , Nick Piggin In-Reply-To: <20090706144051.06d079a5.sfr@canb.auug.org.au> References: <20090706144051.06d079a5.sfr@canb.auug.org.au> Date: Mon, 06 Jul 2009 11:01:07 +0300 Message-Id: <1246867267.4957.5.camel@penberg-laptop> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 7bit X-Mailer: Evolution 2.24.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 762 Lines: 17 On Mon, 2009-07-06 at 14:40 +1000, Stephen Rothwell wrote: > Today's linux-next merge of the tip tree got a conflict in > include/linux/rcupdate.h between commit > 249acdd3fd13d1ec579ff9b1c5273cf5515cd352 ("SLQB slab allocator (try 2)") > from the slab tree and commit 03b042bf1dc14a268a3d65d38b4ec2a4261e8477 > ("rcu: Add synchronize_sched_expedited() primitive") from the tip tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Yup, looks good to me. Thanks, Stephen! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/