projects / linux-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 708d0bf 021c917)
Merge 4.18-rc3 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Jul 2018 06:23:43 +0000 (08:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 2 Jul 2018 06:23:43 +0000 (08:23 +0200)
We want ths tty core changes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/tty/serdev/core.c patch | diff1 | diff2 | blob | history
drivers/tty/vt/vt.c patch | diff1 | diff2 | blob | history

diff --cc drivers/tty/serdev/core.c
Simple merge
diff --cc drivers/tty/vt/vt.c
Simple merge
Linux 6.x block layer and io_uring tree(s)