Merge branch 'master' into next

2026-05-11 01:38:25 +02:00 · 2021-06-08 14:10:22 +00:00
parent f8b0610c53 abd5cc3cb7
commit 52c84741cf
3 changed files with 1 additions and 14 deletions
--- a/src/patches/collectd-4.10-disk-plugin-fields.patch
+++ b/src/patches/collectd-4.10-disk-plugin-fields.patch
@@ -1,13 +0,0 @@
-diff --git a/src/disk.c b/src/disk.c
-index 4a78f1bd..c6f9e4bd 100644
--- a/src/disk.c
-+++ b/src/disk.c
-@@ -428,7 +428,7 @@ static int disk_read (void)
- 	IOObjectRelease (disk_list);
- /* #endif HAVE_IOKIT_IOKITLIB_H */
- 
-#elif KERNEL_LINUX
-+#elif 0
- 	FILE *fh;
- 	char buffer[1024];
-