1 files changed, 0 insertions, 43 deletions
diff --git a/recipes-kernel/lttng/lttng-modules/0003-Fix-pipe-stop-using-can_merge-v5.1.patch b/recipes-kernel/lttng/lttng-modules/0003-Fix-pipe-stop-using-can_merge-v5.1.patch
deleted file mode 100644
index bc028537..00000000
--- a/recipes-kernel/lttng/lttng-modules/0003-Fix-pipe-stop-using-can_merge-v5.1.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 9a203973ad3cbefb67a6032fd66e746d19b2d1c3 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 18 Mar 2019 16:20:34 -0400
-Subject: [PATCH 3/5] Fix: pipe: stop using ->can_merge (v5.1)
-
-See upstream commit:
-
-  commit 01e7187b41191376cee8bea8de9f907b001e87b4
-  Author: Jann Horn <jannh@google.com>
-  Date:   Wed Jan 23 15:19:18 2019 +0100
-
-    pipe: stop using ->can_merge
-
-    Al Viro pointed out that since there is only one pipe buffer type to which
-    new data can be appended, it isn't necessary to have a ->can_merge field in
-    struct pipe_buf_operations, we can just check for a magic type.
-
-Upstream-Status: Backport [http://git.lttng.org/?p=lttng-modules.git;a=commit;h=d6cd2c9598a06f0ba1ba885bbe754e8836528310]
-
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- lib/ringbuffer/ring_buffer_splice.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/ringbuffer/ring_buffer_splice.c b/lib/ringbuffer/ring_buffer_splice.c
-index 8d14666..93cad29 100644
---- a/lib/ringbuffer/ring_buffer_splice.c
-+++ b/lib/ringbuffer/ring_buffer_splice.c
-@@ -56,7 +56,9 @@ static void lib_ring_buffer_pipe_buf_release(struct pipe_inode_info *pipe,
- }
- 
- static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,1,0))
- 	.can_merge = 0,
-+#endif
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0))
- 	.map = generic_pipe_buf_map,
- 	.unmap = generic_pipe_buf_unmap,
--- 
-2.17.0
-