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

[Stephen Rothwell]

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 below) 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.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpkmpp2zZAdS.pgp
Description: OpenPGP digital signature