From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 31 Dec 2017 18:46:07 +0000 (-0800)
Subject: Merge tag 'tty-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: v4.15~134
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bc7236fbb864ff4bc41416ad45e997cc7f05f64e;p=mirror_ubuntu-bionic-kernel.git

Merge tag 'tty-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull TTY fix from Greg KH:
 "Here is a single tty fix for a reported issue that you wrote the patch
  for :)

  It's been in linux-next for a week or so with no reported issues"

* tag 'tty-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  n_tty: fix EXTPROC vs ICANON interaction with TIOCINQ (aka FIONREAD)
---

bc7236fbb864ff4bc41416ad45e997cc7f05f64e