linux-kernel - Re: linux-next: build failure after merge of the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20131218113324.GA30183@twins.programming.kicks-ass.net>
Date:	Wed, 18 Dec 2013 12:33:24 +0100
From:	Peter Zijlstra <peterz@...radead.org>
To:	David Laight <David.Laight@...LAB.COM>
Cc:	Geert Uytterhoeven <geert@...ux-m68k.org>,
	David Miller <davem@...emloft.net>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	netdev@...r.kernel.org, Linux-Next <linux-next@...r.kernel.org>,
	linux-kernel@...r.kernel.org, ffusco@...hat.com,
	dborkman@...hat.com, tgraf@...hat.com,
	Joe Perches <joe@...ches.com>
Subject: Re: linux-next: build failure after merge of the net-next tree

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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/