The following commit has been merged in the master branch: commit dfd9e6d231e157d2066825ed17852cce822c1f46 Merge: c0da4fa0d1a54495d6055c009ac46b76d1da2c86 1da92afbbfcde9dcbbf85cc94ef506c986c7e4a1 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Sep 7 13:23:37 2017 -0700

Merge tag 'mailbox-v4.14' of git://git.linaro.org/landing-teams/working/fujitsu/integration

Pull mailbox updates from Jassi Brar: "Just behavorial changes to a controller driver: the Broadcom's Flexrm mailbox driver has been modifified to support debugfs and TX-Done mechanism by ACK.

Nothing for the core mailbox stack"

* tag 'mailbox-v4.14' of git://git.linaro.org/landing-teams/working/fujitsu/integration: mailbox: bcm-flexrm-mailbox: Use txdone_ack instead of txdone_poll mailbox: bcm-flexrm-mailbox: Use bitmap instead of IDA mailbox: bcm-flexrm-mailbox: Fix mask used in CMPL_START_ADDR_VALUE() mailbox: bcm-flexrm-mailbox: Add debugfs support mailbox: bcm-flexrm-mailbox: Set IRQ affinity hint for FlexRM ring IRQs