From 789c220c0e6bfd6f53222016be0f61fb8ab67dbd28787d521f1a7d867b102635 Mon Sep 17 00:00:00 2001 From: nick wang Date: Mon, 6 Jan 2020 07:05:08 +0000 Subject: [PATCH] Accepting request 761065 from home:wanghaisu:branches:network:ha-clustering:Factory Update the without_pr_warning.patch patch OBS-URL: https://build.opensuse.org/request/show/761065 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=104 --- without_pr_warning.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/without_pr_warning.patch b/without_pr_warning.patch index 80a7891..deb64d5 100644 --- a/without_pr_warning.patch +++ b/without_pr_warning.patch @@ -1,20 +1,21 @@ diff -Naur drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/cocci/suse_pr_warning__no_present.cocci drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/cocci/suse_pr_warning__no_present.cocci --- drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/cocci/suse_pr_warning__no_present.cocci 1970-01-01 08:00:00.000000000 +0800 -+++ drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/cocci/suse_pr_warning__no_present.cocci 2020-01-03 16:27:11.508386084 +0800 -@@ -0,0 +1,10 @@ ++++ drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/cocci/suse_pr_warning__no_present.cocci 2020-01-06 14:52:30.740564872 +0800 +@@ -0,0 +1,11 @@ +@outdate_pr_waring@ +identifier func; ++expression list EL; +@@ +func(...) { +<... -+- pr_warning -++ pr_warn ++- pr_warning(EL); +++ pr_warn(EL); +...> +} + diff -Naur drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/gen_patch_names.c drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/gen_patch_names.c ---- drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/gen_patch_names.c 2019-12-26 17:01:19.647961356 +0800 -+++ drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/gen_patch_names.c 2020-01-03 16:31:30.077789676 +0800 +--- drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/gen_patch_names.c 2020-01-06 14:50:00.827751099 +0800 ++++ drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/gen_patch_names.c 2020-01-06 14:50:41.135969904 +0800 @@ -291,6 +291,9 @@ patch(1, "allow_kernel_signal", true, false, COMPAT_HAVE_ALLOW_KERNEL_SIGNAL, "present"); @@ -27,7 +28,7 @@ diff -Naur drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/gen_patch_nam diff -Naur drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/tests/with_pr_warning.c drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/tests/with_pr_warning.c --- drbd-9.0.20~1+git.7dce3c8b.orig/drbd/drbd-kernel-compat/tests/with_pr_warning.c 1970-01-01 08:00:00.000000000 +0800 -+++ drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/tests/with_pr_warning.c 2019-12-26 17:52:57.761698224 +0800 ++++ drbd-9.0.20~1+git.7dce3c8b/drbd/drbd-kernel-compat/tests/with_pr_warning.c 2020-01-06 14:50:41.135969904 +0800 @@ -0,0 +1,8 @@ +#include +