=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb  1 01:27:29 UTC 2025
On branch cf/5272
nothing to commit, working tree clean
=== applying patch ./V6-0001-parameter-max_log_size-to-truncate-logs.patch
Applied patch to 'doc/src/sgml/config.sgml' with conflicts.
Applied patch to 'src/backend/tcop/postgres.c' cleanly.
Applied patch to 'src/backend/utils/error/elog.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/bin/pg_ctl/t/004_logrotate.pl' cleanly.
Applied patch to 'src/include/utils/elog.h' cleanly.
U doc/src/sgml/config.sgml
diff --cc doc/src/sgml/config.sgml
index a782f10998,86dcebfe36..0000000000
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@@ -7781,18 -7913,18 +7781,32 @@@ log_line_prefix = '%m [%p] %q%u@%d/%a 
        </listitem>
       </varlistentry>
  
++<<<<<<< ours
 +     <varlistentry id="guc-md5-password-warnings" xreflabel="md5_password_warnings">
 +      <term><varname>md5_password_warnings</varname> (<type>boolean</type>)
 +      <indexterm>
 +       <primary><varname>md5_password_warnings</varname> configuration parameter</primary>
++=======
+      <varlistentry id="guc-max-log-size" xreflabel="max_log_size">
+       <term><varname>max_log_size</varname> (<type>integer</type>)
+       <indexterm>
+        <primary><varname>max_log_size</varname> configuration parameter</primary>
++>>>>>>> theirs
        </indexterm>
        </term>
        <listitem>
         <para>
++<<<<<<< ours
 +        Controls whether a <literal>WARNING</literal> about MD5 password
 +        deprecation is produced when a <command>CREATE ROLE</command> or
 +        <command>ALTER ROLE</command> statement sets an MD5-encrypted password.
 +        The default value is <literal>on</literal>.
++=======
+         If greater than zero, each query logged is truncated to this many bytes.
+         Zero disables the setting.
+         If this value is specified without units, it is taken as bytes.
+         This feature is disabled by default.
++>>>>>>> theirs
         </para>
        </listitem>
       </varlistentry>