lkml.org 
[lkml]   [2014]   [Jul]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [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@glider.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


\
 
 \ /
  Last update: 2014-07-10 02:01    [W:0.057 / U:0.296 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site