Merge pull request #2561 from msekletar/virtio-blk-by-path

path_id: reintroduce by-path links for virtio block devices

diff --git a/hwdb/70-pointingstick.hwdb b/hwdb/70-pointingstick.hwdb
index 68203317841ffa8dd1203886782055f0279a2d84..b2af467d5f5426705e066b1febb0804afe0feb6c 100644 (file)
--- a/hwdb/70-pointingstick.hwdb
+++ b/hwdb/70-pointingstick.hwdb
@@ -79,6 +79,10 @@
 evdev:name:*DualPoint Stick:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeD620*:pvr*
   POINTINGSTICK_CONST_ACCEL=0.5
 
+# Latitude E6320
+evdev:name:*DualPoint Stick:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeE6320*:pvr*
+  POINTINGSTICK_CONST_ACCEL=2.0
+
 # Latitude E6400
 evdev:name:*DualPoint Stick:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeE6400*:pvr*
   POINTINGSTICK_CONST_ACCEL=1.5

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 3d87e25724bd247706827b5b64d892048c23eed8..3fcec88e945b5a790ec8c828a4c6ec3b83dced17 100644 (file)
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1533,10 +1533,6 @@ int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const st
                 ts = &_ts;
         }
 
-        if (f->tail_entry_monotonic_valid &&
-            ts->monotonic < le64toh(f->header->tail_entry_monotonic))
-                return -EINVAL;
-
 #ifdef HAVE_GCRYPT
         r = journal_file_maybe_append_tag(f, ts->realtime);
         if (r < 0)