diff -Nru lvm2-2.02.133/debian/85-lvm2.rules lvm2-2.02.133/debian/85-lvm2.rules
--- lvm2-2.02.133/debian/85-lvm2.rules	2015-12-10 12:35:18.000000000 +0100
+++ lvm2-2.02.133/debian/85-lvm2.rules	1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-# This file causes block devices with LVM signatures to be automatically
-# added to their volume group.
-# See udev(8) for syntax
-
-SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_FS_TYPE}=="lvm*|LVM*", \
-	RUN+="watershed sh -c '/sbin/lvm vgscan; /sbin/lvm vgchange -a y'"
diff -Nru lvm2-2.02.133/debian/changelog lvm2-2.02.133/debian/changelog
--- lvm2-2.02.133/debian/changelog	2016-02-12 10:53:54.000000000 +0100
+++ lvm2-2.02.133/debian/changelog	2016-03-30 11:08:34.000000000 +0200
@@ -1,3 +1,18 @@
+lvm2 (2.02.133-1ubuntu8) xenial; urgency=medium
+
+  * Drop debian/85-lvm2.rules. This is redundant now, VGs are already
+    auto-assembled via lvmetad and 69-lvm-metad.rules. This gets rid of using
+    watershed, which causes deadlocks due to blocking udev rule processing.
+    (LP: #1560710)
+  * debian/rules: Put back initramfs-tools script to ensure that the root and
+    resume devices are activated (lvmetad is not yet running in the initrd).
+  * debian/rules: Put back activation systemd generator, to assemble LVs in
+    case the admin disabled lvmetad.
+  * Make debian/initramfs-tools/lvm2/scripts/init-premount/lvm2 executable and
+    remove spurious chmod +x Ubuntu delta in debian/rules.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 30 Mar 2016 10:56:49 +0200
+
 lvm2 (2.02.133-1ubuntu7) xenial; urgency=medium
 
   * Build-depend on libcorosync-common-dev and others, instead of
diff -Nru lvm2-2.02.133/debian/control lvm2-2.02.133/debian/control
--- lvm2-2.02.133/debian/control	2016-02-12 10:53:16.000000000 +0100
+++ lvm2-2.02.133/debian/control	2016-03-30 10:53:08.000000000 +0200
@@ -30,7 +30,7 @@
 
 Package: lvm2
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, dmsetup (>> 2:1.02.47), dmeventd (>> 2:1.02.90), initscripts (>= 2.88dsf-13.3), watershed (>= 2), udev (>= 228-2ubuntu2~)
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, dmsetup (>> 2:1.02.47), dmeventd (>> 2:1.02.90), initscripts (>= 2.88dsf-13.3), udev (>= 228-2ubuntu2~)
 Suggests: thin-provisioning-tools
 Breaks: initramfs-tools (<< 0.99), thin-provisioning-tools (<< 0.3.2)
 Replaces: udev (<< 228-2ubuntu2)
diff -Nru lvm2-2.02.133/debian/initramfs-tools/lvm2/hooks/lvm2 lvm2-2.02.133/debian/initramfs-tools/lvm2/hooks/lvm2
--- lvm2-2.02.133/debian/initramfs-tools/lvm2/hooks/lvm2	2015-12-10 12:35:43.000000000 +0100
+++ lvm2-2.02.133/debian/initramfs-tools/lvm2/hooks/lvm2	2016-03-30 10:52:25.000000000 +0200
@@ -26,7 +26,7 @@
 fi
 
 mkdir -p $DESTDIR/lib/udev/rules.d/
-for rules in 56-lvm.rules 60-persistent-storage-lvm.rules 69-lvm-metad.rules 85-lvm2.rules; do
+for rules in 56-lvm.rules 60-persistent-storage-lvm.rules 69-lvm-metad.rules; do
 	if   [ -e /etc/udev/rules.d/$rules ]; then
 		cp -p /etc/udev/rules.d/$rules $DESTDIR/lib/udev/rules.d/
 	elif [ -e /lib/udev/rules.d/$rules ]; then
diff -Nru lvm2-2.02.133/debian/lvm2.install lvm2-2.02.133/debian/lvm2.install
--- lvm2-2.02.133/debian/lvm2.install	2015-12-10 12:35:18.000000000 +0100
+++ lvm2-2.02.133/debian/lvm2.install	2016-03-30 10:52:42.000000000 +0200
@@ -1,5 +1,4 @@
 ../../initramfs-tools/lvm2/* usr/share/initramfs-tools
-../../../debian/85-lvm2.rules /lib/udev/rules.d
 etc/lvm/lvm.conf
 lib/systemd/system/lvm2-lvmetad*
 lib/systemd/system/lvm2-lvmpolld*
diff -Nru lvm2-2.02.133/debian/rules lvm2-2.02.133/debian/rules
--- lvm2-2.02.133/debian/rules	2015-12-10 13:09:15.000000000 +0100
+++ lvm2-2.02.133/debian/rules	2016-03-30 10:56:46.000000000 +0200
@@ -220,7 +220,6 @@
 install_dmsetup: DIR = $(BUILD_DIR)/install_deb
 install_dmsetup: $(STAMPS_DIR)/install_deb install_libdevmapper
 	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
-	chmod +x -R debian/dmsetup/usr/share/initramfs-tools
 	+$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 install_dmsetup-udeb: PACKAGE_NAME = dmsetup-udeb
@@ -286,8 +285,6 @@
 		lvm2-monitor.service \
 		lvm2-lvmetad.socket \
 		lvm2-lvmpolld.socket
-	# superseded by 85-lvm2.rules
-	rm debian/lvm2/lib/systemd/system-generators/lvm2-activation-generator
 	dh_systemd_enable --no-enable \
 		lvm2-lvmetad.service \
 		lvm2-lvmpolld.service
@@ -297,8 +294,6 @@
 	dh_systemd_start --no-restart-on-upgrade \
 		lvm2-lvmetad.socket \
 		lvm2-lvmpolld.socket
-	rm -rf debian/lvm2/usr/share/initramfs-tools/scripts/local-top
-	chmod +x -R debian/lvm2/usr/share/initramfs-tools
 	+$(MAKE_SELF) install-base
 
 install_lvm2-udeb: export DH_OPTIONS = -plvm2-udeb