]> 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)
commit40d6ecff030f428931254bbb9888691234abead1
treea63b856fa285275c27b315ff3c9376f462f41f99
parent19cf767a00767713d6736cf28830e64e05fdb664
tty: Fix merge of "tty: Refactor tty_open()"

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

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