tree a63b856fa285275c27b315ff3c9376f462f41f99
parent da5a0fc6743df9b5a3e9f915a1ed16f45465d529
author Peter Hurley <peter@hurleysoftware.com> 1459471627 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1459482579 -0700

tty: Fix merge of "tty: Refactor tty_open()"

Commit e9036d066236 ("tty: Drop krefs for interrupted tty lock")
fixed a tty reference counting problem introduced in
commit 0bfd464d3fdd ("tty: Wait interruptibly for tty lock on reopen"),
so v4.5.0 is correct.

However, commit d6203d0c7b73 ("tty: Refactor tty_open()") moved the
relevant code for 4.6-rc1; correct the merge.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>