From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 10 Dec 2018 08:22:34 +0000 (+0100)
Subject: Merge 4.20-rc6 into char-misc-next
X-Git-Tag: v5.0-rc1~95^2~19
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563;p=uclinux-h8%2Flinux.git

Merge 4.20-rc6 into char-misc-next

This should resolve the hv driver merge conflict.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563