From mboxrd@z Thu Jan 1 00:00:00 1970 From: Al Viro Subject: Re: linux-next: manual merge of the akpm tree with Linus' tree Date: Wed, 11 Sep 2013 00:55:17 +0100 Message-ID: <20130910235517.GH13318@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> <20130910161302.75efbdd7a3a0e6fccc797804@linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from zeniv.linux.org.uk ([195.92.253.2]:59431 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750971Ab3IJXzT (ORCPT ); Tue, 10 Sep 2013 19:55:19 -0400 Content-Disposition: inline In-Reply-To: <20130910161302.75efbdd7a3a0e6fccc797804@linux-foundation.org> Sender: linux-next-owner@vger.kernel.org List-ID: To: Andrew Morton Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Torvalds , Dave Chinner , Glauber Costa On Tue, Sep 10, 2013 at 04:13:02PM -0700, Andrew Morton wrote: > > 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". ... which is the end of queue (well, the last one I grabbed, anyway). And it obviously needed to go before the removal of ->shrinker(), not after it, so it got moved up.