From 3e6ef80706853b98e19078905f8689a9100fa49a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Wed, 11 Mar 2020 09:45:31 +0100
Subject: [PATCH 1/2] Add GitLab identifier to rwlock release note

---
 doc/arm/notes-9.17.0.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/arm/notes-9.17.0.xml b/doc/arm/notes-9.17.0.xml
index c3348fc73f..16111e780a 100644
--- a/doc/arm/notes-9.17.0.xml
+++ b/doc/arm/notes-9.17.0.xml
@@ -43,7 +43,7 @@
           with the notable exception of Ubuntu 18.04 (Bionic) which is a work in
           progress. If you are running on an affected operating system, compile
           BIND 9 with <command>--disable-pthread-rwlock</command> until a fixed
-          version of glibc is available.
+          version of glibc is available. [GL !3125]
         </para>
       </listitem>
       <listitem>

From 6537aaffdcdd974354df0e984cc60074104a77d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Wed, 11 Mar 2020 09:45:31 +0100
Subject: [PATCH 2/2] Reorder release note sections

---
 doc/arm/notes-9.17.0.xml | 44 ++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/doc/arm/notes-9.17.0.xml b/doc/arm/notes-9.17.0.xml
index 16111e780a..7f0227a95b 100644
--- a/doc/arm/notes-9.17.0.xml
+++ b/doc/arm/notes-9.17.0.xml
@@ -30,6 +30,28 @@
     </itemizedlist>
   </section>
 
+  <section xml:id="relnotes-9.17.0-new"><info><title>New Features</title></info>
+    <itemizedlist>
+      <listitem>
+        <para>
+          When a secondary server receives a large incremental zone
+          transfer (IXFR), it can have a negative impact on query
+          performance while the incremental changes are applied to
+          the zone. To address this, <command>named</command> can now
+          limit the size of IXFR responses it sends in response to zone
+          transfer requests. If an IXFR response would be larger than an
+          AXFR of the entire zone, it will send an AXFR resonse instead.
+        </para>
+        <para>
+          This behavior is controlled by the <command>max-ixfr-ratio</command>
+          option - a percentage value representing the ratio of IXFR size
+          to the size of a full zone transfer. The default is
+          <literal>100%</literal>. [GL #1515]
+        </para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
   <section xml:id="relnotes-9.17.0-changes"><info><title>Feature Changes</title></info>
     <itemizedlist>
       <listitem>
@@ -70,26 +92,4 @@
     </itemizedlist>
   </section>
 
-  <section xml:id="relnotes-9.17.0-new"><info><title>New Features</title></info>
-    <itemizedlist>
-      <listitem>
-        <para>
-          When a secondary server receives a large incremental zone
-          transfer (IXFR), it can have a negative impact on query
-          performance while the incremental changes are applied to
-          the zone. To address this, <command>named</command> can now
-          limit the size of IXFR responses it sends in response to zone
-          transfer requests. If an IXFR response would be larger than an
-          AXFR of the entire zone, it will send an AXFR resonse instead.
-        </para>
-        <para>
-          This behavior is controlled by the <command>max-ixfr-ratio</command>
-          option - a percentage value representing the ratio of IXFR size
-          to the size of a full zone transfer. The default is
-          <literal>100%</literal>. [GL #1515]
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
 </section>