From f2c36ad394b991ea7e94916b839387ac0c09915e Mon Sep 17 00:00:00 2001 From: Michael MacDonald Date: Mon, 9 Sep 2024 22:02:17 +0000 Subject: [PATCH] Revert "DAOS-16271 mercury: Add patch to check ep for null in UCX key resolve. (#15077)" Not needed in our build (b/364929445). This reverts commit 3d9e2d0cafcb5f314135ba9e7a27dd541102f7c5. --- utils/build.config | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/build.config b/utils/build.config index 92c3bd673d3..f94d0e6a912 100644 --- a/utils/build.config +++ b/utils/build.config @@ -30,4 +30,3 @@ spdk=https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc7566497 ofi=https://github.com/ofiwg/libfabric/commit/d827c6484cc5bf67dfbe395890e258860c3f0979.diff mercury=https://raw.githubusercontent.com/daos-stack/mercury/857f1d5d2ca72d4c1b8d7be5e7fd26d6292b495f/na_ucx_am_send_retry.patch,https://github.com/mercury-hpc/mercury/commit/b8c26fd86281f3b0883c31bd2d0cb467a12b860d.diff,https://github.com/mercury-hpc/mercury/commit/a35589c3d1134d9c80640e78247e210162ac4a3c.diff,https://github.com/mercury-hpc/mercury/commit/fa4abbb6273d975b2ef17ac4e561fd4255d384db.diff fuse=https://github.com/libfuse/libfuse/commit/c9905341ea34ff9acbc11b3c53ba8bcea35eeed8.diff -mercury=https://raw.githubusercontent.com/daos-stack/mercury/481297621bafbbcac4cc6f8feab3f1b6f8b14b59/na_ucx_keyres_epchk.patch