Merge branch 'tty-splice' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds...

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

diff --cc drivers/tty/n_gsm.c
Simple merge

diff --cc drivers/tty/n_tty.c
Simple merge

diff --cc drivers/tty/tty_io.c
index f19a34a,8846d3b..c776374
--- 1/drivers/tty/tty_io.c
--- 2/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@@ -1080,10 -1126,10 +1142,10 @@@ ssize_t redirected_tty_write(struct kio
                fput(p);
                return res;
        }
-       return tty_write(file, buf, count, ppos);
+       return tty_write(iocb, iter);
  }
  
 -/**
 +/*
   *    tty_send_xchar  -       send priority character
   *
   *    Send a high priority character to the tty even if stopped