summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-04-19 12:22:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-04-19 12:22:27 -0700
commit55e3a6ba5cced5b07f9a27fb29c9845937999470 (patch)
tree1588d50579f79d26389ce4eb051aef1555c0c48d /security
parent3ecafda911f4e56cb80149fd7ab87f8610c7765f (diff)
parentc53051128bb0e8754e13345d782ca69e5e1ce36d (diff)
Merge tag 'tty-5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial fixes from Greg KH: "Here are five small fixes for some tty/serial/vt issues that have been reported. The vt one has been around for a while, it is good to finally get that resolved. The others fix a build warning that showed up in 5.1-rc1, and resolve a problem in the sh-sci driver. Note, the second patch for build warning fix for the sc16is7xx driver was just applied to the tree, as it resolves a problem with the previous patch to try to solve the issue. It has not shown up in linux-next yet, unlike all of the other patches, but it has passed 0-day testing and everyone seems to agree that it is correct" * tag 'tty-5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: sc16is7xx: put err_spi and err_i2c into correct #ifdef vt: fix cursor when clearing the screen sc16is7xx: move label 'err_spi' to correct section serial: sh-sci: Fix HSCIF RX sampling point adjustment serial: sh-sci: Fix HSCIF RX sampling point calculation
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions