lkml.org 
[lkml]   [2014]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] Documentation: devres: Sort managed interfaces
On Thu, Jul 10, 2014 at 09:34:33AM +0200, Geert Uytterhoeven wrote:
> Hi Greg,
>
> On Thu, Jul 10, 2014 at 1:32 AM, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> > 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 :(
>
> Ah, I hadn't merged in your driver-core-next tree.
> So it's against v3.16-rc4.
>
> You have on top:
>
> commit b23b35445ec82cde8afac8ba86b57a66a5fa1734
> Author: Daniel Thompson <daniel.thompson@linaro.org>
> Date: Thu Jul 3 10:05:02 2014 +0100
>
> Documentation: devres: Add devm_kmalloc() et al
>
> commit c9d53c0f2d23c792e4b9cf1551b63de4516f839e
> Author: Jingoo Han <jg1.han@samsung.com>
> Date: Wed Jun 11 14:00:05 2014 +0900
>
> devres: remove devm_request_and_ioremap()
>
> Shall I update and resend?

Yes, please do.

thanks,

greg k-h


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