linux-next: manual merge of the spi-nor tree with the mtd tree

[Stephen Rothwell]

Hi all,

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

  Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml

between commit:

  e9a399caf031 ("dt-bindings: mtd: spi-nor: Drop common properties")

from the mtd tree and commit:

  7f2937efe186 ("dt-bindings: mtd: spi-nor: Add reset-gpios property")

from the spi-nor 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/mtd/jedec,spi-nor.yaml
index 6cc491083650,8a843b9b8673..000000000000
--- a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
+++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
@@@ -70,6 -70,26 +70,12 @@@ properties
        be used on such systems, to denote the absence of a reliable reset
        mechanism.
  
+   reset-gpios:
+     description:
+       A GPIO line connected to the RESET (active low) signal of the device.
+       If "broken-flash-reset" is present then having this property does not
+       make any difference.
+ 
 -  partitions:
 -    type: object
 -
 -  '#address-cells': true
 -  '#size-cells': true
 -
 -patternProperties:
 -  # Note: use 'partitions' node for new users
 -  '^partition@':
 -    type: object
 -
 -  "^otp(-[0-9]+)?$":
 -    type: object
 -
  unevaluatedProperties: false
  
  examples:

Attachment: pgpYln1mXb8LO.pgp
Description: OpenPGP digital signature