release 120

4 files changed, 37 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 299e613ce7..5826cac3fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Summary of changes from v119 to v120
+============================================
+
+Kay Sievers (9):
+      test: remove duplicated EXTRA entry
+      rules: remove last WAIT_FOR_SYSFS, load ppdev, switch scsi_device
+      udevadm: trigger - option to synthesize events and pass them to a socket
+      udevadm: info - resolve devpath if symlink is given
+      udevadm: remove old man page links and compat links for debugging tools
+      udevadm: trigger - fix broken socket option check
+      udevadm: trigger - fix --socket== + --verbose
+      also accept real socket files for RUN+="socket:<path>"
+      persistent device naming: cleanup storage rules
+
+Michael Kralka (1):
+      udevd: serialize events if they refer to the same major:minor number
+
+
 Summary of changes from v118 to v119
 ============================================
 
diff --git a/Makefile b/Makefile
index a560ef32ac..baa3df9b8f 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-VERSION = 119
+VERSION = 120
 
 # set this to make use of syslog
 USE_LOG = true
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9446a68b3c..e087631c30 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,19 @@
+udev 120
+========
+Bugfixes.
+
+The last WAIT_FOR_SYSFS rule is removed from the default rules.
+
+The symlinks to udevadm for the debugging tools: udevmonitor and
+udevtest are no longer created.
+
+The symlinks to the udevadm man page for the old tool names are
+no longer created.
+
+Abstract namespace sockets paths in RUN+="socket:@<path>" rules,
+should be prefixed with '@' to indicate that the path is not a
+real file.
+
 udev 119
 ========
 Bugfixes.
diff --git a/TODO b/TODO
index 7c0407949e..8a217b0fbb 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,6 @@
 These things would be nice to have:
 
-
 These things will change in future udev versions:
-  o warn if BUS, ID, SYSFS are used as keys
-    (they are SUBSYSTEMS, KERNELS, ATTRS now)
-
-  o warn if links to udevadm are used
 
-These things are deprecated and scheduled for removal in a future
-udev version:
-  o some day, remove all symlinks to udevadm
+These things are deprecated and scheduled for removal in a future udev version:
+  o the installation of symlinks to udevadm