summaryrefslogtreecommitdiff
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2016-04-01 03:47:07 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-01 06:49:39 +0300
commit5e00bbfbc5ec21e87d24e206bba9fc2cbe6631a1 (patch)
treea63b856fa285275c27b315ff3c9376f462f41f99 /include/linux/blkdev.h
parentda5a0fc6743df9b5a3e9f915a1ed16f45465d529 (diff)
downloadlinux-5e00bbfbc5ec21e87d24e206bba9fc2cbe6631a1.tar.xz
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>
Diffstat (limited to 'include/linux/blkdev.h')
0 files changed, 0 insertions, 0 deletions