From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 29 May 2017 06:18:15 +0000 (+0200)
Subject: Merge 4.12-rc3 into tty-next
X-Git-Tag: v4.13-rc1~183^2~43
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=aa668632ae8c25ffc2d94c865af099cca15944b4;p=users%2Fhch%2Fmisc.git

Merge 4.12-rc3 into tty-next

We need the tty fixes/changes here to handle future work.

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

aa668632ae8c25ffc2d94c865af099cca15944b4