linux-next: manual merge of the mailbox tree with the devicetree tree

Hi all,

Today's linux-next merge of the mailbox tree got conflicts in:

Documentation/devicetree/bindings/mailbox/hisilicon,hi3660-mailbox.txt Documentation/devicetree/bindings/mailbox/hisilicon,hi6220-mailbox.txt

between commit:

cfbc5d96e8ff4 ("dt-bindings: mailbox: Delete old 'mailbox.txt' bindings file")

from the devicetree tree and commits:

5e80d2b8ecd02 ("dt-bindings: mailbox: Convert hisilicon,hi6220-mbox to DT schema") 559f3950caa69 ("dt-bindings: mailbox: Convert hisilicon,hi3660-mbox to DT schema")

from the mailbox 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.

(delete the files)