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

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

Re: [GIT PULL] RTC for 4.2

On Thu, Jun 25, 2015 at 12:16 PM, Alexandre Belloni 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

[GIT PULL] RTC for 4.2

Hi Linus, 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. Conflicts: drivers/rtc/Makefile Trivial add/add conflicts with the mfd tree, solved in linux-next Resolution: take both sides.

[GIT PULL] RTC for 4.2

Hi Linus, 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. Conflicts: drivers/rtc/Makefile Trivial add/add conflicts with the mfd tree, solved in linux-next Resolution: take both sides.

Re: [GIT PULL] RTC for 4.2

On Thu, Jun 25, 2015 at 12:16 PM, Alexandre Belloni alexandre.bell...@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: