lkml.org 
[lkml]   [2015]   [Jun]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] RTC for 4.2
On 25/06/2015 at 18:59:48 -0700, Linus Torvalds wrote :
> 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?
>

I've checked and it is correct. Thanks!

--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com


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