diff options
| author | Peter Hurley <[email protected]> | 2016-04-01 00:47:07 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2016-04-01 03:49:39 +0000 |
| commit | 5e00bbfbc5ec21e87d24e206bba9fc2cbe6631a1 (patch) | |
| tree | a63b856fa285275c27b315ff3c9376f462f41f99 /drivers/net/ethernet/intel/e1000/e1000_main.c | |
| parent | tty: Fix UML console breakage (diff) | |
| download | kernel-5e00bbfbc5ec21e87d24e206bba9fc2cbe6631a1.tar.gz kernel-5e00bbfbc5ec21e87d24e206bba9fc2cbe6631a1.zip | |
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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000/e1000_main.c')
0 files changed, 0 insertions, 0 deletions