lkml.org 
[lkml]   [2019]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the rtc tree with the omap tree
From
Date


On 09/04/19 10:52 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rtc tree got a conflict in:
>
> drivers/rtc/rtc-omap.c
>
> between commit:
>
> 6256f7f7f217 ("rtc: OMAP: Add support for rtc-only mode")
>
> from the omap tree and commit:
>
> 35118b7a4ea0 ("rtc: omap: let the core handle range")
>
> from the rtc tree.
>
> I fixed it up (I used the latter resolution around tm2bcd() changes) and
> can carry the fix as necessary. This is now fixed as far as linux-next
> is concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging. You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.


Thanks Stephen. I have tested with Latest next and rtc+ddr mode is
functional with an additional fix that Tony is about to queue.

I also reviewed the rtc driver and looks fine.

>

\
 
 \ /
  Last update: 2019-04-09 15:25    [W:0.071 / U:7.860 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site