Re: linux-next: manual merge of the rtc tree with the omap tree

* Keerthy [190409 13:25]: > > > 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") > > >

Re: linux-next: manual merge of the rtc tree with the omap tree

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

linux-next: manual merge of the rtc tree with the omap tree

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