From b62b94c0c51c310f4f237d78ef5db61cff77a501 Mon Sep 17 00:00:00 2001
From: Mikhail Nikalayeu <mihailnikalayeu@gmail.com>
Date: Mon, 3 Nov 2025 20:34:33 +0100
Subject: [PATCH v11 6/6] Revert "Doc: cover index CONCURRENTLY causing errors
 in INSERT ... ON CONFLICT."

Issue fixed, this reverts commit 606df58881bfcdf50eea93d34308591bd3997fb5 with warnings.
---
 doc/src/sgml/ref/insert.sgml         | 9 ---------
 src/backend/optimizer/util/plancat.c | 5 -----
 2 files changed, 14 deletions(-)

diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml
index b337f2ee555..3f139917790 100644
--- a/doc/src/sgml/ref/insert.sgml
+++ b/doc/src/sgml/ref/insert.sgml
@@ -594,15 +594,6 @@ INSERT INTO <replaceable class="parameter">table_name</replaceable> [ AS <replac
     </para>
    </tip>
 
-   <warning>
-    <para>
-      While <command>CREATE INDEX CONCURRENTLY</command> or <command>REINDEX
-      CONCURRENTLY</command> is running on a unique index, <command>INSERT
-      ... ON CONFLICT</command> statements on the same table may unexpectedly
-      fail with a unique violation.
-    </para>
-   </warning>
-
   </refsect2>
  </refsect1>
 
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index d5f6ac8c16a..d0c4386f798 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -789,11 +789,6 @@ find_relation_notnullatts(PlannerInfo *root, Oid relid)
  * the purposes of inference.  If no opclass (or collation) is specified, then
  * all matching indexes (that may or may not match the default in terms of
  * each attribute opclass/collation) are used for inference.
- *
- * Note: during index CONCURRENTLY operations, different transactions
- * may reference different sets of arbiter indexes. This can lead to false
- * unique constraint violations that wouldn't occur during normal operations.
- * For more information, see insert.sgml.
  */
 List *
 infer_arbiter_indexes(PlannerInfo *root)
-- 
2.43.0