Re: [GIT PULL] RTC for 4.2

[Linus Torvalds]

On Thu, Jun 25, 2015 at 12:16 PM, Alexandre Belloni
<alexandre.belloni@xxxxxxxxxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/