Merge 5.1-rc6 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Apr 2019 21:14:47 +0000 (23:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Apr 2019 21:14:47 +0000 (23:14 +0200)
commit3a26172437bb5ecdf6921e3ae24730ef37d3c860
tree79b9aee78c58d0138ddf3f5c45ca3fcf35e07958
parentcef62a615d22369d817757d1e4fe64fdf42a401e
parent085b7755808aa11f78ab9377257e1dad2e6fa4bb
Merge 5.1-rc6 into char-misc-next

We want the fixes, and this resolves a merge error in the fastrpc
driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/fastrpc.c
drivers/misc/habanalabs/goya/goya.c