re-export commits with SOB lines added

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

3 files changed, 17 insertions, 18 deletions

diff --git a/queue/bpf-sockmap-Require-attach_bpf_fd-when-detaching-a-p.patch b/queue/bpf-sockmap-Require-attach_bpf_fd-when-detaching-a-p.patch
index 2e09e367..4e6a4e85 100644
--- a/queue/bpf-sockmap-Require-attach_bpf_fd-when-detaching-a-p.patch
+++ b/queue/bpf-sockmap-Require-attach_bpf_fd-when-detaching-a-p.patch
@@ -1,4 +1,4 @@
-From a648de0cf2794859f43b2a60ab0e86e7d8331ef3 Mon Sep 17 00:00:00 2001
+From 2bbe43727315d5007acadb61dc2b5ef0ccdefa80 Mon Sep 17 00:00:00 2001
 From: Lorenz Bauer <lmb@cloudflare.com>
 Date: Mon, 29 Jun 2020 10:56:28 +0100
 Subject: [PATCH] bpf: sockmap: Require attach_bpf_fd when detaching a program
@@ -18,6 +18,7 @@ Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface")
 Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
 Signed-off-by: Alexei Starovoitov <ast@kernel.org>
 Link: https://lore.kernel.org/bpf/20200629095630.7933-5-lmb@cloudflare.com
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/include/linux/bpf.h b/include/linux/bpf.h
 index b92ef9f73e42..95911c63508b 100644
diff --git a/queue/ext4-fix-direct-i-o-read-error.patch b/queue/ext4-fix-direct-i-o-read-error.patch
index 3701487d..a8987dac 100644
--- a/queue/ext4-fix-direct-i-o-read-error.patch
+++ b/queue/ext4-fix-direct-i-o-read-error.patch
@@ -1,12 +1,7 @@
-From jiangying8582@126.com  Wed Aug  5 16:29:58 2020
-From: Jiang Ying <jiangying8582@126.com>
-Date: Wed,  5 Aug 2020 15:57:21 +0800
-Subject: ext4: fix direct I/O read error
-To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org
-Cc: wanglong19@meituan.com, heguanjun@meituan.com, jack@suse.cz
-Message-ID: <1596614241-178185-1-git-send-email-jiangying8582@126.com>
-
+From dd49b4c626493b0856ec269fc343e1e9569a63f3 Mon Sep 17 00:00:00 2001
 From: Jiang Ying <jiangying8582@126.com>
+Date: Wed, 5 Aug 2020 15:57:21 +0800
+Subject: [PATCH] ext4: fix direct I/O read error
 
 This patch is used to fix ext4 direct I/O read error when
 the read size is not aligned with block size.
@@ -123,14 +118,13 @@ Co-developed-by: Wang Long <wanglong19@meituan.com>
 Signed-off-by: Wang Long <wanglong19@meituan.com>
 Signed-off-by: Jiang Ying <jiangying8582@126.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
----
- fs/ext4/inode.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
+diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
+index e5327cefc566..7335cff90a7d 100644
 --- a/fs/ext4/inode.c
 +++ b/fs/ext4/inode.c
-@@ -3836,6 +3836,11 @@ static ssize_t ext4_direct_IO_read(struc
+@@ -3872,6 +3872,11 @@ static ssize_t ext4_direct_IO_read(struct kiocb *iocb, struct iov_iter *iter)
  	struct inode *inode = mapping->host;
  	size_t count = iov_iter_count(iter);
  	ssize_t ret;
@@ -142,3 +136,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  	/*
  	 * Shared inode_lock is enough for us - it protects against concurrent
+-- 
+2.27.0
+
diff --git a/queue/selftests-bpf-Fix-detach-from-sockmap-tests.patch b/queue/selftests-bpf-Fix-detach-from-sockmap-tests.patch
index 669e9305..32d5756e 100644
--- a/queue/selftests-bpf-Fix-detach-from-sockmap-tests.patch
+++ b/queue/selftests-bpf-Fix-detach-from-sockmap-tests.patch
@@ -1,4 +1,4 @@
-From f43cb0d672aa8eb09bfdb779de5900c040487d1d Mon Sep 17 00:00:00 2001
+From a292bb0a6cc199c195306b97764febffe35c6d1a Mon Sep 17 00:00:00 2001
 From: Lorenz Bauer <lmb@cloudflare.com>
 Date: Thu, 9 Jul 2020 12:51:51 +0100
 Subject: [PATCH] selftests: bpf: Fix detach from sockmap tests
@@ -17,12 +17,13 @@ Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
 Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
 Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
 Link: https://lore.kernel.org/bpf/20200709115151.75829-1-lmb@cloudflare.com
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 
 diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c
-index 6a12a0e01e07..754cf611723e 100644
+index a3fbc571280a..116aa8f7b691 100644
 --- a/tools/testing/selftests/bpf/test_maps.c
 +++ b/tools/testing/selftests/bpf/test_maps.c
-@@ -789,19 +789,19 @@ static void test_sockmap(unsigned int tasks, void *data)
+@@ -778,19 +778,19 @@ static void test_sockmap(unsigned int tasks, void *data)
  	}
  
  	err = bpf_prog_detach(fd, BPF_SK_SKB_STREAM_PARSER);
@@ -45,7 +46,7 @@ index 6a12a0e01e07..754cf611723e 100644
  		printf("Failed empty msg verdict prog detach\n");
  		goto out_sockmap;
  	}
-@@ -1090,19 +1090,19 @@ static void test_sockmap(unsigned int tasks, void *data)
+@@ -1079,19 +1079,19 @@ static void test_sockmap(unsigned int tasks, void *data)
  		assert(status == 0);
  	}