Merge branch 'jn/reproducible-build'

diff --git a/Documentation/RelNotes/2.15.1.txt b/Documentation/RelNotes/2.15.1.txt
index a6ae4c1aeb7a2ed4932986e97402545e3608a359..ec06704e637d538d510e8f3a110cfacb3e79d1e4 100644 (file)
--- a/Documentation/RelNotes/2.15.1.txt
+++ b/Documentation/RelNotes/2.15.1.txt
@@ -82,4 +82,7 @@ Fixes since v2.15
  * An ancient bug in "git apply --ignore-space-change" codepath has
    been fixed.
 
+ * There was a recent semantic mismerge in the codepath to write out a
+   section of a configuration section, which has been corrected.
+
 Also contains various documentation updates and code clean-ups.