From mboxrd@z Thu Jan  1 00:00:00 1970
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
From: =?utf-8?q?Alejandro_S=C3=A1ez_=3Casm=40redhat=2Ecom=3E?=
To: git-commits@fedoraproject.org
Subject: [rpms/golang] f44: Backport mergelocals.go
Date: Tue, 18 Aug 2026 18:11:00 GMT
Message-ID: <178707666038.1.16006662253036381146.rpms-golang-91558dc07119@fedoraproject.org>
List-ID: <git-commits.fedoraproject.org>
X-Git-Repo: rpms/golang
X-Git-Branch: f44
X-Git-Rev: 91558dc07119fa6274d74038cb1bbb4af88b4e07

ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl
cG8gICA6IHJwbXMvZ29sYW5nCiAgICAgICAgICAgIEJyYW5jaCA6IGY0NAogICAgICAgICAgICBD
b21taXQgOiA5MTU1OGRjMDcxMTlmYTYyNzRkNzQwMzhjYjFiYmI0YWY4OGI0ZTA3CiAgICAgICAg
ICAgIEF1dGhvciA6IEFsZWphbmRybyBTw6FleiA8YXNtQHJlZGhhdC5jb20+CiAgICAgICAgICAg
IERhdGUgICA6IDIwMjYtMDgtMThUMTg6NDQ6MjErMDI6MDAKICAgICAgICAgICAgU3RhdHMgIDog
KzEwOS8tMCBpbiAyIGZpbGUocykKICAgICAgICAgICAgVVJMICAgIDogaHR0cHM6Ly9zcmMuZmVk
b3JhcHJvamVjdC5vcmcvcnBtcy9nb2xhbmcvYy85MTU1OGRjMDcxMTlmYTYyNzRkNzQwMzhjYjFi
YmI0YWY4OGI0ZTA3P2JyYW5jaD1mNDQKCiAgICAgICAgICAgIExvZzoKICAgICAgICAgICAgQmFj
a3BvcnQgbWVyZ2Vsb2NhbHMuZ28KCkZpeCBmYWlsaW5nIFRlc3RNZXJnZUxvY2Fsc0ludGVncmF0
aW9uIHRlc3QKCi0tLQpkaWZmIC0tZ2l0IGEvZml4LXMzOTB4LW1lcmdlbG9jYWxzLnBhdGNoIGIv
Zml4LXMzOTB4LW1lcmdlbG9jYWxzLnBhdGNoCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw
MDAwMDAuLjIzMDUyN2EKLS0tIC9kZXYvbnVsbAorKysgYi9maXgtczM5MHgtbWVyZ2Vsb2NhbHMu
cGF0Y2gKQEAgLTAsMCArMSwxMDEgQEAKK0Zyb20gNWQ1YzdmZjFmMDEyYmI3MGQ2NTNjMWEyYjI4
MmVlNDYxNjFiNjkxNCBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKK0Zyb206ICJraHJAZ29sYW5n
Lm9yZyIgPGtockBnb2xhbmcub3JnPgorRGF0ZTogVHVlLCAyMSBKdWwgMjAyNiAwOToxOToyOCAt
MDcwMAorU3ViamVjdDogW1BBVENIXSBjbWQvY29tcGlsZTogZml4IG1lcmdlbG9jYWxzIGZvciBh
cm0zMi9zMzkweC9yaXNjdjY0CisKK0xvd2VyZWRaZXJvIG9uIGFybTMyIGFuZCBzMzkweCBhbHNv
IHRha2UgYW4gZW5kLW9mLXplcm8tcmFuZ2UKK2FkZHJlc3MuIFRoYXQgaW5wdXQgaXMgYWxzbyBh
biBhZGRyZXNzIHNpbmsuCisKK0Fsc28gYWxsb3cgcHJvcGFnYXRpb24gb2YgYWRkcmVzc2VzIGZy
b20gaW5wdXQgdG8gb3V0cHV0IG9mIGEgdmFsdWUsCitzbyB0aGF0IHdlIGhhbmRsZSBhdCBsZWFz
dCBzaW1wbGUgYWRkcmVzcyBhcml0aG1ldGljLiBUaGlzIGlzIHJlcXVpcmVkCit0byBmaXggcmlz
Y3Y2NCBiZWNhdXNlIGl0IGhhcyBubyBpbmRleGVkIGxvYWQvc3RvcmUsIGFuZCB0aHVzIGRvZXMK
K2EgYnVuY2ggbW9yZSBleHBsaWNpdCBhZGRyZXNzIGFyaXRobWV0aWMgdGhhbiBvdGhlciBhcmNo
cy4KKworRml4ZXMgIzgwNDg0CisKK0NoYW5nZS1JZDogSTEyNmVlYzFlMmNjNmMyYWI1YTM5NjEx
Y2NjNGQzMzcxZGNhMjgyOTIKK1Jldmlld2VkLW9uOiBodHRwczovL2dvLXJldmlldy5nb29nbGVz
b3VyY2UuY29tL2MvZ28vKy84MDM2NjAKK1Jldmlld2VkLWJ5OiBKdW55YW5nIFNoYW8gPHNoYW9q
dW55YW5nQGdvb2dsZS5jb20+CitSZXZpZXdlZC1ieTogRGF2aWQgZHUgQ29sb21iaWVyIDwwaW50
cm9AZ21haWwuY29tPgorTFVDSS1UcnlCb3QtUmVzdWx0OiBnb2xhbmctc2NvcGVkQGx1Y2ktcHJv
amVjdC1hY2NvdW50cy5pYW0uZ3NlcnZpY2VhY2NvdW50LmNvbSA8Z29sYW5nLXNjb3BlZEBsdWNp
LXByb2plY3QtYWNjb3VudHMuaWFtLmdzZXJ2aWNlYWNjb3VudC5jb20+CitSZXZpZXdlZC1ieTog
S2VpdGggUmFuZGFsbCA8a2hyQGdvb2dsZS5jb20+CitBdXRvLVN1Ym1pdDogS2VpdGggUmFuZGFs
bCA8a2hyQGdvbGFuZy5vcmc+CistLS0KKyAuLi4vY29tcGlsZS9pbnRlcm5hbC9saXZlbmVzcy9t
ZXJnZWxvY2Fscy5nbyAgfCAxOSArKysrKysrKysrKysrKysrLS0tCisgc3JjL2NtZC9jb21waWxl
L2ludGVybmFsL3NzYS9fZ2VuL0FSTU9wcy5nbyAgIHwgIDIgKysKKyBzcmMvY21kL2NvbXBpbGUv
aW50ZXJuYWwvc3NhL19nZW4vUzM5MFhPcHMuZ28gfCAgMiArKworIDMgZmlsZXMgY2hhbmdlZCwg
MjAgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKKworZGlmZiAtLWdpdCBhL3NyYy9jbWQv
Y29tcGlsZS9pbnRlcm5hbC9saXZlbmVzcy9tZXJnZWxvY2Fscy5nbyBiL3NyYy9jbWQvY29tcGls
ZS9pbnRlcm5hbC9saXZlbmVzcy9tZXJnZWxvY2Fscy5nbworaW5kZXggMjhkMDM0YTkwZS4uYjli
ZTBkZDRjOSAxMDA2NDQKKy0tLSBhL3NyYy9jbWQvY29tcGlsZS9pbnRlcm5hbC9saXZlbmVzcy9t
ZXJnZWxvY2Fscy5nbworKysrIGIvc3JjL2NtZC9jb21waWxlL2ludGVybmFsL2xpdmVuZXNzL21l
cmdlbG9jYWxzLmdvCitAQCAtNTE2LDkgKzUxNiwyMiBAQCBmdW5jIChjcyAqY3N0YXRlKSBwb3B1
bGF0ZUluZGlyZWN0VXNlVGFibGUoY2FuZHMgW10qaXIuTmFtZSkgKFtdKmlyLk5hbWUsIFtdY2Fu
ZAorIAkJCWZvciBpZHgsIGFyZyA6PSByYW5nZSB2LkFyZ3MgeworIAkJCQlpZiBuYywgb2sgOj0g
cGVuZGluZ1VzZXNbYXJnLklEXTsgb2sgeworIAkJCQkJaWYgIXYuQWRkclNpbmtBcmcoaWR4KSB7
CistCQkJCQkJLy8gSWYgdGhpcyBvcCBtYXkgcHJvcGFnYXRlIHRoZSBhcmd1bWVudCBhZGRyZXNz
IHRvIGl0cyBvdXRwdXQsCistCQkJCQkJLy8gdGhlbiBnaXZlIHVwLiBTZWUgaXNzdWUgODAxMjcu
CistCQkJCQkJY29udGludWUKKysJCQkJCQkvLyBJZiB0aGlzIG9wIG1heSBwcm9wYWdhdGUgaXRz
IGlucHV0IGFkZHJlc3MKKysJCQkJCQkvLyB0byBzb21ld2hlcmUgZWxzZSwgd2UgbXVzdCB0cmFj
ayB3aGVyZSB0aGF0CisrCQkJCQkJLy8gc29tZXdoZXJlIGVsc2UgbWlnaHQgYmUuIFNlZSBpc3N1
ZSA4MDEyNy4KKysJCQkJCQlpZiB2LlR5cGUuSXNNZW1vcnkoKSB7CisrCQkJCQkJCS8vIE1pZ2h0
IGJlIHN0b3JlZCB0byBtZW1vcnkuIEdpdmUgdXAuCisrCQkJCQkJCWNvbnRpbnVlCisrCQkJCQkJ
fQorKwkJCQkJCS8vIFNvbWUgc29ydCBvZiBhZGRyZXNzIGFyaXRobWV0aWMuCisrCQkJCQkJaWYg
Xywgb2sgOj0gcGVuZGluZ1VzZXNbdi5JRF07IG9rIHsKKysJCQkJCQkJLy8gdiBoYXMgdXNlZCBt
dWx0aXBsZSBhZGRyZXNzZXMsIHdoaWNoIGlzIHNvbWV0aGluZworKwkJCQkJCQkvLyB3ZSBjYW4n
dCBrZWVwIHRyYWNrIG9mLiBHaXZlIHVwLgorKwkJCQkJCQljb250aW51ZQorKwkJCQkJCX0KKysJ
CQkJCQkvLyBUcmVhdCB0aGlzIG9wIGFzIHByb2R1Y2luZyB0aGUgYWRkcmVzcyBvZiB0aGUgc2Ft
ZSB2YXJpYWJsZQorKwkJCQkJCS8vIHRoYXQgaXRzIGFyZ3VtZW50IHdhcyB0aGUgYWRkcmVzcyBv
Zi4KKysJCQkJCQlwZW5kaW5nVXNlc1t2LklEXSA9IG5hbWVDb3VudHtuOiBuYy5uLCBjb3VudDog
di5Vc2VzfQorIAkJCQkJfQorIAkJCQkJLy8gV2UgZm91bmQgYSB1c2Ugb2Ygc29tZSB2YWx1ZSB0
aGF0IHRvb2sgdGhlCisgCQkJCQkvLyBhZGRyZXNzIG9mIG5jLm4uIFJlY29yZCB0aGlzIGluc3Qg
YXMgYQorZGlmZiAtLWdpdCBhL3NyYy9jbWQvY29tcGlsZS9pbnRlcm5hbC9zc2EvX2dlbi9BUk1P
cHMuZ28gYi9zcmMvY21kL2NvbXBpbGUvaW50ZXJuYWwvc3NhL19nZW4vQVJNT3BzLmdvCitpbmRl
eCBiMDNhMDlkZjgzLi5kYzE2ZWE2ZGE0IDEwMDY0NAorLS0tIGEvc3JjL2NtZC9jb21waWxlL2lu
dGVybmFsL3NzYS9fZ2VuL0FSTU9wcy5nbworKysrIGIvc3JjL2NtZC9jb21waWxlL2ludGVybmFs
L3NzYS9fZ2VuL0FSTU9wcy5nbworQEAgLTUwOCw2ICs1MDgsNyBAQCBmdW5jIGluaXQoKSB7Cisg
CQkJY2xvYmJlckZsYWdzOiAgIHRydWUsCisgCQkJZmF1bHRPbk5pbEFyZzA6IHRydWUsCisgCQkJ
YWRkclNpbmtBcmcwOiAgIHRydWUsCisrCQkJYWRkclNpbmtBcmcxOiAgIHRydWUsCisgCQl9LAor
IAorIAkJLy8gbGFyZ2Ugb3IgdW5hbGlnbmVkIG1vdmUKK0BAIC01MzMsNiArNTM0LDcgQEAgZnVu
YyBpbml0KCkgeworIAkJCWZhdWx0T25OaWxBcmcxOiB0cnVlLAorIAkJCWFkZHJTaW5rQXJnMDog
ICB0cnVlLAorIAkJCWFkZHJTaW5rQXJnMTogICB0cnVlLAorKwkJCS8vIFRPRE86IGNvdWxkIHVz
ZSBhZGRyU2lua0FyZzIgaGVyZS4KKyAJCX0sCisgCisgCQkvLyBTY2hlZHVsZXIgZW5zdXJlcyBM
b3dlcmVkR2V0Q2xvc3VyZVB0ciBvY2N1cnMgb25seSBpbiBlbnRyeSBibG9jaywKK2RpZmYgLS1n
aXQgYS9zcmMvY21kL2NvbXBpbGUvaW50ZXJuYWwvc3NhL19nZW4vUzM5MFhPcHMuZ28gYi9zcmMv
Y21kL2NvbXBpbGUvaW50ZXJuYWwvc3NhL19nZW4vUzM5MFhPcHMuZ28KK2luZGV4IDBmYWJiMjU0
MGEuLjI2YjlkOTgyNDEgMTAwNjQ0CistLS0gYS9zcmMvY21kL2NvbXBpbGUvaW50ZXJuYWwvc3Nh
L19nZW4vUzM5MFhPcHMuZ28KKysrKyBiL3NyYy9jbWQvY29tcGlsZS9pbnRlcm5hbC9zc2EvX2dl
bi9TMzkwWE9wcy5nbworQEAgLTc1OCw2ICs3NTgsNyBAQCBmdW5jIGluaXQoKSB7CisgCQkJZmF1
bHRPbk5pbEFyZzE6IHRydWUsCisgCQkJYWRkclNpbmtBcmcwOiAgIHRydWUsCisgCQkJYWRkclNp
bmtBcmcxOiAgIHRydWUsCisrCQkJLy8gVE9ETzogY291bGQgdXNlIGFkZHJTaW5rQXJnMiBoZXJl
LgorIAkJfSwKKyAKKyAJCS8vIGxhcmdlIGNsZWFyCitAQCAtNzg0LDYgKzc4NSw3IEBAIGZ1bmMg
aW5pdCgpIHsKKyAJCQl0eXA6ICAgICAgICAgICAgIk1lbSIsCisgCQkJZmF1bHRPbk5pbEFyZzA6
IHRydWUsCisgCQkJYWRkclNpbmtBcmcwOiAgIHRydWUsCisrCQkJYWRkclNpbmtBcmcxOiAgIHRy
dWUsCisgCQl9LAorIAl9CisgCistLSAKKzIuNTUuMAorCgpkaWZmIC0tZ2l0IGEvZ29sYW5nLnNw
ZWMgYi9nb2xhbmcuc3BlYwppbmRleCAwZDY3ZTE1Li44ODYzNDlmIDEwMDY0NAotLS0gYS9nb2xh
bmcuc3BlYworKysgYi9nb2xhbmcuc3BlYwpAQCAtMTU5LDYgKzE1OSwxMCBAQCBQYXRjaDg6ICAg
ICAgICAgZml4X2Nnb19wYW5pYy13aXRoLWdjYzE1LWluLTM2OC5wYXRjaAogIyBSZWxhdGVkIHRv
IGh0dHBzOi8vZ2l0aHViLmNvbS9nb2xhbmcvZ28vaXNzdWVzLzc0NDc2CiBQYXRjaDk6ICAgICAg
ICAgc2tpcF9sc2FuX3Rlc3RzLnBhdGNoCiAKKyMgUmVsYXRlZCB0byB0aGUgcmVnZW5lcmF0aW9u
IG9mIGBfZ2VuL2AgaW4gdGhlIGJ1aWxkIHBoYXNlOgorIyBnaXQgZm9ybWF0LXBhdGNoIC0xIDVk
NWM3ZmYxZjAgLS1zdGRvdXQgLS0gJzohc3JjL2NtZC9jb21waWxlL2ludGVybmFsL3NzYS9vcEdl
bi5nbycgPiBmaXgtczM5MHgtbWVyZ2Vsb2NhbHMucGF0Y2gKK1BhdGNoMTA6CWZpeC1zMzkweC1t
ZXJnZWxvY2Fscy5wYXRjaAorCiAjIEhhdmluZyBkb2N1bWVudGF0aW9uIHNlcGFyYXRlIHdhcyBi
cm9rZW4KIE9ic29sZXRlczogICAgICAle25hbWV9LWRvY3MgPCAxLjEtNAogCkBAIC0zMjMsNiAr
MzI3LDEwIEBAIGV4cG9ydCBHT19MREZMQUdTPSItbGlua21vZGUgaW50ZXJuYWwiCiAlaWYgISV7
Y2dvX2VuYWJsZWR9CiBleHBvcnQgQ0dPX0VOQUJMRUQ9MAogJWVuZGlmCisjIFJlZ2VuZXJhdGUg
YF9nZW4vYCBiZWZvcmUgYnVpbGRpbmcKK3B1c2hkIGNtZC9jb21waWxlL2ludGVybmFsL3NzYS9f
Z2VuCitHT1JPT1Q9JXtnb3Jvb3R9ICV7Z29yb290fS9iaW4vZ28gcnVuIC4KK3BvcGQKIC4vbWFr
ZS5iYXNoIC12CiBwb3BkCiAK