]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1f5464cc045e4b6ea5457cfb446730e2a265b52d
treea63b856fa285275c27b315ff3c9376f462f41f99
parentad203fb729d566628d76846bec7a9f2c7b3199b3
tty: Fix merge of "tty: Refactor tty_open()"

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

However, commit a8b7f9f5525a ("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