fix up backport of tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write...

diff --git a/queue-4.14/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch b/queue-4.14/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch
index 8e0c3214d6f13f855593429df75de2f079f766a4..f3cde9429ca6892852a778fd9eba4cff4e8e9c2d 100644 (file)
--- a/queue-4.14/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch
+++ b/queue-4.14/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  drivers/tty/pty.c        |   14 ++------------
  drivers/tty/tty_buffer.c |   31 +++++++++++++++++++++++++++++++
- include/linux/tty.h      |    3 +++
+ include/linux/tty_flip.h |    3 +++
  3 files changed, 36 insertions(+), 12 deletions(-)
 
 --- a/drivers/tty/pty.c
@@ -106,13 +106,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   *    tty_buffer_init         -       prepare a tty buffer structure
   *    @tty: tty to initialise
   *
---- a/include/linux/tty.h
-+++ b/include/linux/tty.h
-@@ -798,4 +798,7 @@ static inline void proc_tty_unregister_d
- #define tty_info_ratelimited(tty, f, ...) \
-               tty_msg(pr_info_ratelimited, tty, f, ##__VA_ARGS__)
+--- a/include/linux/tty_flip.h
++++ b/include/linux/tty_flip.h
+@@ -39,4 +39,7 @@ static inline int tty_insert_flip_string
+ extern void tty_buffer_lock_exclusive(struct tty_port *port);
+ extern void tty_buffer_unlock_exclusive(struct tty_port *port);
  
 +int tty_insert_flip_string_and_push_buffer(struct tty_port *port,
 +              const unsigned char *chars, size_t cnt);
 +
- #endif
+ #endif /* _LINUX_TTY_FLIP_H */

diff --git a/queue-4.19/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch b/queue-4.19/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch
index 5f48f659dd9115aab08af7a54ac1b6edb7717c73..0076f48b91774591278c91ed11243023b6ff8a51 100644 (file)
--- a/queue-4.19/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch
+++ b/queue-4.19/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  drivers/tty/pty.c        |   14 ++------------
  drivers/tty/tty_buffer.c |   31 +++++++++++++++++++++++++++++++
- include/linux/tty.h      |    3 +++
+ include/linux/tty_flip.h |    3 +++
  3 files changed, 36 insertions(+), 12 deletions(-)
 
 --- a/drivers/tty/pty.c
@@ -106,13 +106,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   *    tty_buffer_init         -       prepare a tty buffer structure
   *    @tty: tty to initialise
   *
---- a/include/linux/tty.h
-+++ b/include/linux/tty.h
-@@ -800,4 +800,7 @@ static inline void proc_tty_unregister_d
- #define tty_info_ratelimited(tty, f, ...) \
-               tty_msg(pr_info_ratelimited, tty, f, ##__VA_ARGS__)
+--- a/include/linux/tty_flip.h
++++ b/include/linux/tty_flip.h
+@@ -39,4 +39,7 @@ static inline int tty_insert_flip_string
+ extern void tty_buffer_lock_exclusive(struct tty_port *port);
+ extern void tty_buffer_unlock_exclusive(struct tty_port *port);
  
 +int tty_insert_flip_string_and_push_buffer(struct tty_port *port,
 +              const unsigned char *chars, size_t cnt);
 +
- #endif
+ #endif /* _LINUX_TTY_FLIP_H */

diff --git a/queue-5.10/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch b/queue-5.10/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch
index 0fbef1bef6af392850c2b1b1f1ff00b4af7212a6..0815f525333ca237c96621a1a33c857e0a409132 100644 (file)
--- a/queue-5.10/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch
+++ b/queue-5.10/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  drivers/tty/pty.c        |   14 ++------------
  drivers/tty/tty_buffer.c |   31 +++++++++++++++++++++++++++++++
- include/linux/tty.h      |    3 +++
+ include/linux/tty_flip.h |    3 +++
  3 files changed, 36 insertions(+), 12 deletions(-)
 
 --- a/drivers/tty/pty.c
@@ -106,13 +106,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   *    tty_buffer_init         -       prepare a tty buffer structure
   *    @port: tty port to initialise
   *
---- a/include/linux/tty.h
-+++ b/include/linux/tty.h
-@@ -798,4 +798,7 @@ static inline void proc_tty_unregister_d
- #define tty_info_ratelimited(tty, f, ...) \
-               tty_msg(pr_info_ratelimited, tty, f, ##__VA_ARGS__)
+--- a/include/linux/tty_flip.h
++++ b/include/linux/tty_flip.h
+@@ -39,4 +39,7 @@ static inline int tty_insert_flip_string
+ extern void tty_buffer_lock_exclusive(struct tty_port *port);
+ extern void tty_buffer_unlock_exclusive(struct tty_port *port);
  
 +int tty_insert_flip_string_and_push_buffer(struct tty_port *port,
 +              const unsigned char *chars, size_t cnt);
 +
- #endif
+ #endif /* _LINUX_TTY_FLIP_H */

diff --git a/queue-5.4/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch b/queue-5.4/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch
index 44f9235104be557beb525672e17377b1a4ecc44d..66c19e678164fa578341c953a8dc5c4876d3c7d9 100644 (file)
--- a/queue-5.4/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch
+++ b/queue-5.4/tty-use-new-tty_insert_flip_string_and_push_buffer-in-pty_write.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  drivers/tty/pty.c        |   14 ++------------
  drivers/tty/tty_buffer.c |   31 +++++++++++++++++++++++++++++++
- include/linux/tty.h      |    3 +++
+ include/linux/tty_flip.h |    3 +++
  3 files changed, 36 insertions(+), 12 deletions(-)
 
 --- a/drivers/tty/pty.c
@@ -106,13 +106,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   *    tty_buffer_init         -       prepare a tty buffer structure
   *    @tty: tty to initialise
   *
---- a/include/linux/tty.h
-+++ b/include/linux/tty.h
-@@ -798,4 +798,7 @@ static inline void proc_tty_unregister_d
- #define tty_info_ratelimited(tty, f, ...) \
-               tty_msg(pr_info_ratelimited, tty, f, ##__VA_ARGS__)
+--- a/include/linux/tty_flip.h
++++ b/include/linux/tty_flip.h
+@@ -39,4 +39,7 @@ static inline int tty_insert_flip_string
+ extern void tty_buffer_lock_exclusive(struct tty_port *port);
+ extern void tty_buffer_unlock_exclusive(struct tty_port *port);
  
 +int tty_insert_flip_string_and_push_buffer(struct tty_port *port,
 +              const unsigned char *chars, size_t cnt);
 +
- #endif
+ #endif /* _LINUX_TTY_FLIP_H */