diff --git a/bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch b/bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
new file mode 100644
index 0000000..7acd54e
--- /dev/null
+++ b/bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
@@ -0,0 +1,60 @@
+From e1db89755455dfae9596c648c68a3e731d4419c7 Mon Sep 17 00:00:00 2001
+From: Eric Ren <zren@suse.com>
+Date: Sat, 17 Jun 2017 21:32:40 +0800
+Subject: [PATCH] test: fix read ahead issues in test scripts
+
+We have a SUSE specific kernel patch, which
+tunes the kernel "VM_MAX_READAHEAD" from
+128k to 512k. Thus, some testing scripts are
+affected by this change. See bsc#1043040 for
+more infos.
+
+Signed-off-by: Eric Ren <zren@suse.com>
+---
+ test/shell/lvcreate-usage.sh | 4 ++--
+ test/shell/read-ahead.sh     | 8 +++++++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/test/shell/lvcreate-usage.sh b/test/shell/lvcreate-usage.sh
+index f7b4704..9001b64 100644
+--- a/test/shell/lvcreate-usage.sh
++++ b/test/shell/lvcreate-usage.sh
+@@ -159,10 +159,10 @@ check lv_field $vg/$lv3 lv_read_ahead "8.00k"
+ check lv_field $vg/$lv3 lv_kernel_read_ahead "8.00k"
+ lvcreate -L 8 -n $lv4 --readahead auto $vg
+ check lv_field $vg/$lv4 lv_read_ahead "auto"
+-check lv_field $vg/$lv4 lv_kernel_read_ahead "128.00k"
++check lv_field $vg/$lv4 lv_kernel_read_ahead "512.00k"
+ lvcreate -L 8 -n $lv5 -i2 --stripesize 16k --readahead auto $vg
+ check lv_field $vg/$lv5 lv_read_ahead "auto"
+-check lv_field $vg/$lv5 lv_kernel_read_ahead "128.00k"
++check lv_field $vg/$lv5 lv_kernel_read_ahead "512.00k"
+ lvcreate -L 8 -n $lv6 -i2 --stripesize 128k --readahead auto $vg
+ check lv_field $vg/$lv6 lv_read_ahead "auto"
+ check lv_field $vg/$lv6 lv_kernel_read_ahead "512.00k"
+diff --git a/test/shell/read-ahead.sh b/test/shell/read-ahead.sh
+index 6e4bd35..3f9a9fd 100644
+--- a/test/shell/read-ahead.sh
++++ b/test/shell/read-ahead.sh
+@@ -31,11 +31,17 @@ lvchange -r 640 $vg/$lv
+ check lv_field $vg/$lv lv_read_ahead 640 --units s --nosuffix
+ lvremove -ff $vg
+ 
++#See bsc#1043040
++default_ra=$(blockdev --getra "$dev1")
+ #COMM "read ahead is properly inherited from underlying PV"
+ blockdev --setra 768 "$dev1"
+ vgscan
+ lvcreate -n $lv -L4m $vg "$dev1"
+-test $(blockdev --getra "$DM_DEV_DIR/$vg/$lv") -eq 768
++if [ "$default_ra" -lt 768 ]; then
++	test $(blockdev --getra "$DM_DEV_DIR/$vg/$lv") -eq 768
++else
++	test $(blockdev --getra "$DM_DEV_DIR/$vg/$lv") -eq "$default_ra"
++fi
+ lvremove -ff $vg
+ 
+ # Check default, active/inactive values for read_ahead / kernel_read_ahead
+-- 
+2.10.2
+
diff --git a/device-mapper.changes b/device-mapper.changes
index 9251457..55886ca 100644
--- a/device-mapper.changes
+++ b/device-mapper.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Jun 17 14:56:58 UTC 2017 - zren@suse.com
+
+- Fix test failures about read ahead issue, see bsc#1043040 
+  + bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
+- Reorder the patches to put them into the right groups
+
+-------------------------------------------------------------------
+Fri Jun  9 19:27:45 UTC 2017 - kukuk@suse.com
+
+- Don't package dynamic directories in /run
+
 -------------------------------------------------------------------
 Wed May 17 08:21:27 UTC 2017 - zren@suse.com
 
diff --git a/device-mapper.spec b/device-mapper.spec
index 82c19b4..4901340 100644
--- a/device-mapper.spec
+++ b/device-mapper.spec
@@ -47,7 +47,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
 ### COMMON-PATCH-BEGIN ###
 # Upstream patches
-# SUSE patches: 1000+ for LVM, 2000+ for device mapper
+
+# SUSE patches: 1000+ for LVM
 # Never upstream
 Patch1001:      cmirrord_remove_date_time_from_compilation.patch
 #fate#309425
@@ -64,16 +65,22 @@ Patch1007:      cluster_support_mirrord_log.diff
 Patch1008:      lvconvert-cluster-mirrored-disk-failed.patch
 # no reference
 Patch1009:      pvmove_support_clustered_vg.diff
+#FATE#318413
+Patch1010:      fsadm-add-support-for-btrfs.patch
+#bnc#960744
+Patch1011:      pvcreate-enhance-the-error-message.patch
 #bnc873538
-Patch1010:      fix-closedown-before-thread-finish.patch
+Patch1012:      fix-closedown-before-thread-finish.patch
 #bnc#870824
-Patch1011:      use-mirrortype-asdefault-whenclvmdrunning.patch
+Patch1013:      use-mirrortype-asdefault-whenclvmdrunning.patch
 # no reference
-Patch1012:      version-plugins-in-libdir.patch
+Patch1014:      version-plugins-in-libdir.patch
 #bsc#935623
-Patch1013:      dmeventd-fix-dso-name-wrong-compare.patch
+Patch1015:      dmeventd-fix-dso-name-wrong-compare.patch
 #bsc#960044
-Patch1014:      lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
+Patch1016:      lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
+
+#SUSE patches 2000+ for device mapper, udev rules
 #bsc#479104,bnc#707253
 Patch2000:      device-mapper-dmsetup-export.patch
 # no reference
@@ -84,22 +91,22 @@ Patch2002:      device-mapper-link.patch
 Patch2003:      udev_rules-update.diff
 #bnc#875233
 Patch2004:      udev-Check-for-DM_NR_VALID_PATHS.patch
-#FATE#318413
-Patch2005:      fsadm-add-support-for-btrfs.patch
 #bnc909358
-Patch2006:      Import-ID_FS_XXX-variables-bnc909358.patch
+Patch2005:      Import-ID_FS_XXX-variables-bnc909358.patch
 #bsc#932300
-Patch2007:      10-dm.rules-Reset-state-variable-for-spurious-events.patch
+Patch2006:      10-dm.rules-Reset-state-variable-for-spurious-events.patch
 #bsc#940298
-Patch2008:      libdm-iface-not-output-error-message-inside-retry-loop.patch
-#bnc#960744
-Patch2009:      pvcreate-enhance-the-error-message.patch
+Patch2007:      libdm-iface-not-output-error-message-inside-retry-loop.patch
 #bnc#990538,bnc#986734
-Patch2010:      69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
-#bnc#950089
-Patch2011:      lvm2-testsuite.patch
+Patch2008:      69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
 #bsc#1012973
-Patch2012:      simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
+Patch2009:      simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
+
+# 3000+ for test code
+#bnc#950089
+Patch3001:      lvm2-testsuite.patch
+#bsc#1043040
+Patch3002:      bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
 ### COMMON-PATCH-END ###
 
 %description
@@ -122,6 +129,8 @@ Programs and man pages for configuring and using the device mapper.
 %patch1012 -p1
 %patch1013 -p1
 %patch1014 -p1
+%patch1015 -p1
+%patch1016 -p1
 %patch2000 -p1
 %patch2001 -p1
 %patch2002 -p1
@@ -132,9 +141,8 @@ Programs and man pages for configuring and using the device mapper.
 %patch2007 -p1
 %patch2008 -p1
 %patch2009 -p1
-%patch2010 -p1
-%patch2011 -p1
-%patch2012 -p1
+%patch3001 -p1
+%patch3002 -p1
 ### COMMON-PREP-END ###
 
 %build
diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes
index 9251457..55886ca 100644
--- a/lvm2-clvm.changes
+++ b/lvm2-clvm.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Jun 17 14:56:58 UTC 2017 - zren@suse.com
+
+- Fix test failures about read ahead issue, see bsc#1043040 
+  + bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
+- Reorder the patches to put them into the right groups
+
+-------------------------------------------------------------------
+Fri Jun  9 19:27:45 UTC 2017 - kukuk@suse.com
+
+- Don't package dynamic directories in /run
+
 -------------------------------------------------------------------
 Wed May 17 08:21:27 UTC 2017 - zren@suse.com
 
diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec
index c087819..49907b1 100644
--- a/lvm2-clvm.spec
+++ b/lvm2-clvm.spec
@@ -50,7 +50,8 @@ Obsoletes:      cmirrord < %{version}
 Provides:       cmirrord = %{version}
 ### COMMON-PATCH-BEGIN ###
 # Upstream patches
-# SUSE patches: 1000+ for LVM, 2000+ for device mapper
+
+# SUSE patches: 1000+ for LVM
 # Never upstream
 Patch1001:      cmirrord_remove_date_time_from_compilation.patch
 #fate#309425
@@ -67,16 +68,22 @@ Patch1007:      cluster_support_mirrord_log.diff
 Patch1008:      lvconvert-cluster-mirrored-disk-failed.patch
 # no reference
 Patch1009:      pvmove_support_clustered_vg.diff
+#FATE#318413
+Patch1010:      fsadm-add-support-for-btrfs.patch
+#bnc#960744
+Patch1011:      pvcreate-enhance-the-error-message.patch
 #bnc873538
-Patch1010:      fix-closedown-before-thread-finish.patch
+Patch1012:      fix-closedown-before-thread-finish.patch
 #bnc#870824
-Patch1011:      use-mirrortype-asdefault-whenclvmdrunning.patch
+Patch1013:      use-mirrortype-asdefault-whenclvmdrunning.patch
 # no reference
-Patch1012:      version-plugins-in-libdir.patch
+Patch1014:      version-plugins-in-libdir.patch
 #bsc#935623
-Patch1013:      dmeventd-fix-dso-name-wrong-compare.patch
+Patch1015:      dmeventd-fix-dso-name-wrong-compare.patch
 #bsc#960044
-Patch1014:      lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
+Patch1016:      lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
+
+#SUSE patches 2000+ for device mapper, udev rules
 #bsc#479104,bnc#707253
 Patch2000:      device-mapper-dmsetup-export.patch
 # no reference
@@ -87,22 +94,22 @@ Patch2002:      device-mapper-link.patch
 Patch2003:      udev_rules-update.diff
 #bnc#875233
 Patch2004:      udev-Check-for-DM_NR_VALID_PATHS.patch
-#FATE#318413
-Patch2005:      fsadm-add-support-for-btrfs.patch
 #bnc909358
-Patch2006:      Import-ID_FS_XXX-variables-bnc909358.patch
+Patch2005:      Import-ID_FS_XXX-variables-bnc909358.patch
 #bsc#932300
-Patch2007:      10-dm.rules-Reset-state-variable-for-spurious-events.patch
+Patch2006:      10-dm.rules-Reset-state-variable-for-spurious-events.patch
 #bsc#940298
-Patch2008:      libdm-iface-not-output-error-message-inside-retry-loop.patch
-#bnc#960744
-Patch2009:      pvcreate-enhance-the-error-message.patch
+Patch2007:      libdm-iface-not-output-error-message-inside-retry-loop.patch
 #bnc#990538,bnc#986734
-Patch2010:      69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
-#bnc#950089
-Patch2011:      lvm2-testsuite.patch
+Patch2008:      69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
 #bsc#1012973
-Patch2012:      simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
+Patch2009:      simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
+
+# 3000+ for test code
+#bnc#950089
+Patch3001:      lvm2-testsuite.patch
+#bsc#1043040
+Patch3002:      bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
 ### COMMON-PATCH-END ###
 
 %description
@@ -126,6 +133,8 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
 %patch1012 -p1
 %patch1013 -p1
 %patch1014 -p1
+%patch1015 -p1
+%patch1016 -p1
 %patch2000 -p1
 %patch2001 -p1
 %patch2002 -p1
@@ -136,9 +145,8 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
 %patch2007 -p1
 %patch2008 -p1
 %patch2009 -p1
-%patch2010 -p1
-%patch2011 -p1
-%patch2012 -p1
+%patch3001 -p1
+%patch3002 -p1
 ### COMMON-PREP-END ###
 
 %build
diff --git a/lvm2.changes b/lvm2.changes
index 208d252..55886ca 100644
--- a/lvm2.changes
+++ b/lvm2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jun 17 14:56:58 UTC 2017 - zren@suse.com
+
+- Fix test failures about read ahead issue, see bsc#1043040 
+  + bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
+- Reorder the patches to put them into the right groups
+
 -------------------------------------------------------------------
 Fri Jun  9 19:27:45 UTC 2017 - kukuk@suse.com
 
