Merge 5.14-rc5 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Aug 2021 06:57:03 +0000 (08:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Aug 2021 06:57:03 +0000 (08:57 +0200)
commit813272ed5238b37c81e448b302048e8008570121
treeaf458b6cbe80309368c86e09e7544ff39145ac7c
parentde0534df93474f268486c486ea7e01b44a478026
parent36a21d51725af2ce0700c6ebcb6b9594aac658a6
Merge 5.14-rc5 into char-misc-next

We need the fixes in here as well, and resolves some merge issues with
the mhi codebase.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/qrtr/mhi.c