Merge tag 'tty-4.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
commitbc7236fbb864ff4bc41416ad45e997cc7f05f64e
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 31 Dec 2017 18:46:07 +0000 (31 10:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 31 Dec 2017 18:46:07 +0000 (31 10:46 -0800)
tree8302c8d2eaba8fa2b8a371d2583b6a70815843c6
parenta9746e4089d6226bdd6b4463e5cdd3b4d1c94059
parent966031f340185eddd05affcf72b740549f056348
Merge tag 'tty-4.15-rc6' of git://git./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)