diff --git a/lvm2.spec b/lvm2.spec
index 34d77ea..90c36cb 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -55,7 +55,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
 ### COMMON-PATCH-BEGIN ###
 # Upstream patches
-# SUSE patches: 1000+ for LVM, 2000+ for device mapper
+
+# SUSE patches: 1000+ for LVM
 # Never upstream
 Patch1001:      cmirrord_remove_date_time_from_compilation.patch
 #fate#309425
@@ -72,16 +73,22 @@ Patch1007:      cluster_support_mirrord_log.diff
 Patch1008:      lvconvert-cluster-mirrored-disk-failed.patch
 # no reference
 Patch1009:      pvmove_support_clustered_vg.diff
+#FATE#318413
+Patch1010:      fsadm-add-support-for-btrfs.patch
+#bnc#960744
+Patch1011:      pvcreate-enhance-the-error-message.patch
 #bnc873538
-Patch1010:      fix-closedown-before-thread-finish.patch
+Patch1012:      fix-closedown-before-thread-finish.patch
 #bnc#870824
-Patch1011:      use-mirrortype-asdefault-whenclvmdrunning.patch
+Patch1013:      use-mirrortype-asdefault-whenclvmdrunning.patch
 # no reference
-Patch1012:      version-plugins-in-libdir.patch
+Patch1014:      version-plugins-in-libdir.patch
 #bsc#935623
-Patch1013:      dmeventd-fix-dso-name-wrong-compare.patch
+Patch1015:      dmeventd-fix-dso-name-wrong-compare.patch
 #bsc#960044
-Patch1014:      lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
+Patch1016:      lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch
+
+#SUSE patches 2000+ for device mapper, udev rules
 #bsc#479104,bnc#707253
 Patch2000:      device-mapper-dmsetup-export.patch
 # no reference
@@ -92,26 +99,26 @@ Patch2002:      device-mapper-link.patch
 Patch2003:      udev_rules-update.diff
 #bnc#875233
 Patch2004:      udev-Check-for-DM_NR_VALID_PATHS.patch
-#FATE#318413
-Patch2005:      fsadm-add-support-for-btrfs.patch
 #bnc909358
-Patch2006:      Import-ID_FS_XXX-variables-bnc909358.patch
+Patch2005:      Import-ID_FS_XXX-variables-bnc909358.patch
 #bsc#932300
-Patch2007:      10-dm.rules-Reset-state-variable-for-spurious-events.patch
+Patch2006:      10-dm.rules-Reset-state-variable-for-spurious-events.patch
 #bsc#940298
-Patch2008:      libdm-iface-not-output-error-message-inside-retry-loop.patch
-#bnc#960744
-Patch2009:      pvcreate-enhance-the-error-message.patch
+Patch2007:      libdm-iface-not-output-error-message-inside-retry-loop.patch
 #bnc#990538,bnc#986734
-Patch2010:      69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
-#bnc#950089
-Patch2011:      lvm2-testsuite.patch
+Patch2008:      69-dm-lvm-metad.rules-Do-not-process-rules-for-multi.patch
 #bsc#1012973
-Patch2012:      simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
+Patch2009:      simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
+
+# 3000+ for test code
+#bnc#950089
+Patch3001:      lvm2-testsuite.patch
+#bsc#1043040
+Patch3002:      bug-1043040_test-fix-read-ahead-issues-in-test-scripts.patch
 ### COMMON-PATCH-END ###
 
 #bsc#1037309
-Patch2013:      Makefile-skip-compliling-daemons-lvmlockd-directory.patch
+Patch4001:      Makefile-skip-compliling-daemons-lvmlockd-directory.patch
 
 %description
 Programs and man pages for configuring and using the LVM2 Logical
@@ -134,6 +141,8 @@ Volume Manager.
 %patch1012 -p1
 %patch1013 -p1
 %patch1014 -p1
+%patch1015 -p1
+%patch1016 -p1
 %patch2000 -p1
 %patch2001 -p1
 %patch2002 -p1
@@ -144,12 +153,11 @@ Volume Manager.
 %patch2007 -p1
 %patch2008 -p1
 %patch2009 -p1
-%patch2010 -p1
-%patch2011 -p1
-%patch2012 -p1
+%patch3001 -p1
+%patch3002 -p1
 ### COMMON-PREP-END ###
 
-%patch2013 -p1
+%patch4001 -p1
 
 %build
 extra_opts="