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: Rex Dieter To: git-commits@fedoraproject.org Subject: [rpms/gdb] gdb-17.2-rebase-f44: fix logic of prior Conflicts Date: Sat, 27 Jun 2026 23:58:01 GMT Message-ID: <178260468124.1.17981495195095165667.rpms-gdb-7fedccf706b0@fedoraproject.org> List-ID: X-Git-Repo: rpms/gdb X-Git-Branch: gdb-17.2-rebase-f44 X-Git-Rev: 7fedccf706b0797bfafea2f4b4a84eec39a458b5 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvZ2RiCiAgICAgICAgICAgIEJyYW5jaCA6IGdkYi0xNy4yLXJlYmFzZS1mNDQK ICAgICAgICAgICAgQ29tbWl0IDogN2ZlZGNjZjcwNmIwNzk3YmZhZmVhMmY0YjRhODRlZWMzOWE0 NThiNQogICAgICAgICAgICBBdXRob3IgOiBSZXggRGlldGVyIDxyZGlldGVyQG1hdGgudW5sLmVk dT4KICAgICAgICAgICAgRGF0ZSAgIDogMjAxNy0wMS0wMlQxODo1Mjo1Mi0wNjowMAogICAgICAg ICAgICBTdGF0cyAgOiArMTAvLTUgaW4gMSBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0 dHBzOi8vc3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvZ2RiL2MvN2ZlZGNjZjcwNmIwNzk3YmZh ZmVhMmY0YjRhODRlZWMzOWE0NThiNT9icmFuY2g9Z2RiLTE3LjItcmViYXNlLWY0NAoKICAgICAg ICAgICAgTG9nOgogICAgICAgICAgICBmaXggbG9naWMgb2YgcHJpb3IgQ29uZmxpY3RzCgp0aGVv cmV0aWNhbGx5IHNob3VsZCBub3QgYmUgcmVxdWlyZWQgZHVlIHRvIHZlcnNpb25lZCBkZXBlbmRl bnkKb24gLWhlYWRsZXNzIGFscmVhZHksIGJ1dCBpdCBjYW5ub3QgaHVydCBlaXRoZXIKCi0tLQpk aWZmIC0tZ2l0IGEvZ2RiLnNwZWMgYi9nZGIuc3BlYwppbmRleCBiMTFiZTcwLi5lMTljZDVkIDEw MDY0NAotLS0gYS9nZGIuc3BlYworKysgYi9nZGIuc3BlYwpAQCAtMjYsNyArMjYsNyBAQCBWZXJz aW9uOiA3LjEyCiAKICMgVGhlIHJlbGVhc2UgYWx3YXlzIGNvbnRhaW5zIGEgbGVhZGluZyByZXNl cnZlZCBudW1iZXIsIHN0YXJ0IGl0IGF0IDEuCiAjIGB1cHN0cmVhbScgaXMgbm90IGEgcGFydCBv ZiBgbmFtZScgdG8gc3RheSBmdWxseSBycG0gZGVwZW5kZW5jaWVzIGNvbXBhdGlibGUgZm9yIHRo ZSB0ZXN0aW5nLgotUmVsZWFzZTogMzIlez9kaXN0fQorUmVsZWFzZTogMzMlez9kaXN0fQogCiBM aWNlbnNlOiBHUEx2MysgYW5kIEdQTHYzKyB3aXRoIGV4Y2VwdGlvbnMgYW5kIEdQTHYyKyBhbmQg R1BMdjIrIHdpdGggZXhjZXB0aW9ucyBhbmQgR1BMKyBhbmQgTEdQTHYyKyBhbmQgQlNEIGFuZCBQ dWJsaWMgRG9tYWluIGFuZCBHRkRMCiBHcm91cDogRGV2ZWxvcG1lbnQvRGVidWdnZXJzCkBAIC00 Niw2ICs0NiwxMiBAQCBSZWNvbW1lbmRzOiAlez9zY2xfcHJlZml4fWdjYy1nZGItcGx1Z2luJXs/ X2lzYX0KICVlbmRpZgogCiAlaWYgMCV7IT9zY2w6MX0KKyMgd2hlbiBtYW5wYWdlcyB3ZXJlIG1v dmVkIGZyb20gLWhlYWRsZXNzIHRvIG1haW4KKyMgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29t L3Nob3dfYnVnLmNnaT9pZD0xNDAyNTU0CisjIHRoZW9yZXRpY2FsbHkgc2hvdWxkIG5vdCBiZSBy ZXF1aXJlZCBkdWUgdG8gdmVyc2lvbmVkIGRlcGVuZGVueQorIyBiZWxvdywgYnV0IGl0IGNhbm5v dCBodXJ0IGVpdGhlciAtLSByZGlldGVyCitDb25mbGljdHM6IGdkYi1oZWFkbGVzcyA8IDcuMTIt MjkKKwogU3VtbWFyeTogQSBzdHViIHBhY2thZ2UgZm9yIEdOVSBzb3VyY2UtbGV2ZWwgZGVidWdn ZXIKIFJlcXVpcmVzOiBnZGItaGVhZGxlc3Mlez9faXNhfSA9ICV7dmVyc2lvbn0tJXtyZWxlYXNl fQogCkBAIC01NSwxMCArNjEsNiBAQCBTZWUgcGFja2FnZSAnZ2RiLWhlYWRsZXNzJy4KIAogJXBh Y2thZ2UgaGVhZGxlc3MKIEdyb3VwOiBEZXZlbG9wbWVudC9EZWJ1Z2dlcnMKLSVlbHNlCi0jIHdo ZW4gbWFucGFnZXMgd2VyZSBtb3ZlZCBmcm9tIC1oZWFkbGVzcyB0byBtYWluCi0jIGh0dHBzOi8v YnVnemlsbGEucmVkaGF0LmNvbS9zaG93X2J1Zy5jZ2k/aWQ9MTQwMjU1NAotQ29uZmxpY3RzOiBn ZGItaGVhZGxlc3MgPCA3LjEyLTI5CiAlZW5kaWYKIAogU3VtbWFyeTogQSBHTlUgc291cmNlLWxl dmVsIGRlYnVnZ2VyIGZvciBDLCBDKyssIEZvcnRyYW4sIEdvIGFuZCBvdGhlciBsYW5ndWFnZXMK QEAgLTE1NzcsNiArMTU3OSw5IEBAIHRoZW4KIGZpCiAKICVjaGFuZ2Vsb2cKKyogTW9uIEphbiAw MiAyMDE3IFJleCBEaWV0ZXIgPHJkaWV0ZXJAZmVkb3JhcHJvamVjdC5vcmc+IC0gNy4xMi0zMwor LSBmaXggbG9naWMgb2YgcHJpb3IgQ29uZmxpY3RzCisKICogTW9uIEphbiAwMiAyMDE3IFJleCBE aWV0ZXIgPHJkaWV0ZXJAZmVkb3JhcHJvamVjdC5vcmc+IC0gNy4xMi0zMgogLSBDb25mbGljdHM6 IGdkYi1oZWFkbGVzcyA8IDcuMTItMjkgKCMxNDAyNTU0KQogCg==