Merge branch 'master' into 6.0

diff --cc NEWS
index ba572f01bb3ad10b35c1bd72a92148ca63bfc867,72f022fa38a91d08a676ad322c2dbd7ce8e17f13..5732a561e3f6fc8eef94730b5b96477c7c396273
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,14 -1,11 +1,24 @@@
 +Knot Resolver 6.0.4 (2023-10-05)
 +================================
 +
 +6.0.x are "early access" versions,
 +not generally recommended for production use.
 +
 +6.0 contains biggest changes in the history of Knot Resolver releases.
 +You will have to rewrite your configuration.  See documentation, in particular:
 +https://knot.pages.nic.cz/knot-resolver/upgrading-to-6.html
 +
 +
++
++
+ Knot Resolver 5.x.y (202y-mm-dd)
+ ================================
+ 
+ Bugfixes
+ --------
+ - fix potential SERVFAIL deadlocks if net.ipv6 = false (#880)
+ 
+ 
  Knot Resolver 5.7.0 (2023-08-22)
  ================================