From 1ca43a22ab646902a21391dbe5e366c182cf0ecc Mon Sep 17 00:00:00 2001
From: Flavio Castelli <flavio@castelli.me>
Date: Thu, 1 Jun 2023 10:29:14 +0200
Subject: [PATCH] Add support for WASI port (#1089)

Fix building when the new `wasip1` port is being used.
This is a new target that will be introduced by go 1.21.

For more details https://github.com/golang/go/issues/58141

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9593490bdc0..edd093030a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## HEAD
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 ### Fix flaky submission failures
 * #1084: CT flaky submission failures