Me again... On 13/07/2017 at 11:22:39 +0200, Alexandre Belloni wrote: > On 13/07/2017 at 11:01:51 +0200, Alexandre Belloni wrote: > > Hi Linus, > > > > Here is the pull-request for the RTC subsystem for 4.13. > > > > And I forgot to add that you will see a small Add/Add merge conflict in > tools/testing/selftests/timers/Makefile which is easy to solve. > And its not actually add/add but both patches are adding a target on a different line. Sorry about the miscommunication, I'll get back to wiping baby poop. -- Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
