239415 2022-04-15 23:32:35 -0700 Fix duplicate headers warning in libwebrtc Copy Headers phase 2022-04-25 14:25:01 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton emw eric.carlson sam webkit-bug-importer youennf oldest_to_newest 1862034 0 thorton 2022-04-15 23:32:35 -0700 Fix duplicate headers warning in libwebrtc Copy Headers phase 1862035 1 457743 thorton 2022-04-15 23:33:05 -0700 Created attachment 457743 Patch 1862036 2 thorton 2022-04-15 23:34:04 -0700 (I don't actually understand the ownership of these files -- are they imported like the rest of libwebrtc? Will these changes persist?) 1863866 3 webkit-bug-importer 2022-04-22 23:33:13 -0700 <rdar://problem/92207078> 1864171 4 emw 2022-04-25 11:43:23 -0700 Looks good, r=me. (In reply to Tim Horton from comment #2) > (I don't actually understand the ownership of these files -- are they > imported like the rest of libwebrtc? Will these changes persist?) These file references were added in a somewhat-painstaking manual process as part of the XCBuild migration. I'm guessing they got duplicated due to merge conflict fallout or me dragging and dropping them somewhere weird. I'd be surprised if Xcode is at fault and the change doesn't persist. 1864189 5 thorton 2022-04-25 12:23:42 -0700 (In reply to Elliott Williams from comment #4) > Looks good, r=me. > > (In reply to Tim Horton from comment #2) > > (I don't actually understand the ownership of these files -- are they > > imported like the rest of libwebrtc? Will these changes persist?) > > These file references were added in a somewhat-painstaking manual process as > part of the XCBuild migration. I'm guessing they got duplicated due to merge > conflict fallout or me dragging and dropping them somewhere weird. I'd be > surprised if Xcode is at fault and the change doesn't persist. Not the ownership I meant -- I meant "does WebKit own these or do they get imported from some external project (see "ThirdParty"). But I think we maybe do own them? 1864201 6 ews-feeder 2022-04-25 13:10:28 -0700 Committed r293341 (249962@main): <https://commits.webkit.org/249962@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457743. 1864231 7 emw 2022-04-25 14:25:01 -0700 (In reply to Tim Horton from comment #5) > Not the ownership I meant -- I meant "does WebKit own these or do they get > imported from some external project (see "ThirdParty"). But I think we maybe > do own them? Ah, yeah. I believe we own the Xcode project file and have never attempted to upstream changes to it. 457743 2022-04-15 23:33:05 -0700 2022-04-25 13:10:30 -0700 Patch bug-239415-20220415233304.patch text/plain 8152 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyOTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCBhYTU5M2Q3ZDE0OTg1NmQ5Zjg0M2RjMzI3NDNhMjE3YzRjNzI1YjgyLi4wMjhi YWNmNDFmNGJiYzM0YWZkZjUyZWUxNjZjMDBmYTkzZGI3YzY5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMi0wNC0xNSAgVGltIEhvcnRv biAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZHVwbGljYXRlIGhl YWRlcnMgd2FybmluZyBpbiBsaWJ3ZWJydGMgQ29weSBIZWFkZXJzIHBoYXNlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzk0MTUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxpYndlYnJ0Yy54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICBSZW1vdmUgYW5kIHJlLWFkZCB0aGVzZSBmaWxl cyAoWGNvZGUgd29uJ3QgZGVsZXRlIGp1c3Qgb25lIGNvcHkgb2YgdGhlbSwKKyAgICAgICAgYmVj YXVzZSB0aGV5IGhhdmUgdGhlIHNhbWUgaWRlbnRpZmllcnMpLgorCiAyMDIyLTA0LTE1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgbGlid2VicnRj IE9iakMgTlNTdHJpbmcgdXRpbGl0eSByb3V0aW5lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJk UGFydHkvbGlid2VicnRjL2xpYndlYnJ0Yy54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291 cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL2xpYndlYnJ0Yy54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCmluZGV4IDBkODMyNmZlNWRjZTQyOTg1MTQ2MDQ2NmNjNTg2ODdiMmFiNzFiNzQuLmQyYzcx NmI2ODg4ZWFjMzliZjM4YmY0M2UzMmY4NjJiZDJmZThjZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9U aGlyZFBhcnR5L2xpYndlYnJ0Yy9saWJ3ZWJydGMueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagor KysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvbGlid2VicnRjLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oKQEAgLTgxNSwxMSArODE1LDExIEBACiAJCTQxMzFDNDU3MjM0QzgxMTgwMDI4 QTYxNSAvKiB0dXJuX3BvcnRfZmFjdG9yeS5jYyBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDQxMzFDNDUyMjM0QzgxMTgwMDI4QTYxNSAvKiB0dXJuX3BvcnRf ZmFjdG9yeS5jYyAqLzsgfTsKIAkJNDEzMUM0NTgyMzRDODExODAwMjhBNjE1IC8qIHR1cm5fcG9y dF9mYWN0b3J5LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSA0MTMxQzQ1MzIzNEM4MTE4MDAyOEE2MTUgLyogdHVybl9wb3J0X2ZhY3RvcnkuaCAqLzsgc2V0 dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQdWJsaWMsICk7IH07IH07CiAJCTQxMzFDNDU5MjM0Qzgx MTgwMDI4QTYxNSAvKiBiYXNpY19wb3J0X2FsbG9jYXRvci5jYyBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQxMzFDNDU0MjM0QzgxMTgwMDI4QTYxNSAvKiBi YXNpY19wb3J0X2FsbG9jYXRvci5jYyAqLzsgfTsKLQkJNDEzMUM0NjEyMzRDODE3MjAwMjhBNjE1 IC8qIHZpZGVvX2NvZGluZy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gNDEzMUM0NUIyMzRDODE3MTAwMjhBNjE1IC8qIHZpZGVvX2NvZGluZy5oICovOyBz ZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFB1YmxpYywgKTsgfTsgfTsKLQkJNDEzMUM0NjIyMzRD ODE3MjAwMjhBNjE1IC8qIHZpZGVvX2Vycm9yX2NvZGVzLmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MTMxQzQ1QzIzNEM4MTcyMDAyOEE2MTUgLyogdmlk ZW9fZXJyb3JfY29kZXMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQdWJsaWMsICk7 IH07IH07Ci0JCTQxMzFDNDYzMjM0QzgxNzIwMDI4QTYxNSAvKiB2aWRlb19jb2RpbmdfZGVmaW5l cy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDEzMUM0 NUQyMzRDODE3MjAwMjhBNjE1IC8qIHZpZGVvX2NvZGluZ19kZWZpbmVzLmggKi87IHNldHRpbmdz ID0ge0FUVFJJQlVURVMgPSAoUHVibGljLCApOyB9OyB9OwotCQk0MTMxQzQ2NDIzNEM4MTcyMDAy OEE2MTUgLyogdmlkZW9fY29kZWNfaW5pdGlhbGl6ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQxMzFDNDVFMjM0QzgxNzIwMDI4QTYxNSAvKiB2aWRl b19jb2RlY19pbml0aWFsaXplci5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFB1Ymxp YywgKTsgfTsgfTsKLQkJNDEzMUM0NjUyMzRDODE3MjAwMjhBNjE1IC8qIHZpZGVvX2NvZGVjX2lu dGVyZmFjZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g NDEzMUM0NUYyMzRDODE3MjAwMjhBNjE1IC8qIHZpZGVvX2NvZGVjX2ludGVyZmFjZS5oICovOyBz ZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFB1YmxpYywgKTsgfTsgfTsKKwkJMkQ2QkZGNjAyODBB OTNERjAwQTFBNzRGIC8qIHZpZGVvX2NvZGluZy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gNDEzMUM0NUIyMzRDODE3MTAwMjhBNjE1IC8qIHZpZGVvX2Nv ZGluZy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFB1YmxpYywgKTsgfTsgfTsKKwkJ MkQ2QkZGNjQyODBBOTNGRTAwQTFBNzRGIC8qIHZpZGVvX2Vycm9yX2NvZGVzLmggaW4gSGVhZGVy cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MTMxQzQ1QzIzNEM4MTcyMDAy OEE2MTUgLyogdmlkZW9fZXJyb3JfY29kZXMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9 IChQdWJsaWMsICk7IH07IH07CisJCTJENkJGRjYzMjgwQTkzRkEwMEExQTc0RiAvKiB2aWRlb19j b2RpbmdfZGVmaW5lcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gNDEzMUM0NUQyMzRDODE3MjAwMjhBNjE1IC8qIHZpZGVvX2NvZGluZ19kZWZpbmVzLmgg Ki87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHVibGljLCApOyB9OyB9OworCQkyRDZCRkY2 MTI4MEE5M0VDMDBBMUE3NEYgLyogdmlkZW9fY29kZWNfaW5pdGlhbGl6ZXIuaCBpbiBIZWFkZXJz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQxMzFDNDVFMjM0QzgxNzIwMDI4 QTYxNSAvKiB2aWRlb19jb2RlY19pbml0aWFsaXplci5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJV VEVTID0gKFB1YmxpYywgKTsgfTsgfTsKKwkJMkQ2QkZGNjIyODBBOTNGNDAwQTFBNzRGIC8qIHZp ZGVvX2NvZGVjX2ludGVyZmFjZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gNDEzMUM0NUYyMzRDODE3MjAwMjhBNjE1IC8qIHZpZGVvX2NvZGVjX2ludGVy ZmFjZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFB1YmxpYywgKTsgfTsgfTsKIAkJ NDEzMUM0NjYyMzRDODE3MjAwMjhBNjE1IC8qIHZpZGVvX2NvZGVjX2ludGVyZmFjZS5jYyBpbiBT b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQxMzFDNDYwMjM0Qzgx NzIwMDI4QTYxNSAvKiB2aWRlb19jb2RlY19pbnRlcmZhY2UuY2MgKi87IH07CiAJCTQxMzFDNDZG MjM0QzgxQjYwMDI4QTYxNSAvKiBydGNfZXZlbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQxMzFDNDY4MjM0QzgxQjQwMDI4QTYxNSAvKiBydGNfZXZl bnQuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQdWJsaWMsICk7IH07IH07CiAJCTQx MzFDNDcwMjM0QzgxQjYwMDI4QTYxNSAvKiBydGNfZXZlbnQuY2MgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MTMxQzQ2OTIzNEM4MUI0MDAyOEE2MTUgLyog cnRjX2V2ZW50LmNjICovOyB9OwpAQCAtMTk2ODcsMTUgKzE5Njg3LDExIEBACiAJCQkJRERGMzBC QzgyN0M1QTQ5MjAwNkE1MjZGIC8qIHZpZGVvX2NhcHR1cmVyLmggaW4gSGVhZGVycyAqLywKIAkJ CQk0MUYyNjM2NDIxMjY3QURGMDAyNzRGNTkgLyogdmlkZW9fY29kZWMuaCBpbiBIZWFkZXJzICov LAogCQkJCTQxMDA5MURCMjQyRTBCQkMwMEM1RURBMiAvKiB2aWRlb19jb2RlY19jb25zdGFudHMu aCBpbiBIZWFkZXJzICovLAotCQkJCTQxMzFDNDY0MjM0QzgxNzIwMDI4QTYxNSAvKiB2aWRlb19j b2RlY19pbml0aWFsaXplci5oIGluIEhlYWRlcnMgKi8sCi0JCQkJNDEzMUM0NjQyMzRDODE3MjAw MjhBNjE1IC8qIHZpZGVvX2NvZGVjX2luaXRpYWxpemVyLmggaW4gSGVhZGVycyAqLywKLQkJCQk0 MTMxQzQ2NTIzNEM4MTcyMDAyOEE2MTUgLyogdmlkZW9fY29kZWNfaW50ZXJmYWNlLmggaW4gSGVh ZGVycyAqLywKLQkJCQk0MTMxQzQ2NTIzNEM4MTcyMDAyOEE2MTUgLyogdmlkZW9fY29kZWNfaW50 ZXJmYWNlLmggaW4gSGVhZGVycyAqLywKKwkJCQkyRDZCRkY2MTI4MEE5M0VDMDBBMUE3NEYgLyog dmlkZW9fY29kZWNfaW5pdGlhbGl6ZXIuaCBpbiBIZWFkZXJzICovLAorCQkJCTJENkJGRjYyMjgw QTkzRjQwMEExQTc0RiAvKiB2aWRlb19jb2RlY19pbnRlcmZhY2UuaCBpbiBIZWFkZXJzICovLAog CQkJCTQxMDA5MURDMjQyRTBCQkMwMEM1RURBMiAvKiB2aWRlb19jb2RlY190eXBlLmggaW4gSGVh ZGVycyAqLywKLQkJCQk0MTMxQzQ2MTIzNEM4MTcyMDAyOEE2MTUgLyogdmlkZW9fY29kaW5nLmgg aW4gSGVhZGVycyAqLywKLQkJCQk0MTMxQzQ2MTIzNEM4MTcyMDAyOEE2MTUgLyogdmlkZW9fY29k aW5nLmggaW4gSGVhZGVycyAqLywKLQkJCQk0MTMxQzQ2MzIzNEM4MTcyMDAyOEE2MTUgLyogdmlk ZW9fY29kaW5nX2RlZmluZXMuaCBpbiBIZWFkZXJzICovLAotCQkJCTQxMzFDNDYzMjM0QzgxNzIw MDI4QTYxNSAvKiB2aWRlb19jb2RpbmdfZGVmaW5lcy5oIGluIEhlYWRlcnMgKi8sCisJCQkJMkQ2 QkZGNjAyODBBOTNERjAwQTFBNzRGIC8qIHZpZGVvX2NvZGluZy5oIGluIEhlYWRlcnMgKi8sCisJ CQkJMkQ2QkZGNjMyODBBOTNGQTAwQTFBNzRGIC8qIHZpZGVvX2NvZGluZ19kZWZpbmVzLmggaW4g SGVhZGVycyAqLywKIAkJCQk1Q0REODQwMjFFNDM5QTZGMDA2MjFFOTIgLyogdmlkZW9fY29kaW5n X2ltcGwuaCBpbiBIZWFkZXJzICovLAogCQkJCTQxMzFCRkFBMjM0Qjg4QTYwMDI4QTYxNSAvKiB2 aWRlb19jb21tb24uaCBpbiBIZWFkZXJzICovLAogCQkJCTQxOUM4NDEzMUZFMjQ5QUIwMDQwQzMw RiAvKiB2aWRlb19jb250ZW50X3R5cGUuaCBpbiBIZWFkZXJzICovLApAQCAtMTk3MTAsOCArMTk3 MDYsNyBAQAogCQkJCTQxNjIyNUQ1MjE2OTgxODEwMEE5MUM5QiAvKiB2aWRlb19lbmNvZGVyX2Zh Y3RvcnkuaCBpbiBIZWFkZXJzICovLAogCQkJCTQxNDVGNjFGMUZFMUYzOEQwMEVCOUNBRiAvKiB2 aWRlb19lbmNvZGVyX2ZhY3RvcnkuaCBpbiBIZWFkZXJzICovLAogCQkJCTQxRjI2MzZBMjEyNjdB REYwMDI3NEY1OSAvKiB2aWRlb19lbmNvZGVyX3NvZnR3YXJlX2ZhbGxiYWNrX3dyYXBwZXIuaCBp biBIZWFkZXJzICovLAotCQkJCTQxMzFDNDYyMjM0QzgxNzIwMDI4QTYxNSAvKiB2aWRlb19lcnJv cl9jb2Rlcy5oIGluIEhlYWRlcnMgKi8sCi0JCQkJNDEzMUM0NjIyMzRDODE3MjAwMjhBNjE1IC8q IHZpZGVvX2Vycm9yX2NvZGVzLmggaW4gSGVhZGVycyAqLywKKwkJCQkyRDZCRkY2NDI4MEE5M0ZF MDBBMUE3NEYgLyogdmlkZW9fZXJyb3JfY29kZXMuaCBpbiBIZWFkZXJzICovLAogCQkJCTQxODkz OTE5MjQyQTcwNEUwMDdGREM0MSAvKiB2aWRlb19mZWNfZ2VuZXJhdG9yLmggaW4gSGVhZGVycyAq LywKIAkJCQk0MTYyMjVENjIxNjk4MTgxMDBBOTFDOUIgLyogdmlkZW9fZnJhbWUuaCBpbiBIZWFk ZXJzICovLAogCQkJCTVDRDI4NDZCMUU2QTU3RjQwMDk0RkRDOCAvKiB2aWRlb19mcmFtZS5oIGlu IEhlYWRlcnMgKi8sCkBAIC0yMTY2Niw2ICsyMTY2MSw3IEBACiAJCQkJNDE1RjFGQUYyMTI3MkZC QTAwMDY0Q0JGIC8qIGdhaW5fYXBwbGllci5jYyBpbiBTb3VyY2VzICovLAogCQkJCTVDREQ4NEI0 MUU0M0FGMTMwMDYyMUU5MiAvKiBnYWluX2NvbnRyb2xfaW1wbC5jYyBpbiBTb3VyY2VzICovLAog CQkJCTQxQTA4QkQwMjEyNzJFRTIwMDFENUQ3QiAvKiBnYWluX2NvbnRyb2xsZXIyLmNjIGluIFNv dXJjZXMgKi8sCisJCQkJNDE3QjAxM0MyN0ZEQTdFMDAwQzc0REUzIC8qIGdjZF9oZWxwZXJzLm0g aW4gU291cmNlcyAqLywKIAkJCQk1Q0REODNENTFFNDM5QTZGMDA2MjFFOTIgLyogZ2VuZXJpY19k ZWNvZGVyLmNjIGluIFNvdXJjZXMgKi8sCiAJCQkJNDEzMUM0MkQyMzRDN0Q4QTAwMjhBNjE1IC8q IGdlbmVyaWNfZnJhbWVfaW5mby5jYyBpbiBTb3VyY2VzICovLAogCQkJCTVDREQ4NjU3MUU0M0I4 QjUwMDYyMUU5MiAvKiBnZXRfaGFubmluZ193aW5kb3cuYyBpbiBTb3VyY2VzICovLApAQCAtMjE3 MTAsNyArMjE3MDYsNiBAQAogCQkJCTVDREQ4QTlBMUU0M0MwMEYwMDYyMUU5MiAvKiBpbnB1dF9h dWRpb19maWxlLmNjIGluIFNvdXJjZXMgKi8sCiAJCQkJNUNERDhGRDUxRTQzQ0Q2NjAwNjIxRTky IC8qIGludGVyX2Fycml2YWwuY2MgaW4gU291cmNlcyAqLywKIAkJCQk0MTMyM0E2NjI2NjUyQUQ2 MDBCMzg2MjMgLyogaW50ZXJfYXJyaXZhbF9kZWx0YS5jYyBpbiBTb3VyY2VzICovLAotCQkJCTQx N0IwMTNBMjdGREE0Q0YwMEM3NERFMyAvKiB0YXNrX3F1ZXVlX2djZC5jYyBpbiBTb3VyY2VzICov LAogCQkJCTVDREQ4M0REMUU0MzlBNkYwMDYyMUU5MiAvKiBpbnRlcl9mcmFtZV9kZWxheS5jYyBp biBTb3VyY2VzICovLAogCQkJCTQxMzExMUNFMjU1MkEzQkIwMDFCOUQ5NSAvKiBpbnRlcm5hbF9k ZWNvZGVyX2ZhY3RvcnkuY2MgaW4gU291cmNlcyAqLywKIAkJCQk0MTMxQzI4NTIzNEI4Q0M0MDAy OEE2MTUgLyogaW50ZXJuYWxfZW5jb2Rlcl9mYWN0b3J5LmNjIGluIFNvdXJjZXMgKi8sCkBAIC0y MjIyNiw3ICsyMjIyMSw2IEBACiAJCQkJNDEzMUMzOEQyMzRCOTU3RDAwMjhBNjE1IC8qIHN0YXRp b25hcml0eV9lc3RpbWF0b3IuY2MgaW4gU291cmNlcyAqLywKIAkJCQk1Q0REOEE1MTFFNDNCRkIz MDA2MjFFOTIgLyogc3RhdGlzdGljc19jYWxjdWxhdG9yLmNjIGluIFNvdXJjZXMgKi8sCiAJCQkJ NDEzMUJGMEQyMzRCODgyMDAwMjhBNjE1IC8qIHN0YXRzX2NvbGxlY3Rvci5jYyBpbiBTb3VyY2Vz ICovLAotCQkJCTQxN0IwMTNDMjdGREE3RTAwMEM3NERFMyAvKiBnY2RfaGVscGVycy5tIGluIFNv dXJjZXMgKi8sCiAJCQkJNUNERDg1QkMxRTQzQjVDMDAwNjIxRTkyIC8qIHN0YXRzX2NvdW50ZXIu Y2MgaW4gU291cmNlcyAqLywKIAkJCQk0MTMxQzM0MjIzNEI4RERGMDAyOEE2MTUgLyogc3RhdHNf dHlwZXMuY2MgaW4gU291cmNlcyAqLywKIAkJCQk0MTMxQzE1NjIzNEI4OUUyMDAyOEE2MTUgLyog c3RyZWFtLmNjIGluIFNvdXJjZXMgKi8sCkBAIC0yMjI1OSw2ICsyMjI1Myw3IEBACiAJCQkJNUNE RDg5NzgxRTQzQkYzQTAwNjIxRTkyIC8qIHRhcmdldF9iaXRyYXRlLmNjIGluIFNvdXJjZXMgKi8s CiAJCQkJNDEzMUMxMzYyMzRCODlFMjAwMjhBNjE1IC8qIHRhc2tfcXVldWUuY2MgaW4gU291cmNl cyAqLywKIAkJCQk0MTMxQzQ4NDIzNEM4Mjc0MDAyOEE2MTUgLyogdGFza19xdWV1ZV9iYXNlLmNj IGluIFNvdXJjZXMgKi8sCisJCQkJNDE3QjAxM0EyN0ZEQTRDRjAwQzc0REUzIC8qIHRhc2tfcXVl dWVfZ2NkLmNjIGluIFNvdXJjZXMgKi8sCiAJCQkJNDE4OTNBNkIyNDJBNzgyNjAwN0ZEQzQxIC8q IHRhc2tfcXVldWVfcGFjZWRfc2VuZGVyLmNjIGluIFNvdXJjZXMgKi8sCiAJCQkJNDEzMUM0RjMy MzRDODYzOTAwMjhBNjE1IC8qIHRhc2tfcXVldWVfc3RkbGliLmNjIGluIFNvdXJjZXMgKi8sCiAJ CQkJNDEzMUMxQzkyMzRCOEE0QTAwMjhBNjE1IC8qIHRjcF9wb3J0LmNjIGluIFNvdXJjZXMgKi8s Cg==