From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Paul E. McKenney" Subject: Re: linux-next: manual merge of the tip tree with the block tree Date: Tue, 22 Jun 2010 14:06:07 -0700 Message-ID: <20100622210607.GN2290@linux.vnet.ibm.com> References: <20100622143121.186fe9c4.sfr@canb.auug.org.au> Reply-To: paulmck@linux.vnet.ibm.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from e8.ny.us.ibm.com ([32.97.182.138]:51295 "EHLO e8.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752199Ab0FVVGO (ORCPT ); Tue, 22 Jun 2010 17:06:14 -0400 Content-Disposition: inline In-Reply-To: <20100622143121.186fe9c4.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Jens Axboe On Tue, Jun 22, 2010 at 02:31:21PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in > fs/fs-writeback.c between commit 79338d2a78ab78efdc1698f1309766a039addf9d > ("writeback: simplify the write back thread queue") from the block tree > and commit b97181f24212f4c29197890ce1b2b9100bcc184d ("fs: remove all rcu > head initializations, except on_stack initializations") from the tip tree. > > This time it is not clear if the RCU updates are needed any more at all, > so for today I just used the version of fs/fs-writeback.c from the block > tree. The current -next tree has gotten rid of all teh RCU_INIT_HEAD, RCU_HEAD, and INIT_RCU_HEAD calls, as it should. Woo-hoo!!! ;-) Thanx, Paul