Messages in this thread | | | Date | Fri, 26 Jun 2015 09:41:24 +0200 | From | Alexandre Belloni <> | Subject | Re: [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
| |