Refresh the Cinder patches

Add the minor comment-only patch that was requested via a review.
Refresh the rest of the patches against the Cinder master branch.

Change-Id: I0a5f2b052654d36e2be2d86849c2436c0a34c80b
diff --git a/patches/openstack/cinder/sep-sp-rm-copy-volimg.patch b/patches/openstack/cinder/sep-sp-rm-copy-volimg.patch
index da8be40..c15c4a5 100644
--- a/patches/openstack/cinder/sep-sp-rm-copy-volimg.patch
+++ b/patches/openstack/cinder/sep-sp-rm-copy-volimg.patch
@@ -1,22 +1,23 @@
-From d93a652c373a95e8ebcadd6ee002f725deebbdbd Mon Sep 17 00:00:00 2001
+From 18a0deedf635f1aa88afa8a3b3dc108e92df286e Mon Sep 17 00:00:00 2001
 From: Peter Penchev <openstack-dev@storpool.com>
 Date: Mon, 26 Sep 2022 16:04:36 +0300
-Subject: [PATCH 6/7] StorPool: drop copy_image_to_volume() and
+Subject: [PATCH 06/10] StorPool: drop copy_image_to_volume() and
  copy_volume_to_image()
 
 These methods seem to be leftovers from a bygone era when the parent
 driver could not or would not attach volumes safely.
 
 Change-Id: I6e1a9026e677aee6c7ccad908fe6f92dc253762a
+Closes-Bug: #2002996
 ---
  cinder/volume/drivers/storpool.py | 43 -------------------------------
  1 file changed, 43 deletions(-)
 
 diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py
-index cccda8ecb..cdaf0043d 100644
+index c183a506d..956f7ae5a 100644
 --- a/cinder/volume/drivers/storpool.py
 +++ b/cinder/volume/drivers/storpool.py
-@@ -315,49 +315,6 @@ class StorPoolDriver(driver.VolumeDriver):
+@@ -316,49 +316,6 @@ class StorPoolDriver(driver.VolumeDriver):
              'pools': pools
          }
  
@@ -67,5 +68,5 @@
          size = int(new_size) * units.Gi
          name = self._attach.volumeName(volume['id'])
 -- 
-2.35.1
+2.39.2