From: NTP Release Engineering <stenn@ntp.org>
Date: Tue, 28 Oct 2025 10:22:57 +0000 (-0700)
Subject: Merge ntp-stage.tal1.ntfo.org:/ntpstage/data/incoming/ntp-stable
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=549ff8345c05fb5b22a795791da72edc5bbfa696;p=thirdparty%2Fntp.git

Merge ntp-stage.tal1.ntfo.org:/ntpstage/data/incoming/ntp-stable
into  ntp-stage.tal1.ntfo.org:/ntpstage/data/incoming/ntp-stable-3053

bk: 69009981BPfpA9IUq5iIcris4m6QVQ
---

549ff8345c05fb5b22a795791da72edc5bbfa696
diff --cc ChangeLog
index aa3b904e29,07d0753a93..ff99c37772
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,8 @@@
  ---
  * [Bug 3960] Remove duplicate ntp.conf.def content, reported by
               Ulrich Windl. <stenn@ntp.org>
+ * [Bug 3053] Frequency prediction algorithm precedence error. <hart@ntp.org>
 +* Update the copyright year.  <stenn@ntp.org>
  * Makefile.am: Another tweak to check-local.  <stenn@ntp.org>
  * cleanup github-specific files.  <stenn@ntp.org>
  * Add COPYRIGHT.md and LICENSE.md.  <stenn@ntp.org>