tty: Fix merge of "tty: Refactor tty_open()"
authorPeter Hurley <peter@hurleysoftware.com>
Fri, 1 Apr 2016 00:47:07 +0000 (17:47 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Apr 2016 03:49:39 +0000 (20:49 -0700)
commit5e00bbfbc5ec21e87d24e206bba9fc2cbe6631a1
treea63b856fa285275c27b315ff3c9376f462f41f99
parentda5a0fc6743df9b5a3e9f915a1ed16f45465d529
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>
drivers/tty/tty_io.c