Yeah, need to fold all these into a PR for 2.4.x probably.

> Am 16.06.2023 um 13:04 schrieb rpl...@apache.org:
> 
> Author: rpluem
> Date: Fri Jun 16 11:04:17 2023
> New Revision: 1910449
> 
> URL: http://svn.apache.org/viewvc?rev=1910449&view=rev
> Log:
> * Add comment [skip ci]
> 
> Modified:
>    httpd/httpd/branches/2.4.x/STATUS
> 
> Modified: httpd/httpd/branches/2.4.x/STATUS
> URL: 
> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1910449&r1=1910448&r2=1910449&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/STATUS (original)
> +++ httpd/httpd/branches/2.4.x/STATUS Fri Jun 16 11:04:17 2023
> @@ -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:
> 
> 

Reply via email to