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

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]

Hi all,

Today's linux-next merge of the rtc tree got a conflict in:

  drivers/rtc/rtc-rzn1.c

between commit:

  995832b2cebe6 ("Replace <linux/mod_devicetable.h> by more specific <linux/device-id/*.h> (c files)")

from the origin tree and commit:

  38a3a3b09958d ("rtc: rzn1: Add OF match data to gate SUBU register access")

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.

diff --cc drivers/rtc/rtc-rzn1.c
index 305f10a8a85b6,1e1676a7f3cc9..0000000000000
--- a/drivers/rtc/rtc-rzn1.c
+++ b/drivers/rtc/rtc-rzn1.c
@@@ -16,6 -18,8 +18,7 @@@
  #include <linux/init.h>
  #include <linux/iopoll.h>
  #include <linux/module.h>
 -#include <linux/mod_devicetable.h>
+ #include <linux/of.h>
  #include <linux/platform_device.h>
  #include <linux/pm_runtime.h>
  #include <linux/rtc.h>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]