From: Ruediger Pluem <rpluem@apache.org>
Date: Fri, 16 Jun 2023 11:04:17 +0000 (+0000)
Subject: * Add comment [skip ci]
X-Git-Tag: 2.4.58-rc1-candidate~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28d7a4aa34564d3475064cc887041b19d30bdb66;p=thirdparty%2Fapache%2Fhttpd.git

* Add comment [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910449 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 70e0a8b8cc7..580a83e32f7 100644
--- a/STATUS
+++ b/STATUS
@@ -296,6 +296,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         svn merge -c 1910331,1910441 ^/httpd/httpd/trunk .
      +1: icing
      # reset vote due to addition of r1910441
+     rpluem says: r1910441 has a conflict in modules/http2/h2_version.h
+     and the patch for PR 66646 needs to go in before this one to avoid further
+     conflicts.
 
   *) mod_http2: Fix for PR 66646.
      Trunk version of patch: