From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Zijlstra Subject: Re: linux-next: build failure after merge of the net-next tree Date: Wed, 18 Dec 2013 12:33:24 +0100 Message-ID: <20131218113324.GA30183@twins.programming.kicks-ass.net> References: <20131218125643.8ff140371e1f8c306327d354@canb.auug.org.au> <20131217.212145.893665929052097867.davem@davemloft.net> <20131217.213033.1019416869378407851.davem@davemloft.net> <20131218101523.GP13532@twins.programming.kicks-ass.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: David Laight Cc: Geert Uytterhoeven , David Miller , Stephen Rothwell , netdev@vger.kernel.org, Linux-Next , linux-kernel@vger.kernel.org, ffusco@redhat.com, dborkman@redhat.com, tgraf@redhat.com, Joe Perches List-Id: linux-next.vger.kernel.org On Wed, Dec 18, 2013 at 11:07:34AM -0000, David Laight wrote: > > > And sort(1) is annoying in that it doesn't do in-place sort; you'll end > > > up with empty files if you try the naive thing. > > > > > > Worse most of those Kbuild files include other random garbage, which > > > makes automated sorting harder still. > > > > > > So unless there's a sane and easy way to keep it sorted; I'm going to > > > ignore that rule. > > > > Not keeping them sorted causes merge conflicts and duplicate/missing > > entries. Surely sorting doesn't cure missing entries. Also sorting can at most reduce merge conflicts, not take them out entirely. > Edit in vi put cursor on the first line to be sorted and type !}sort > (assuming there is a nice blank line at the end). That's a manual operation, and therefore disqualified.