From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 16 Apr 2017 18:35:34 +0000 (-0700)
Subject: Merge tag 'tty-4.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=032aaf3f9ff9faa039673d95ea95e02ddff3a26b;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'tty-4.11-rc7' of git://git./linux/kernel/git/gregkh/tty

Pull tty fix from Greg KH:
 "Here is a single tty core revert for a patch that was reported to
  cause problems.

  The original issue is one that we have lived with for decades, so
  trying to scramble to fix the fix in time for 4.11-final does not make
  sense due to the fragility of the tty ldisc layer. Just reverting it
  makes sense for now"

* tag 'tty-4.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  Revert "tty: don't panic on OOM in tty_set_ldisc()"
---

032aaf3f9ff9faa039673d95ea95e02ddff3a26b