Merge 4.15-rc6 into tty-next

We want the ldisc fix here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2018-01-02 15:10:07 +01:00
commit 69c444ba93
805 changed files with 9727 additions and 5642 deletions