Subject: linux-next: manual merge of the char-misc tree with the watchdog tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 9 Jul 2019 18:21:53 +1000

Hi all,

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

  Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt

between commit:

  8c21ead3ea5d ("dt-bindings: watchdog: move i.MX system controller watchdog binding to SCU")

from the watchdog tree and commit:

  c2a6ea23a401 ("dt-bindings: fsl: scu: add ocotp binding")

from the char-misc 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

diff --cc Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
index 1b56557df521,f378922906f6..000000000000
--- a/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
+++ b/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
@@@ -133,16 -133,18 +133,28 @@@ RTC bindings based on SCU Message Proto
  Required properties:
  - compatible: should be "fsl,imx8qxp-sc-rtc";
  
 +Watchdog bindings based on SCU Message Protocol
 +------------------------------------------------------------
 +
 +Required properties:
 +- compatible: should be:
 +              "fsl,imx8qxp-sc-wdt"
 +              followed by "fsl,imx-sc-wdt";
 +Optional properties:
 +- timeout-sec: contains the watchdog timeout in seconds.
 +
+ OCOTP bindings based on SCU Message Protocol
+ ------------------------------------------------------------
+ Required properties:
+ - compatible:		Should be "fsl,imx8qxp-scu-ocotp"
+ - #address-cells:	Must be 1. Contains byte index
+ - #size-cells:		Must be 1. Contains byte length
+ 
+ Optional Child nodes:
+ 
+ - Data cells of ocotp:
+   Detailed bindings are described in bindings/nvmem/nvmem.txt
+ 
  Example (imx8qxp):
  -------------
  aliases {