linux-kernel - Re: [PATCH] Documentation: devres: Sort managed interfaces

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: <20140709233248.GA12171@kroah.com>
Date:	Wed, 9 Jul 2014 16:32:48 -0700
From:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:	Geert Uytterhoeven <geert+renesas@...der.be>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Documentation: devres: Sort managed interfaces

On Wed, Jul 09, 2014 at 05:26:18PM +0200, Geert Uytterhoeven wrote:
> Sort the list of managed interfaces and their lists of methods
> alphabetically, to reduce the risk of merge conflicts and duplicates.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@...der.be>
> ---
> I got annoyed by the merge conflicts when merging several for-next
> branches a while ago, so I sorted the list after everything became
> quiet.
> ---
>  Documentation/driver-model/devres.txt | 108 +++++++++++++++++-----------------
>  1 file changed, 54 insertions(+), 54 deletions(-)

What tree/version is this against?  I get merge issues with my
driver-core-next tree :(

thanks,

greg k-h
--
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/