From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: linux-next: manual merge of the akpm tree with the vfs tree Date: Thu, 4 Apr 2013 00:02:53 -0700 Message-ID: <20130404000253.2fc9c75d.akpm@linux-foundation.org> References: <20130404172648.27834d12cbb68338f4b89482@canb.auug.org.au> <20130403235634.6bc72c39.akpm@linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:53719 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763862Ab3DDHCy (ORCPT ); Thu, 4 Apr 2013 03:02:54 -0400 In-Reply-To: <20130403235634.6bc72c39.akpm@linux-foundation.org> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Al Viro , Nathan Zimmer On Wed, 3 Apr 2013 23:56:34 -0700 Andrew Morton wrote: > On Thu, 4 Apr 2013 17:26:48 +1100 Stephen Rothwell wrote: > > > Hi Andrew, > > > > Today's linux-next merge of the akpm tree got a conflict in > > fs/proc/generic.c between several commits from the vfs tree and commit > > "procfs: improve scaling in proc" from the akpm tree. > > > > I just dropped the akpm tree patch (and the following > > "procfs-improve-scaling-in-proc-v5") as the conflicts are a bit complex. > > Well perhaps the vfs tree should start paying some attention to the > rest of the world, particularly after -rc5. I can't even find this "lift sb_start_write() out of ->write()". Not on fsdevel, not on lkml. What the heck is it and why was it so important?