From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 21 Jan 2021 08:37:00 +0000 (+0100)
Subject: Merge 9bb48c82aced ("tty: implement write_iter") into tty-linus
X-Git-Tag: v5.15~1923^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=494e63ee9c9f322c1051acc537ac5b99688f7e58;p=platform%2Fkernel%2Flinux-starfive.git

Merge 9bb48c82aced ("tty: implement write_iter") into tty-linus

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>
---

494e63ee9c9f322c1051acc537ac5b99688f7e58
diff --cc drivers/tty/tty_io.c
index 8034489,338bc4ef..5028626
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@@ -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