Hello community, here is the log from the commit of package ndctl for openSUSE:Factory checked in at 2019-10-25 18:40:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ndctl (Old) and /work/SRC/openSUSE:Factory/.ndctl.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ndctl" Fri Oct 25 18:40:27 2019 rev:24 rq:741996 version:64.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ndctl/ndctl.changes 2019-08-27 15:23:38.336772840 +0200 +++ /work/SRC/openSUSE:Factory/.ndctl.new.2990/ndctl.changes 2019-10-25 18:40:30.683805096 +0200 @@ -1,0 +2,7 @@ +Fri Oct 18 13:14:35 UTC 2019 - Michal Suchanek <msucha...@suse.de> + +- Refresh patches with upstream status: + ndctl-Use-the-same-align-value-as-original-namespace-on-reconfigure.patch + ndctl-ndctl-lib-Fix-duplicate-bus-detection.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ndctl-Use-the-same-align-value-as-original-namespace-on-reconfigure.patch ++++++ --- /var/tmp/diff_new_pack.rgjdBe/_old 2019-10-25 18:40:31.331805712 +0200 +++ /var/tmp/diff_new_pack.rgjdBe/_new 2019-10-25 18:40:31.331805712 +0200 @@ -1,40 +1,40 @@ -From patchwork Wed Aug 7 04:44:16 2019 -X-Patchwork-Submitter: "Aneesh Kumar K.V" <aneesh.ku...@linux.ibm.com> -X-Patchwork-Id: 11080973 +From e81ccd7f062beeae7498d04785fe55c55c857d4b Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" <aneesh.ku...@linux.ibm.com> -To: dan.j.willi...@intel.com -Subject: [PATCH] ndctl: Use the same align value as original namespace on - reconfigure -Date: Wed, 7 Aug 2019 10:14:16 +0530 -Message-Id: <20190807044416.30799-1-aneesh.ku...@linux.ibm.com> +Date: Wed, 7 Aug 2019 10:14:16 +0530 +Subject: [PATCH] ndctl: Reuse the align value from the original namespace on + reconfiguration -When using reconfigure command to add a `name` to the namespace we end +Patch-mainline: expected v67 +Git-commit: e81ccd7f062beeae7498d04785fe55c55c857d4b + +When using reconfigure command to add a 'name' to the namespace we end up updating the align attribute. Avoid this by using the value from the original namespace. Do this only if we are keeping the namespace mode same. Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.ibm.com> +Signed-off-by: Vishal Verma <vishal.l.ve...@intel.com> --- ndctl/namespace.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ndctl/namespace.c b/ndctl/namespace.c -index 1f212a2b3a9b..24e51bb35ae1 100644 +index 67768f34365c..7fb00078646b 100644 --- a/ndctl/namespace.c +++ b/ndctl/namespace.c -@@ -596,6 +596,22 @@ static int validate_namespace_options(struct ndctl_region *region, +@@ -598,6 +598,22 @@ static int validate_namespace_options(struct ndctl_region *region, return -ENXIO; } } else { -+ + /* -+ * If we are tryint to reconfigure with the same namespace mode -+ * Use the align details from the origin namespace. Otherwise ++ * If we are trying to reconfigure with the same namespace mode, ++ * use the align details from the original namespace. Otherwise + * pick the align details from seed namespace + */ + if (ndns && p->mode == ndctl_namespace_get_mode(ndns)) { + struct ndctl_pfn *ns_pfn = ndctl_namespace_get_pfn(ndns); + struct ndctl_dax *ns_dax = ndctl_namespace_get_dax(ndns); ++ + if (ns_pfn) + p->align = ndctl_pfn_get_align(ns_pfn); + else if (ns_dax) @@ -45,3 +45,6 @@ /* * Use the seed namespace alignment as the default if we need * one. If we don't then use PAGE_SIZE so the size_align +-- +2.23.0 + ++++++ ndctl-ndctl-lib-Fix-duplicate-bus-detection.patch ++++++ --- /var/tmp/diff_new_pack.rgjdBe/_old 2019-10-25 18:40:31.351805731 +0200 +++ /var/tmp/diff_new_pack.rgjdBe/_new 2019-10-25 18:40:31.351805731 +0200 @@ -1,10 +1,10 @@ -From patchwork Wed Aug 7 17:51:39 2019 -X-Patchwork-Submitter: Dan Williams <dan.j.willi...@intel.com> -X-Patchwork-Id: 11082723 -Subject: [ndctl PATCH] ndctl/lib: Fix duplicate bus detection +From d961a474be65c8195bb069c470b01f951bd2eb90 Mon Sep 17 00:00:00 2001 From: Dan Williams <dan.j.willi...@intel.com> -Date: Wed, 07 Aug 2019 10:51:39 -0700 -Message-ID: <156520029994.1268132.13388510714364773911.st...@dwillia2-desk3.amr.corp.intel.com> +Date: Wed, 7 Aug 2019 10:51:39 -0700 +Subject: [PATCH] ndctl/lib: Fix duplicate bus detection + +Patch-mainline: expected v67 +Git-commit: d961a474be65c8195bb069c470b01f951bd2eb90 After an ndctl_invalidate() event the next add_bus() invocation attempts to rescan for new bus objects and drop duplicate instances that match @@ -17,8 +17,9 @@ Reported-by: Aneesh Kumar K.V <aneesh.ku...@linux.ibm.com> Tested-by: Aneesh Kumar K.V <aneesh.ku...@linux.ibm.com> Signed-off-by: Dan Williams <dan.j.willi...@intel.com> +Signed-off-by: Vishal Verma <vishal.l.ve...@intel.com> --- - ndctl/lib/libndctl.c | 4 +++- + ndctl/lib/libndctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c @@ -36,3 +37,6 @@ free_bus(bus, NULL); free(path); return bus_dup; +-- +2.23.0 +