From eaf1bfd9bdd3eb4569e8c67428b2c72019bfb79a Mon Sep 17 00:00:00 2001
From: Jianxin Xiong <jianxin.xiong@intel.com>
Date: Fri, 19 Jan 2024 14:54:51 -0800
Subject: [PATCH] v1.18.3

Signed-off-by: Jianxin Xiong <jianxin.xiong@intel.com>
---
 AUTHORS                  | 1 +
 NEWS.md                  | 8 ++++++++
 configure.ac             | 4 ++--
 fabtests/configure.ac    | 4 ++--
 include/windows/config.h | 2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a3bdaaebdf6..d837b2f63af 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -72,6 +72,7 @@ Evgeny Leksikov <evgeny.leksikov@intel.com>
 Ezra Kissel <ezkissel@indiana.edu>
 Firas Jahjah <firasj@amazon.com>
 Frank Zago <fzago@cray.com>
+Franz Pöschel <franz.poeschel@gmail.com>
 fullerdj <fullerdj@users.noreply.github.com>
 Gal Pressman <galpress@amazon.com>
 Gengbin Zheng <gengbin.zheng@intel.com>
diff --git a/NEWS.md b/NEWS.md
index bb7853971b4..f12a0f21fd1 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -31,12 +31,18 @@ v1.18.3, Mon Jan 22, 2024
 - Add writedata RNR fabtest
 - Handle RNRs from RDMA writedata
 
+## NetDir
+
+- Add missing unlock in error path of nd_send_ack()
+- Release lock prior to returning from nd_send_ack
+
 ## RXM
 
 - Fix data error with FI_OFI_RXM_USE_RNDV_WRITE=1
 
 ## SHM
 
+- Fix coverity issue about resource leak
 - Allocate peer device fds dynamically
 
 ## TCP
@@ -51,6 +57,8 @@ v1.18.3, Mon Jan 22, 2024
 
 ## Util
 
+- Fix coverity issue about missing lock
+- Implement timeout in util_wait_yield_run()
 - memhooks: Fix a bug when calculating mprotect region
 
 ## Verbs
diff --git a/configure.ac b/configure.ac
index 9235d35e985..96452defa80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl
 dnl Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
-dnl Copyright (c) 2019-2023 Intel, Inc.  All rights reserved.
+dnl Copyright (c) 2019-2024 Intel, Inc.  All rights reserved.
 dnl Copyright (c) 2019-2020 Amazon.com, Inc. or its affiliates. All rights reserved.
 dnl (C) Copyright 2020 Hewlett Packard Enterprise Development LP
 dnl Copyright (c) 2022 DataDirect Networks, Inc. All rights reserved.
@@ -8,7 +8,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.60])
-AC_INIT([libfabric], [1.18.3rc1], [ofiwg@lists.openfabrics.org])
+AC_INIT([libfabric], [1.18.3], [ofiwg@lists.openfabrics.org])
 AC_CONFIG_SRCDIR([src/fabric.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(config)
diff --git a/fabtests/configure.ac b/fabtests/configure.ac
index 906b9fcd524..31b7f0f7426 100644
--- a/fabtests/configure.ac
+++ b/fabtests/configure.ac
@@ -1,11 +1,11 @@
 dnl
 dnl Copyright (c) 2016-2017 Cisco Systems, Inc.  All rights reserved.
-dnl Copyright (c) 2018-2023 Intel Corporation, Inc.  All rights reserved.
+dnl Copyright (c) 2018-2024 Intel Corporation, Inc.  All rights reserved.
 dnl
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([fabtests], [1.18.3rc1], [ofiwg@lists.openfabrics.org])
+AC_INIT([fabtests], [1.18.3], [ofiwg@lists.openfabrics.org])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(config)
 AC_CONFIG_HEADERS(config.h)
diff --git a/include/windows/config.h b/include/windows/config.h
index dcfb4ff3ef9..cbbf09bf282 100644
--- a/include/windows/config.h
+++ b/include/windows/config.h
@@ -174,7 +174,7 @@
 #define PACKAGE_TARNAME PACKAGE
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.18.3rc1"
+#define PACKAGE_VERSION "1.18.3"
 
 /* Define to the full name and version of this package. */
 #define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION