From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 6 Nov 2023 18:37:09 +0000 (+0100)
Subject: Merge branch 'master' into 6.0
X-Git-Tag: v6.0.5~17
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fenvironments%2Fdocs-develop-6-0-mvwoqi%2Fdeployments%2F2851;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' into 6.0
---

a31c0b5a4d4cafea3dc6f2cf0e4cba9e94aca095
diff --cc NEWS
index ba572f01b,72f022fa3..5732a561e
--- a/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)
  ================================