tree 05675db863d0f686a1d6f45e19affb1ef62d7e93
parent 48538861b993255ec6e1012b5af1cfbb8787a4d6
parent a8983d01f9b7d600fbdb3916899edf395954cc83
author Linus Torvalds <torvalds@linux-foundation.org> 1492367734 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1492367734 -0700
mergetag object a8983d01f9b7d600fbdb3916899edf395954cc83
 type commit
 tag tty-4.11-rc7
 tagger Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1492329160 +0200
 
 TTY fix for 4.11-rc7
 
 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.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 
 iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCWPMjIQ8cZ3JlZ0Brcm9h
 aC5jb20ACgkQMUfUDdst+yl+ywCfbEc9XQ2+eDebFSs673OaDUxApmIAoMe+4Qj5
 puBC7ThZvCwrwACsoBWd
 =rugQ
 -----END PGP SIGNATURE-----

Merge tag 'tty-4.11-rc7' of git://git.kernel.org/pub/scm/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()"