lkml.org 
[lkml]   [2015]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [GIT PULL] RTC for 4.2
From
On Thu, Jun 25, 2015 at 12:16 PM, Alexandre Belloni
<alexandre.belloni@free-electrons.com> wrote:
>
> Here is the pull-request for the RTC susbsystem for 4.2. This is my
> first pull-request to you, don't hesitate to tell me if I need to adjust
> something.

Looks fine, but:

> Conflicts:
> drivers/rtc/Makefile
>
> Trivial add/add conflicts with the mfd tree, solved in linux-next
> Resolution: take both sides.

That's not the resolution I took - the re-sorting of the file made for
more complex.

Can you check my resolution?

Linus


\
 
 \ /
  Last update: 2015-06-26 04:21    [W:0.102 / U:0.124 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site