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

Hi Alexandre, On Sat, 17 Mar 2018 14:22:52 +0100 Alexandre Belloni wrote: > > I've removed the patch from my tree as there is no point in modifying a > driver that is removed. Thanks for letting me know. -- Cheers, Stephen Rothwell pgpsZMXnkISMY.pgp Description: OpenPGP digital signature

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

Hi Stephen, On 15/03/2018 at 18:59:17 +1100, Stephen Rothwell wrote: > Hi Alexandre, > > Today's linux-next merge of the rtc tree got a conflict in: > > drivers/rtc/rtc-tile.c > > between commit: > > 909ce75a0665 ("rtc: remove tile driver") > > from the asm-generic tree and commit: > >

linux-next: manual merge of the rtc tree with the asm-generic tree

Hi Alexandre, Today's linux-next merge of the rtc tree got a conflict in: drivers/rtc/rtc-tile.c between commit: 909ce75a0665 ("rtc: remove tile driver") from the asm-generic tree and commit: 1fbcb2aa1d64 ("rtc: tile: remove useless message") from the rtc tree. I fixed it up (see belo