From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 30 Apr 2018 12:05:54 +0000 (-0700)
Subject: Merge 4.17-rc3 into char-misc-next
X-Git-Tag: pci-v4.18-changes-2~31^2~50
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=720d690e3680d8ae5fcf86f8614c1a10b4ee7605;p=users%2Fdwmw2%2Flinux.git

Merge 4.17-rc3 into char-misc-next

We want the fixes in here as well.

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

720d690e3680d8ae5fcf86f8614c1a10b4ee7605