diff --git a/_service b/_service
index d3835fd..67567ef 100644
--- a/_service
+++ b/_service
@@ -3,9 +3,8 @@
     <param name="url">git@github.com:LINBIT/drbd-9.0.git</param>
     <param name="scm">git</param>
     <param name="filename">drbd</param>
-    <param name="versionformat">9.0.29~1+git.%h</param>
+    <param name="versionformat">9.0.30~1+git.%h</param>
     <param name="revision">drbd-9.0</param>
-    <param name="changesgenerate">disable</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/_servicedata b/_servicedata
deleted file mode 100644
index 3199ecf..0000000
--- a/_servicedata
+++ /dev/null
@@ -1,4 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-                <param name="url">git@github.com:LINBIT/drbd-9.0.git</param>
-              <param name="changesrevision">cc6228800d630a19f2bf37af41bab566011286c0</param></service></servicedata>
diff --git a/compat_genl_maxattr_in_ops.patch b/compat_genl_maxattr_in_ops.patch
deleted file mode 100644
index 4151fc3..0000000
--- a/compat_genl_maxattr_in_ops.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-1. "policy" of "genl_ops" removed in 3b0f31f2b8c9fb348e4530b88f6b64f9621f83d6. Then add back in 48526a0f4ca2b484cab4318dc0b2c2be1d8685b7
-
-diff -Naur drbd-9.0.29~0+git.9a7bc817.orig/drbd/drbd-kernel-compat/gen_patch_names.c drbd-9.0.29~0+git.9a7bc817/drbd/drbd-kernel-compat/gen_patch_names.c
---- drbd-9.0.29~0+git.9a7bc817.orig/drbd/drbd-kernel-compat/gen_patch_names.c	2021-05-07 13:31:20.629024504 +0800
-+++ drbd-9.0.29~0+git.9a7bc817/drbd/drbd-kernel-compat/gen_patch_names.c	2021-05-07 13:33:05.932908956 +0800
-@@ -247,8 +247,10 @@
- 	patch(1, "bio_free", false, true,
- 	      COMPAT_HAVE_BIO_FREE, "present");
- 
-+#if !defined(COMPAT_GENL_MAXATTR_IN_OPS)
- 	patch(1, "genl_policy", false, true,
- 	      COMPAT_GENL_POLICY_IN_OPS, "in_ops");
-+#endif
- 
- 	patch(1, "blk_queue_merge_bvec", false, true,
- 	      COMPAT_HAVE_BLK_QUEUE_MERGE_BVEC, "present");
-diff -Naur drbd-9.0.29~0+git.9a7bc817.orig/drbd/drbd-kernel-compat/tests/genl_maxattr_in_ops.c drbd-9.0.29~0+git.9a7bc817/drbd/drbd-kernel-compat/tests/genl_maxattr_in_ops.c
---- drbd-9.0.29~0+git.9a7bc817.orig/drbd/drbd-kernel-compat/tests/genl_maxattr_in_ops.c	1970-01-01 08:00:00.000000000 +0800
-+++ drbd-9.0.29~0+git.9a7bc817/drbd/drbd-kernel-compat/tests/genl_maxattr_in_ops.c	2021-05-07 13:32:16.452960387 +0800
-@@ -0,0 +1,4 @@
-+#include <net/genetlink.h>
-+
-+struct genl_ops ops = { .maxattr = 1, };
-+
diff --git a/drbd-9.0.29~1+git.cc622880.tar.bz2 b/drbd-9.0.29~1+git.cc622880.tar.bz2
deleted file mode 100644
index 0a3ba8f..0000000
--- a/drbd-9.0.29~1+git.cc622880.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10df370cbd21efb0b1417ae6275e620fe9b27f5a812980c93fb568a1e532be06
-size 371181
diff --git a/drbd-9.0.30~1+git.10bee2d5.tar.bz2 b/drbd-9.0.30~1+git.10bee2d5.tar.bz2
new file mode 100644
index 0000000..23dcd78
--- /dev/null
+++ b/drbd-9.0.30~1+git.10bee2d5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da6711057a07b70c939b9ca6f271eba3e5fa141cdd536a37d8fd182666f52a16
+size 372020
diff --git a/drbd.changes b/drbd.changes
index ee8ab1b..ac8ff65 100644
--- a/drbd.changes
+++ b/drbd.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Jul 21 06:23:09 UTC 2021 - nick wang <nwang@suse.com>
+
+- Update to 9.0.30~1
+ * fix a crash when drbd-9 node gets connected to a drbd-8.4 node, the
+   regression was introduced between 9.0.25 and 9.0.26
+ * A improved approach to serialize rsyncs from multiple sources; the previous
+   one could cause wrong accounting for online verify
+ * fix a race condition that could cause resync operations to stall when the
+   completion of one resync allows another one to proceed
+ * fix a race condition that could cause an online verify operation to not
+   terminate under specific conditions (corking enabled no other IO)
+ * fix locking of drbd_devices idr that caused (very rarely) create/remove
+   minor to fail
+- Remove patch compat_genl_maxattr_in_ops.patch
+- Delete _servicedata file since not used
+
 -------------------------------------------------------------------
 Fri Jun 11 15:28:19 UTC 2021 - nick wang <nwang@suse.com>
 
@@ -22,7 +39,7 @@ Fri Jun 04 13:27:15 UTC 2021 - varkoly@suse.com
 -------------------------------------------------------------------
 Fri May  7 05:53:20 UTC 2021 - nick wang <nwang@suse.com>
 
-- Update to 9.0.29 
+- Update to 9.0.29
  * fix data corruption when DRBD's backing disk is a degraded Linux software
    raid (MD)
  * add correct thawing of IO requests after IO was frozen due to loss of quorum
diff --git a/drbd.spec b/drbd.spec
index 8d45187..12fd10b 100644
--- a/drbd.spec
+++ b/drbd.spec
@@ -24,7 +24,7 @@
 %endif
 %endif
 Name:           drbd
-Version:        9.0.29~1+git.cc622880
+Version:        9.0.30~1+git.10bee2d5
 Release:        0
 Summary:        Linux driver for the "Distributed Replicated Block Device"
 License:        GPL-2.0-or-later
@@ -35,7 +35,6 @@ Source1:        preamble
 Source2:        Module.supported
 Source3:        drbd_git_revision
 Patch1:         fix-resync-finished-with-syncs-have-bits-set.patch
-Patch2:         compat_genl_maxattr_in_ops.patch
 Patch99:        suse-coccinelle.patch
 #https://github.com/openSUSE/rpmlint-checks/blob/master/KMPPolicyCheck.py
 BuildRequires:  coccinelle >= 1.0.8
@@ -70,7 +69,6 @@ installed kernel.
 %prep
 %setup -q -n drbd-%{version}
 %patch1 -p1
-%patch2 -p1
 %patch99 -p1
 
 mkdir source
diff --git a/drbd_git_revision b/drbd_git_revision
index 18b18ec..a4833a5 100644
--- a/drbd_git_revision
+++ b/drbd_git_revision
@@ -1 +1 @@
-GIT-hash: cc6228800d630a19f2bf37af41bab566011286c0
+GIT-hash: 10bee2d57dcbc48836ac61bad434590b7b82917e