Merge ntp-devbuild.chi1.ntfo.org:/home/nfs1.chi1/stenn/ntp-stable

into  ntp-devbuild.chi1.ntfo.org:/home/nfs1.chi1/stenn/ntp-stable-3428

bk: 642b8ae4Ht-sPWMw27KeEIczgn9hVg

diff --cc ChangeLog
index cdfd18bb16d836db751ffadeeaa492a2ab2583cc,b57eccfa1e2fe730d0cbc47bcf0961f0a060bb28..d6af397823ae357316b275bbb0cb9ad83621b204
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -68,9 -66,9 +68,11 @@@
    - applied patch by Gerry Garvey
  * [Bug 3432] refclocks that 'write()' should check the result <perlinger@ntp.org>
    - backport from -dev, plus some more work on warnings for unchecked results
+ * [Bug 3428] ntpd spinning consuming CPU on Linux router with full table.
+              Reported by Israel G. Lugo. <hart@ntp.org>
  * [Bug 3103] libopts zsave_warn format string too few arguments <bkorb@gnu.org>
 +* [Bug 2990] multicastclient incorrectly causes bind to broadcast address.
 +             Integrated patch from Brian Utterback. <hart@ntp.org>
  * [Bug 2525] Turn on automake subdir-objects across the project. <hart@ntp.org>
  * [Bug 2410] syslog an error message on panic exceeded. <brian.utterback@oracle.com>
  * Use https in the AC_INIT URLs in configure.ac.  <stenn@ntp.org>

diff --cc ntpd/ntp_io.c
Simple merge