Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751890Ab3IJXNG (ORCPT ); Tue, 10 Sep 2013 19:13:06 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:40324 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751136Ab3IJXND (ORCPT ); Tue, 10 Sep 2013 19:13:03 -0400 Date: Tue, 10 Sep 2013 16:13:02 -0700 From: Andrew Morton To: Al Viro Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Torvalds , Dave Chinner , Glauber Costa Subject: Re: linux-next: manual merge of the akpm tree with Linus' tree Message-Id: <20130910161302.75efbdd7a3a0e6fccc797804@linux-foundation.org> In-Reply-To: <20130910225934.GF13318@ZenIV.linux.org.uk> References: <20130910143807.4c32d548e08d2184061f52cb@canb.auug.org.au> <20130910152753.662599171456233c5f91edb4@linux-foundation.org> <20130910222924.GB13318@ZenIV.linux.org.uk> <20130910153520.14e49cd32feb16d45eb8abac@linux-foundation.org> <20130910223624.GC13318@ZenIV.linux.org.uk> <20130910154116.cc4afe048213a779040ea3cc@linux-foundation.org> <20130910224823.GE13318@ZenIV.linux.org.uk> <20130910225934.GF13318@ZenIV.linux.org.uk> X-Mailer: Sylpheed 3.2.0beta5 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1266 Lines: 28 On Tue, 10 Sep 2013 23:59:34 +0100 Al Viro wrote: > On Tue, Sep 10, 2013 at 11:48:23PM +0100, Al Viro wrote: > > On Tue, Sep 10, 2013 at 03:41:16PM -0700, Andrew Morton wrote: > > > > > Obtained from where? There are a whole pile of fixes resulting from > > > review and linux-next testing. Are they included? > > > > -next and yes. The trivial ones - folded into the commits they are fixing > > (I mean, ones directly following the commit being fixed). The rest included > > as individual commits. > > > > I'm looking through the DCACHE_LRU_LIST mess right now... > > It's not that bad, actually; I think the variant I've pushed right now > (vfs.git#for-next, head at f5e1dd34561e0fb06400b378d595198918833021) should > be doing the right thing. It ought to cover everything in your branch > in -next from "fs: bump inode and dentry counters to long" on to the > end of queue. That's the correct starting point. The end point should be "staging/lustre/libcfs: cleanup linux-mem.h". -- 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/