summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-21 11:40:55 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-21 11:40:55 +0300
commit3cfade53c77315d018c50ea1ee3420cef1c50fe7 (patch)
treed5ae53cb94d00ad205daf3fa8894f5b5c47c0267 /kernel
parent4776a4a0a29c64b954a445ff65848bd376a50fcc (diff)
parentd7fe75cbc23c7d225eee2ef04def239b6603dce7 (diff)
downloadlinux-3cfade53c77315d018c50ea1ee3420cef1c50fe7.tar.xz
Merge branch 'tty-splice' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into tty-next
Fixes both the "splice/sendfile to a tty" and "splice/sendfile from a tty" regression from 5.10. * 'tty-splice' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux: tty: teach the n_tty ICANON case about the new "cookie continuations" too tty: teach n_tty line discipline about the new "cookie continuations" tty: clean up legacy leftovers from n_tty line discipline tty: implement read_iter tty: convert tty_ldisc_ops 'read()' function to take a kernel pointer tty: implement write_iter
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions