Merge 9bb48c82aced ("tty: implement write_iter") into tty-linus
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 21 Jan 2021 08:37:00 +0000 (09:37 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 21 Jan 2021 08:38:37 +0000 (09:38 +0100)
We want the single "splice/sendfile to a tty" regression fix into
tty-linus so it can get into 5.11-final, while the larger patch series
fixing "splice/sendfile from a tty" should wait for 5.12-rc1 so that we
get more testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/tty/tty_io.c

index 8034489337d75241b1a42d781839679446e83d82,338bc4ef55496592226874b90cf9b60b53f3dc9e..502862626b2bcf756944391dbc3bd8e1d866a1fc
@@@ -1063,10 -1068,10 +1067,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