Re: [PATCH] Documentation: devres: Sort managed interfaces

[Greg Kroah-Hartman]

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@xxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/