On Sat, Dec 19, 2020 at 2:12 PM Alexandre Belloni
<alexandre.belloni@xxxxxxxxxxx> wrote:
>
> Here is the RTC pull request for 5.11. There is a non trivial conflict
> with the tip tree in include/linux/rtc.h.
Heh. That was actually a trivial one - just changes next to each
other, nothing odd.
It just looked scary because of one side of the change involved code
movement, so the conflict diff ended up being big.
But it wasn't actually a bad conflict - I spent more time looking for
that "non trivial" part you warned about than I spent on the conflict
itself ;)
Linus
