From 5d8d4fbbcb5c5de9370711c19bb3510210989a98 Mon Sep 17 00:00:00 2001 From: Ilya Lipnitskiy Date: Sat, 20 Feb 2021 16:02:15 -0800 Subject: treewide: Run refresh on all packages The crude loop I wrote to come up with this changeset: find -L package/feeds/packages/ -name patches | \ sed 's/patches$/refresh/' | sort | xargs make Signed-off-by: Ilya Lipnitskiy --- kernel/antfs/patches/0001-file.c-Patch-for-Linux-v5.8.patch | 11 ++--------- .../02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch | 9 ++------- 2 files changed, 4 insertions(+), 16 deletions(-) (limited to 'kernel') diff --git a/kernel/antfs/patches/0001-file.c-Patch-for-Linux-v5.8.patch b/kernel/antfs/patches/0001-file.c-Patch-for-Linux-v5.8.patch index 6ca43c66e..ed17550d3 100644 --- a/kernel/antfs/patches/0001-file.c-Patch-for-Linux-v5.8.patch +++ b/kernel/antfs/patches/0001-file.c-Patch-for-Linux-v5.8.patch @@ -1,8 +1,6 @@ -diff --git a/file.c b/file.c -index 105e41c..98d5204 100644 --- a/file.c +++ b/file.c -@@ -625,6 +625,9 @@ static int antfs_readpages(struct file *file, struct address_space *mapping, +@@ -625,6 +625,9 @@ static int antfs_readpages(struct file * unsigned page_idx = nr_pages; pgoff_t page_idx_to_init; bool do_init_page = false; @@ -12,7 +10,7 @@ index 105e41c..98d5204 100644 if (page_offs & (buffer_len - 1)) { /* If initialized size is not on buffer boundary, walk -@@ -660,8 +663,13 @@ static int antfs_readpages(struct file *file, struct address_space *mapping, +@@ -660,8 +663,13 @@ static int antfs_readpages(struct file * } } @@ -26,8 +24,6 @@ index 105e41c..98d5204 100644 if (!err && do_init_page) { /* Initialize stuff past initialized_size with zero. */ page = grab_cache_page(mapping, page_idx_to_init); -diff --git a/libntfs-3g/misc.c b/libntfs-3g/misc.c -index b3ec53a..c5a94de 100644 --- a/libntfs-3g/misc.c +++ b/libntfs-3g/misc.c @@ -38,7 +38,11 @@ void *ntfs_malloc(size_t size) @@ -42,6 +38,3 @@ index b3ec53a..c5a94de 100644 } /** --- -2.30.0 - diff --git a/kernel/macremapper/patches/02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch b/kernel/macremapper/patches/02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch index 43240636f..d103b19af 100644 --- a/kernel/macremapper/patches/02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch +++ b/kernel/macremapper/patches/02-mrm_ctlfile.c-compatibility-with-linux-5.6.patch @@ -8,8 +8,6 @@ Signed-off-by: Ilya Lipnitskiy kernelmod/mrm_ctlfile.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -diff --git a/kernelmod/mrm_ctlfile.c b/kernelmod/mrm_ctlfile.c -index 85a8bf9..ca8e7d8 100644 --- a/kernelmod/mrm_ctlfile.c +++ b/kernelmod/mrm_ctlfile.c @@ -13,6 +13,7 @@ @@ -20,7 +18,7 @@ index 85a8bf9..ca8e7d8 100644 #include #include #include -@@ -80,13 +81,14 @@ mrm_handle_read(struct file *f, char __user *buf, size_t size, loff_t *off) { +@@ -80,13 +81,14 @@ mrm_handle_read(struct file *f, char __u } static long @@ -51,7 +49,7 @@ index 85a8bf9..ca8e7d8 100644 static const struct file_operations _fops = { owner: THIS_MODULE, open: &mrm_handle_open, -@@ -166,6 +176,7 @@ static const struct file_operations _fops = { +@@ -166,6 +176,7 @@ static const struct file_operations _fop read: &mrm_handle_read, unlocked_ioctl: (void*)&mrm_handle_ioctl, }; @@ -59,6 +57,3 @@ index 85a8bf9..ca8e7d8 100644 int mrm_init_ctlfile( void ) { struct proc_dir_entry *pde; --- -2.30.0 - -- cgit