Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jmtRN-00075t-0P for pgsql-hackers@arkaria.postgresql.org; Sun, 21 Jun 2020 06:26:53 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1jmtRK-00012z-EH for pgsql-hackers@arkaria.postgresql.org; Sun, 21 Jun 2020 06:26:50 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jmtRI-00012s-TQ for pgsql-hackers@lists.postgresql.org; Sun, 21 Jun 2020 06:26:50 +0000 Received: from wforward2-smtp.messagingengine.com ([64.147.123.31]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jmtRA-0000Ak-Mj for pgsql-hackers@postgresql.org; Sun, 21 Jun 2020 06:26:47 +0000 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.west.internal (Postfix) with ESMTP id 0AAEEE00 for ; Sun, 21 Jun 2020 02:26:37 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sun, 21 Jun 2020 02:26:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=z1alDxjMQXtd7t/8dTR4F1dBeds9/ xyMjKpaJ+eDmdg=; b=ppRX8lXvHnM0LtTDDn4p05MmlAB6zLDYiO9MQzVId9l5Z fZFTbZy3p/Zt/gdIwPHOjM4DgWoiTGs3sOYhWi3sotJQr4ohnR+QiVIjgZPKWjBs Dc6rAahKj33HYfLhg7/sHWkTiRUb6hRQ2WwT3Rsb0CHTB9PtxHcJfvfnwNKQaqXr GO8YmybxREmOWJFVtd7RgS7KjSUXxvj3Lihd6ox3Myk+H7mkVxQ9Mly/7PxbP2Fr vIfFq/dHjD5Mo6RF09MKGsW21qhFEfnQNqpYSUwYqfNbDFU/RNoESBKVbOrhHca8 RQGQd5YMei4j15vIYl2exKS1/7zYAGlDh9h2mI9lg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudejledguddtiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepvffhufhokffffgggtgesmhdtre ertdefjeenucfhrhhomheprfgvthgvrhcugfhishgvnhhtrhgruhhtuceophgvthgvrhdr vghishgvnhhtrhgruhhtsedvnhguqhhurggurhgrnhhtrdgtohhmqeenucggtffrrghtth gvrhhnpeekieelleeftddtleetkeevgfehhfdviefgudetjedtueeugfffvdeltefhfeeu vdenucffohhmrghinhepvdhnughquhgrughrrghnthdrtghomhenucfkphepleefrddvge efrdduledurddvfeeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomhepphgvthgvrhdrvghishgvnhhtrhgruhhtsedvnhguqhhurggurhgrnhhtrd gtohhm X-ME-Proxy: Received: from april.pezone.net (p5df3bfee.dip0.t-ipconnect.de [93.243.191.238]) by mail.messagingengine.com (Postfix) with ESMTPA id 99ACB3280067 for ; Sun, 21 Jun 2020 02:26:36 -0400 (EDT) To: pgsql-hackers From: Peter Eisentraut Subject: suggest to rename enable_incrementalsort Organization: 2ndQuadrant Message-ID: Date: Sun, 21 Jun 2020 08:26:34 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------01B68CFF3355291B66DF3A20" Content-Language: en-US List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk This is a multi-part message in MIME format. --------------01B68CFF3355291B66DF3A20 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit I suggest to rename enable_incrementalsort to enable_incremental_sort. This is obviously more readable and also how we have named recently added multiword planner parameters. See attached patch. -- Peter Eisentraut http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services --------------01B68CFF3355291B66DF3A20 Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="0001-Rename-to-enable_incremental_sort-from-enable_increm.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Rename-to-enable_incremental_sort-from-enable_increm.pa"; filename*1="tch" RnJvbSA0YzU1YmY4MDJmNDJkZjUzNjZkOWM3MzRiYjk1MjdkNTdkZTU3ZGU0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogU3VuLCAyMSBKdW4gMjAyMCAwODoyMTo1MyArMDIwMApTdWJqZWN0 OiBbUEFUQ0hdIFJlbmFtZSB0byBlbmFibGVfaW5jcmVtZW50YWxfc29ydCBmcm9tIGVuYWJs ZV9pbmNyZW1lbnRhbHNvcnQKCi0tLQogZG9jL3NyYy9zZ21sL2NvbmZpZy5zZ21sICAgICAg ICAgICAgICAgICAgICAgICAgICB8ICA2ICsrKy0tLQogZG9jL3NyYy9zZ21sL3JlbGVhc2Ut MTMuc2dtbCAgICAgICAgICAgICAgICAgICAgICB8ICA0ICsrLS0KIHNyYy9iYWNrZW5kL29w dGltaXplci9wYXRoL2FsbHBhdGhzLmMgICAgICAgICAgICAgfCAgMiArLQogc3JjL2JhY2tl bmQvb3B0aW1pemVyL3BhdGgvY29zdHNpemUuYyAgICAgICAgICAgICB8ICAyICstCiBzcmMv YmFja2VuZC9vcHRpbWl6ZXIvcGxhbi9wbGFubmVyLmMgICAgICAgICAgICAgIHwgMTQgKysr KysrKy0tLS0tLS0KIHNyYy9iYWNrZW5kL3V0aWxzL21pc2MvZ3VjLmMgICAgICAgICAgICAg ICAgICAgICAgfCAgNCArKy0tCiBzcmMvYmFja2VuZC91dGlscy9taXNjL3Bvc3RncmVzcWwu Y29uZi5zYW1wbGUgICAgIHwgIDIgKy0KIHNyYy9pbmNsdWRlL29wdGltaXplci9jb3N0Lmgg ICAgICAgICAgICAgICAgICAgICAgfCAgMiArLQogc3JjL3Rlc3QvcmVncmVzcy9leHBlY3Rl ZC9pbmNyZW1lbnRhbF9zb3J0Lm91dCAgICB8ICA0ICsrLS0KIHNyYy90ZXN0L3JlZ3Jlc3Mv ZXhwZWN0ZWQvcGFydGl0aW9uX2FnZ3JlZ2F0ZS5vdXQgfCAgMiArLQogc3JjL3Rlc3QvcmVn cmVzcy9leHBlY3RlZC9zeXN2aWV3cy5vdXQgICAgICAgICAgICB8ICAyICstCiBzcmMvdGVz dC9yZWdyZXNzL3NxbC9pbmNyZW1lbnRhbF9zb3J0LnNxbCAgICAgICAgIHwgIDQgKystLQog c3JjL3Rlc3QvcmVncmVzcy9zcWwvcGFydGl0aW9uX2FnZ3JlZ2F0ZS5zcWwgICAgICB8ICAy ICstCiAxMyBmaWxlcyBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCAyNSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kb2Mvc3JjL3NnbWwvY29uZmlnLnNnbWwgYi9kb2Mvc3JjL3Nn bWwvY29uZmlnLnNnbWwKaW5kZXggYzYyOTRkZjkzNi4uNGM2ZGFhYzg2ZSAxMDA2NDQKLS0t IGEvZG9jL3NyYy9zZ21sL2NvbmZpZy5zZ21sCisrKyBiL2RvYy9zcmMvc2dtbC9jb25maWcu c2dtbApAQCAtNDU5MSwxMCArNDU5MSwxMCBAQCA8dGl0bGU+UGxhbm5lciBNZXRob2QgQ29u ZmlndXJhdGlvbjwvdGl0bGU+CiAgICAgICA8L2xpc3RpdGVtPgogICAgICA8L3Zhcmxpc3Rl bnRyeT4KIAotICAgICA8dmFybGlzdGVudHJ5IGlkPSJndWMtZW5hYmxlLWluY3JlbWVudGFs c29ydCIgeHJlZmxhYmVsPSJlbmFibGVfaW5jcmVtZW50YWxzb3J0Ij4KLSAgICAgIDx0ZXJt Pjx2YXJuYW1lPmVuYWJsZV9pbmNyZW1lbnRhbHNvcnQ8L3Zhcm5hbWU+ICg8dHlwZT5ib29s ZWFuPC90eXBlPikKKyAgICAgPHZhcmxpc3RlbnRyeSBpZD0iZ3VjLWVuYWJsZS1pbmNyZW1l bnRhbC1zb3J0IiB4cmVmbGFiZWw9ImVuYWJsZV9pbmNyZW1lbnRhbF9zb3J0Ij4KKyAgICAg IDx0ZXJtPjx2YXJuYW1lPmVuYWJsZV9pbmNyZW1lbnRhbF9zb3J0PC92YXJuYW1lPiAoPHR5 cGU+Ym9vbGVhbjwvdHlwZT4pCiAgICAgICA8aW5kZXh0ZXJtPgotICAgICAgIDxwcmltYXJ5 Pjx2YXJuYW1lPmVuYWJsZV9pbmNyZW1lbnRhbHNvcnQ8L3Zhcm5hbWU+IGNvbmZpZ3VyYXRp b24gcGFyYW1ldGVyPC9wcmltYXJ5PgorICAgICAgIDxwcmltYXJ5Pjx2YXJuYW1lPmVuYWJs ZV9pbmNyZW1lbnRhbF9zb3J0PC92YXJuYW1lPiBjb25maWd1cmF0aW9uIHBhcmFtZXRlcjwv cHJpbWFyeT4KICAgICAgIDwvaW5kZXh0ZXJtPgogICAgICAgPC90ZXJtPgogICAgICAgPGxp c3RpdGVtPgpkaWZmIC0tZ2l0IGEvZG9jL3NyYy9zZ21sL3JlbGVhc2UtMTMuc2dtbCBiL2Rv Yy9zcmMvc2dtbC9yZWxlYXNlLTEzLnNnbWwKaW5kZXggNDAxYzU1NzM3My4uMDg1NzY2Yjhj NCAxMDA2NDQKLS0tIGEvZG9jL3NyYy9zZ21sL3JlbGVhc2UtMTMuc2dtbAorKysgYi9kb2Mv c3JjL3NnbWwvcmVsZWFzZS0xMy5zZ21sCkBAIC01ODgsNyArNTg4LDcgQEAgPHRpdGxlPkdl bmVyYWwgUGVyZm9ybWFuY2U8L3RpdGxlPgogLS0+CiAKICAgICAgICA8cGFyYT4KLSAgICAg ICAgSW1wbGVtZW50IDxsaW5rIGxpbmtlbmQ9Imd1Yy1lbmFibGUtaW5jcmVtZW50YWxzb3J0 Ij5pbmNyZW1lbnRhbAorICAgICAgICBJbXBsZW1lbnQgPGxpbmsgbGlua2VuZD0iZ3VjLWVu YWJsZS1pbmNyZW1lbnRhbC1zb3J0Ij5pbmNyZW1lbnRhbAogICAgICAgICBzb3J0aW5nPC9s aW5rPiAoSmFtZXMgQ29sZW1hbiwgQWxleGFuZGVyIEtvcm90a292LCBUb21hcyBWb25kcmEp CiAgICAgICAgPC9wYXJhPgogCkBAIC01OTYsNyArNTk2LDcgQEAgPHRpdGxlPkdlbmVyYWwg UGVyZm9ybWFuY2U8L3RpdGxlPgogICAgICAgICBJZiBhIHJlc3VsdCBpcyBhbHJlYWR5IHNv cnRlZCBieSBzZXZlcmFsIGxlYWRpbmcga2V5cywgdGhpcwogICAgICAgICBhbGxvd3MgZm9y IGJhdGNoIHNvcnRpbmcgb2YgYWRkaXRpb25hbCB0cmFpbGluZyBrZXlzIGJlY2F1c2UgdGhl CiAgICAgICAgIHByZXZpb3VzIGtleXMgYXJlIGFscmVhZHkgZXF1YWwuICBUaGlzIGlzIGNv bnRyb2xsZWQgYnkgPHhyZWYKLSAgICAgICAgbGlua2VuZD0iZ3VjLWVuYWJsZS1pbmNyZW1l bnRhbHNvcnQiLz4uCisgICAgICAgIGxpbmtlbmQ9Imd1Yy1lbmFibGUtaW5jcmVtZW50YWwt c29ydCIvPi4KICAgICAgICA8L3BhcmE+CiAgICAgICA8L2xpc3RpdGVtPgogCmRpZmYgLS1n aXQgYS9zcmMvYmFja2VuZC9vcHRpbWl6ZXIvcGF0aC9hbGxwYXRocy5jIGIvc3JjL2JhY2tl bmQvb3B0aW1pemVyL3BhdGgvYWxscGF0aHMuYwppbmRleCBkOTg0ZGEyNWQ3Li44MTg5NmRl OTM2IDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9vcHRpbWl6ZXIvcGF0aC9hbGxwYXRocy5j CisrKyBiL3NyYy9iYWNrZW5kL29wdGltaXplci9wYXRoL2FsbHBhdGhzLmMKQEAgLTI5MTIs NyArMjkxMiw3IEBAIGdlbmVyYXRlX3VzZWZ1bF9nYXRoZXJfcGF0aHMoUGxhbm5lckluZm8g KnJvb3QsIFJlbE9wdEluZm8gKnJlbCwgYm9vbCBvdmVycmlkZV9yCiAJCQkgKiBDb25zaWRl ciBpbmNyZW1lbnRhbCBzb3J0LCBidXQgb25seSB3aGVuIHRoZSBzdWJwYXRoIGlzIGFscmVh ZHkKIAkJCSAqIHBhcnRpYWxseSBzb3J0ZWQgb24gYSBwYXRoa2V5IHByZWZpeC4KIAkJCSAq LwotCQkJaWYgKGVuYWJsZV9pbmNyZW1lbnRhbHNvcnQgJiYgcHJlc29ydGVkX2tleXMgPiAw KQorCQkJaWYgKGVuYWJsZV9pbmNyZW1lbnRhbF9zb3J0ICYmIHByZXNvcnRlZF9rZXlzID4g MCkKIAkJCXsKIAkJCQlQYXRoCSAgICp0bXA7CiAKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5k L29wdGltaXplci9wYXRoL2Nvc3RzaXplLmMgYi9zcmMvYmFja2VuZC9vcHRpbWl6ZXIvcGF0 aC9jb3N0c2l6ZS5jCmluZGV4IDRmZjNjN2EyZmQuLjg3YzliNDljZTEgMTAwNjQ0Ci0tLSBh L3NyYy9iYWNrZW5kL29wdGltaXplci9wYXRoL2Nvc3RzaXplLmMKKysrIGIvc3JjL2JhY2tl bmQvb3B0aW1pemVyL3BhdGgvY29zdHNpemUuYwpAQCAtMTI4LDcgKzEyOCw3IEBAIGJvb2wJ CWVuYWJsZV9pbmRleG9ubHlzY2FuID0gdHJ1ZTsKIGJvb2wJCWVuYWJsZV9iaXRtYXBzY2Fu ID0gdHJ1ZTsKIGJvb2wJCWVuYWJsZV90aWRzY2FuID0gdHJ1ZTsKIGJvb2wJCWVuYWJsZV9z b3J0ID0gdHJ1ZTsKLWJvb2wJCWVuYWJsZV9pbmNyZW1lbnRhbHNvcnQgPSB0cnVlOworYm9v bAkJZW5hYmxlX2luY3JlbWVudGFsX3NvcnQgPSB0cnVlOwogYm9vbAkJZW5hYmxlX2hhc2hh Z2cgPSB0cnVlOwogYm9vbAkJaGFzaGFnZ19hdm9pZF9kaXNrX3BsYW4gPSB0cnVlOwogYm9v bAkJZW5hYmxlX25lc3Rsb29wID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL29w dGltaXplci9wbGFuL3BsYW5uZXIuYyBiL3NyYy9iYWNrZW5kL29wdGltaXplci9wbGFuL3Bs YW5uZXIuYwppbmRleCA0MTMxMDE5ZmM5Li4xNGYzZmQ0NGUzIDEwMDY0NAotLS0gYS9zcmMv YmFja2VuZC9vcHRpbWl6ZXIvcGxhbi9wbGFubmVyLmMKKysrIGIvc3JjL2JhY2tlbmQvb3B0 aW1pemVyL3BsYW4vcGxhbm5lci5jCkBAIC01MDE0LDcgKzUwMTQsNyBAQCBjcmVhdGVfb3Jk ZXJlZF9wYXRocyhQbGFubmVySW5mbyAqcm9vdCwKIAkJCSAqIHByZXNvcnRlZCB0aGUgcGF0 aCBpcy4gQWRkaXRpb25hbGx5IGluY3JlbWVudGFsIHNvcnQgbWF5IGVuYWJsZQogCQkJICog YSBjaGVhcGVyIHN0YXJ0dXAgcGF0aCB0byB3aW4gb3V0IGRlc3BpdGUgaGlnaGVyIHRvdGFs IGNvc3QuCiAJCQkgKi8KLQkJCWlmICghZW5hYmxlX2luY3JlbWVudGFsc29ydCkKKwkJCWlm ICghZW5hYmxlX2luY3JlbWVudGFsX3NvcnQpCiAJCQkJY29udGludWU7CiAKIAkJCS8qIExp a2V3aXNlLCBpZiB0aGUgcGF0aCBjYW4ndCBiZSB1c2VkIGZvciBpbmNyZW1lbnRhbCBzb3J0 LiAqLwpAQCAtNTA5NSw3ICs1MDk1LDcgQEAgY3JlYXRlX29yZGVyZWRfcGF0aHMoUGxhbm5l ckluZm8gKnJvb3QsCiAJCSAqIHNvcnRfcGF0aGtleXMgYmVjYXVzZSB0aGVuIHdlIGNhbid0 IHBvc3NpYmx5IGhhdmUgYSBwcmVzb3J0ZWQKIAkJICogcHJlZml4IG9mIHRoZSBsaXN0IHdp dGhvdXQgaGF2aW5nIHRoZSBsaXN0IGJlIGZ1bGx5IHNvcnRlZC4KIAkJICovCi0JCWlmIChl bmFibGVfaW5jcmVtZW50YWxzb3J0ICYmIGxpc3RfbGVuZ3RoKHJvb3QtPnNvcnRfcGF0aGtl eXMpID4gMSkKKwkJaWYgKGVuYWJsZV9pbmNyZW1lbnRhbF9zb3J0ICYmIGxpc3RfbGVuZ3Ro KHJvb3QtPnNvcnRfcGF0aGtleXMpID4gMSkKIAkJewogCQkJTGlzdENlbGwgICAqbGM7CiAK QEAgLTY1NzIsNyArNjU3Miw3IEBAIGFkZF9wYXRoc190b19ncm91cGluZ19yZWwoUGxhbm5l ckluZm8gKnJvb3QsIFJlbE9wdEluZm8gKmlucHV0X3JlbCwKIAkJCSAqIHdoZW4gdGhlIHBh dGggaXMgbm90IGFscmVhZHkgc29ydGVkIGFuZCB3aGVuIGluY3JlbWVudGFsIHNvcnQKIAkJ CSAqIGlzIGVuYWJsZWQuCiAJCQkgKi8KLQkJCWlmIChpc19zb3J0ZWQgfHwgIWVuYWJsZV9p bmNyZW1lbnRhbHNvcnQpCisJCQlpZiAoaXNfc29ydGVkIHx8ICFlbmFibGVfaW5jcmVtZW50 YWxfc29ydCkKIAkJCQljb250aW51ZTsKIAogCQkJLyogUmVzdG9yZSB0aGUgaW5wdXQgcGF0 aCAod2UgbWlnaHQgaGF2ZSBhZGRlZCBTb3J0IG9uIHRvcCkuICovCkBAIC02Njk5LDcgKzY2 OTksNyBAQCBhZGRfcGF0aHNfdG9fZ3JvdXBpbmdfcmVsKFBsYW5uZXJJbmZvICpyb290LCBS ZWxPcHRJbmZvICppbnB1dF9yZWwsCiAJCQkJICogd2hlbiB0aGUgcGF0aCBpcyBub3QgYWxy ZWFkeSBzb3J0ZWQgYW5kIHdoZW4gaW5jcmVtZW50YWwKIAkJCQkgKiBzb3J0IGlzIGVuYWJs ZWQuCiAJCQkJICovCi0JCQkJaWYgKGlzX3NvcnRlZCB8fCAhZW5hYmxlX2luY3JlbWVudGFs c29ydCkKKwkJCQlpZiAoaXNfc29ydGVkIHx8ICFlbmFibGVfaW5jcmVtZW50YWxfc29ydCkK IAkJCQkJY29udGludWU7CiAKIAkJCQkvKiBSZXN0b3JlIHRoZSBpbnB1dCBwYXRoICh3ZSBt aWdodCBoYXZlIGFkZGVkIFNvcnQgb24gdG9wKS4gKi8KQEAgLTcwMjIsNyArNzAyMiw3IEBA IGNyZWF0ZV9wYXJ0aWFsX2dyb3VwaW5nX3BhdGhzKFBsYW5uZXJJbmZvICpyb290LAogCQkg KiBncm91cF9wYXRoa2V5cyBiZWNhdXNlIHRoZW4gd2UgY2FuJ3QgcG9zc2libHkgaGF2ZSBh IHByZXNvcnRlZAogCQkgKiBwcmVmaXggb2YgdGhlIGxpc3Qgd2l0aG91dCBoYXZpbmcgdGhl IGxpc3QgYmUgZnVsbHkgc29ydGVkLgogCQkgKi8KLQkJaWYgKGVuYWJsZV9pbmNyZW1lbnRh bHNvcnQgJiYgbGlzdF9sZW5ndGgocm9vdC0+Z3JvdXBfcGF0aGtleXMpID4gMSkKKwkJaWYg KGVuYWJsZV9pbmNyZW1lbnRhbF9zb3J0ICYmIGxpc3RfbGVuZ3RoKHJvb3QtPmdyb3VwX3Bh dGhrZXlzKSA+IDEpCiAJCXsKIAkJCWZvcmVhY2gobGMsIGlucHV0X3JlbC0+cGF0aGxpc3Qp CiAJCQl7CkBAIC03MTI1LDcgKzcxMjUsNyBAQCBjcmVhdGVfcGFydGlhbF9ncm91cGluZ19w YXRocyhQbGFubmVySW5mbyAqcm9vdCwKIAkJCSAqIHdoZW4gdGhlIHBhdGggaXMgbm90IGFs cmVhZHkgc29ydGVkIGFuZCB3aGVuIGluY3JlbWVudGFsIHNvcnQKIAkJCSAqIGlzIGVuYWJs ZWQuCiAJCQkgKi8KLQkJCWlmIChpc19zb3J0ZWQgfHwgIWVuYWJsZV9pbmNyZW1lbnRhbHNv cnQpCisJCQlpZiAoaXNfc29ydGVkIHx8ICFlbmFibGVfaW5jcmVtZW50YWxfc29ydCkKIAkJ CQljb250aW51ZTsKIAogCQkJLyogUmVzdG9yZSB0aGUgaW5wdXQgcGF0aCAod2UgbWlnaHQg aGF2ZSBhZGRlZCBTb3J0IG9uIHRvcCkuICovCkBAIC03MzA0LDcgKzczMDQsNyBAQCBnYXRo ZXJfZ3JvdXBpbmdfcGF0aHMoUGxhbm5lckluZm8gKnJvb3QsIFJlbE9wdEluZm8gKnJlbCkK IAkgKiBncm91cF9wYXRoa2V5cyBiZWNhdXNlIHRoZW4gd2UgY2FuJ3QgcG9zc2libHkgaGF2 ZSBhIHByZXNvcnRlZCBwcmVmaXgKIAkgKiBvZiB0aGUgbGlzdCB3aXRob3V0IGhhdmluZyB0 aGUgbGlzdCBiZSBmdWxseSBzb3J0ZWQuCiAJICovCi0JaWYgKCFlbmFibGVfaW5jcmVtZW50 YWxzb3J0IHx8IGxpc3RfbGVuZ3RoKHJvb3QtPmdyb3VwX3BhdGhrZXlzKSA9PSAxKQorCWlm ICghZW5hYmxlX2luY3JlbWVudGFsX3NvcnQgfHwgbGlzdF9sZW5ndGgocm9vdC0+Z3JvdXBf cGF0aGtleXMpID09IDEpCiAJCXJldHVybjsKIAogCS8qIGFsc28gY29uc2lkZXIgaW5jcmVt ZW50YWwgc29ydCBvbiBwYXJ0aWFsIHBhdGhzLCBpZiBlbmFibGVkICovCmRpZmYgLS1naXQg YS9zcmMvYmFja2VuZC91dGlscy9taXNjL2d1Yy5jIGIvc3JjL2JhY2tlbmQvdXRpbHMvbWlz Yy9ndWMuYwppbmRleCBmZTdlMmY4YjkxLi45ZjVlMjIzOTIwIDEwMDY0NAotLS0gYS9zcmMv YmFja2VuZC91dGlscy9taXNjL2d1Yy5jCisrKyBiL3NyYy9iYWNrZW5kL3V0aWxzL21pc2Mv Z3VjLmMKQEAgLTk5MiwxMSArOTkyLDExIEBAIHN0YXRpYyBzdHJ1Y3QgY29uZmlnX2Jvb2wg Q29uZmlndXJlTmFtZXNCb29sW10gPQogCQlOVUxMLCBOVUxMLCBOVUxMCiAJfSwKIAl7Ci0J CXsiZW5hYmxlX2luY3JlbWVudGFsc29ydCIsIFBHQ19VU0VSU0VULCBRVUVSWV9UVU5JTkdf TUVUSE9ELAorCQl7ImVuYWJsZV9pbmNyZW1lbnRhbF9zb3J0IiwgUEdDX1VTRVJTRVQsIFFV RVJZX1RVTklOR19NRVRIT0QsCiAJCQlnZXR0ZXh0X25vb3AoIkVuYWJsZXMgdGhlIHBsYW5u ZXIncyB1c2Ugb2YgaW5jcmVtZW50YWwgc29ydCBzdGVwcy4iKSwKIAkJCU5VTEwKIAkJfSwK LQkJJmVuYWJsZV9pbmNyZW1lbnRhbHNvcnQsCisJCSZlbmFibGVfaW5jcmVtZW50YWxfc29y dCwKIAkJdHJ1ZSwKIAkJTlVMTCwgTlVMTCwgTlVMTAogCX0sCmRpZmYgLS1naXQgYS9zcmMv YmFja2VuZC91dGlscy9taXNjL3Bvc3RncmVzcWwuY29uZi5zYW1wbGUgYi9zcmMvYmFja2Vu ZC91dGlscy9taXNjL3Bvc3RncmVzcWwuY29uZi5zYW1wbGUKaW5kZXggYWMwMmJkMGMwMC4u YmQ0Y2I4MTQ0YiAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvdXRpbHMvbWlzYy9wb3N0Z3Jl c3FsLmNvbmYuc2FtcGxlCisrKyBiL3NyYy9iYWNrZW5kL3V0aWxzL21pc2MvcG9zdGdyZXNx bC5jb25mLnNhbXBsZQpAQCAtMzYxLDcgKzM2MSw3IEBACiAjZW5hYmxlX3BhcmFsbGVsX2Fw cGVuZCA9IG9uCiAjZW5hYmxlX3NlcXNjYW4gPSBvbgogI2VuYWJsZV9zb3J0ID0gb24KLSNl bmFibGVfaW5jcmVtZW50YWxzb3J0ID0gb24KKyNlbmFibGVfaW5jcmVtZW50YWxfc29ydCA9 IG9uCiAjZW5hYmxlX3RpZHNjYW4gPSBvbgogI2VuYWJsZV9wYXJ0aXRpb253aXNlX2pvaW4g PSBvZmYKICNlbmFibGVfcGFydGl0aW9ud2lzZV9hZ2dyZWdhdGUgPSBvZmYKZGlmZiAtLWdp dCBhL3NyYy9pbmNsdWRlL29wdGltaXplci9jb3N0LmggYi9zcmMvaW5jbHVkZS9vcHRpbWl6 ZXIvY29zdC5oCmluZGV4IDkyZTcwZWMwZDkuLjYxM2RiOGVhYjYgMTAwNjQ0Ci0tLSBhL3Ny Yy9pbmNsdWRlL29wdGltaXplci9jb3N0LmgKKysrIGIvc3JjL2luY2x1ZGUvb3B0aW1pemVy L2Nvc3QuaApAQCAtNTMsNyArNTMsNyBAQCBleHRlcm4gUEdETExJTVBPUlQgYm9vbCBlbmFi bGVfaW5kZXhvbmx5c2NhbjsKIGV4dGVybiBQR0RMTElNUE9SVCBib29sIGVuYWJsZV9iaXRt YXBzY2FuOwogZXh0ZXJuIFBHRExMSU1QT1JUIGJvb2wgZW5hYmxlX3RpZHNjYW47CiBleHRl cm4gUEdETExJTVBPUlQgYm9vbCBlbmFibGVfc29ydDsKLWV4dGVybiBQR0RMTElNUE9SVCBi b29sIGVuYWJsZV9pbmNyZW1lbnRhbHNvcnQ7CitleHRlcm4gUEdETExJTVBPUlQgYm9vbCBl bmFibGVfaW5jcmVtZW50YWxfc29ydDsKIGV4dGVybiBQR0RMTElNUE9SVCBib29sIGVuYWJs ZV9oYXNoYWdnOwogZXh0ZXJuIFBHRExMSU1QT1JUIGJvb2wgaGFzaGFnZ19hdm9pZF9kaXNr X3BsYW47CiBleHRlcm4gUEdETExJTVBPUlQgYm9vbCBlbmFibGVfbmVzdGxvb3A7CmRpZmYg LS1naXQgYS9zcmMvdGVzdC9yZWdyZXNzL2V4cGVjdGVkL2luY3JlbWVudGFsX3NvcnQub3V0 IGIvc3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9pbmNyZW1lbnRhbF9zb3J0Lm91dAppbmRl eCA1M2FjY2QwZGY5Li5lMzc2ZWExMjc2IDEwMDY0NAotLS0gYS9zcmMvdGVzdC9yZWdyZXNz L2V4cGVjdGVkL2luY3JlbWVudGFsX3NvcnQub3V0CisrKyBiL3NyYy90ZXN0L3JlZ3Jlc3Mv ZXhwZWN0ZWQvaW5jcmVtZW50YWxfc29ydC5vdXQKQEAgLTE0MTQsNyArMTQxNCw3IEBAIGNy ZWF0ZSB0YWJsZSB0IChhIGludCwgYiBpbnQsIGMgaW50KTsKIGluc2VydCBpbnRvIHQgc2Vs ZWN0IG1vZChpLDEwKSxtb2QoaSwxMCksaSBmcm9tIGdlbmVyYXRlX3NlcmllcygxLDEwMDAw KSBzKGkpOwogY3JlYXRlIGluZGV4IG9uIHQgKGEpOwogYW5hbHl6ZSB0Owotc2V0IGVuYWJs ZV9pbmNyZW1lbnRhbHNvcnQgPSBvZmY7CitzZXQgZW5hYmxlX2luY3JlbWVudGFsX3NvcnQg PSBvZmY7CiBleHBsYWluIChjb3N0cyBvZmYpIHNlbGVjdCBhLGIsc3VtKGMpIGZyb20gdCBn cm91cCBieSAxLDIgb3JkZXIgYnkgMSwyLDMgbGltaXQgMTsKICAgICAgICAgICAgICAgICAg ICAgICBRVUVSWSBQTEFOICAgICAgICAgICAgICAgICAgICAgIAogLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkBAIC0xNDMwLDcgKzE0 MzAsNyBAQCBleHBsYWluIChjb3N0cyBvZmYpIHNlbGVjdCBhLGIsc3VtKGMpIGZyb20gdCBn cm91cCBieSAxLDIgb3JkZXIgYnkgMSwyLDMgbGltaXQgMQogICAgICAgICAgICAgICAgICAg ICAgICAgICAgLT4gIFBhcmFsbGVsIFNlcSBTY2FuIG9uIHQKICgxMCByb3dzKQogCi1zZXQg ZW5hYmxlX2luY3JlbWVudGFsc29ydCA9IG9uOworc2V0IGVuYWJsZV9pbmNyZW1lbnRhbF9z b3J0ID0gb247CiBleHBsYWluIChjb3N0cyBvZmYpIHNlbGVjdCBhLGIsc3VtKGMpIGZyb20g dCBncm91cCBieSAxLDIgb3JkZXIgYnkgMSwyLDMgbGltaXQgMTsKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFFVRVJZIFBMQU4gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAKIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KZGlmZiAtLWdpdCBhL3NyYy90ZXN0L3JlZ3Jlc3MvZXhw ZWN0ZWQvcGFydGl0aW9uX2FnZ3JlZ2F0ZS5vdXQgYi9zcmMvdGVzdC9yZWdyZXNzL2V4cGVj dGVkL3BhcnRpdGlvbl9hZ2dyZWdhdGUub3V0CmluZGV4IGMzNjk3MDU3NWYuLjQ1YzY5OGRh ZjQgMTAwNjQ0Ci0tLSBhL3NyYy90ZXN0L3JlZ3Jlc3MvZXhwZWN0ZWQvcGFydGl0aW9uX2Fn Z3JlZ2F0ZS5vdXQKKysrIGIvc3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9wYXJ0aXRpb25f YWdncmVnYXRlLm91dApAQCAtMTIsNyArMTIsNyBAQCBTRVQgZW5hYmxlX3BhcnRpdGlvbndp c2Vfam9pbiBUTyB0cnVlOwogLS0gRGlzYWJsZSBwYXJhbGxlbCBwbGFucy4KIFNFVCBtYXhf cGFyYWxsZWxfd29ya2Vyc19wZXJfZ2F0aGVyIFRPIDA7CiAtLSBEaXNhYmxlIGluY3JlbWVu dGFsIHNvcnQsIHdoaWNoIGNhbiBpbmZsdWVuY2Ugc2VsZWN0ZWQgcGxhbnMgZHVlIHRvIGZ1 enogZmFjdG9yLgotU0VUIGVuYWJsZV9pbmNyZW1lbnRhbHNvcnQgVE8gb2ZmOworU0VUIGVu YWJsZV9pbmNyZW1lbnRhbF9zb3J0IFRPIG9mZjsKIC0tCiAtLSBUZXN0cyBmb3IgbGlzdCBw YXJ0aXRpb25lZCB0YWJsZXMuCiAtLQpkaWZmIC0tZ2l0IGEvc3JjL3Rlc3QvcmVncmVzcy9l eHBlY3RlZC9zeXN2aWV3cy5vdXQgYi9zcmMvdGVzdC9yZWdyZXNzL2V4cGVjdGVkL3N5c3Zp ZXdzLm91dAppbmRleCAwMWI3Nzg2ZjAxLi4wNmM0YzNlNDc2IDEwMDY0NAotLS0gYS9zcmMv dGVzdC9yZWdyZXNzL2V4cGVjdGVkL3N5c3ZpZXdzLm91dAorKysgYi9zcmMvdGVzdC9yZWdy ZXNzL2V4cGVjdGVkL3N5c3ZpZXdzLm91dApAQCAtNzYsNyArNzYsNyBAQCBzZWxlY3QgbmFt ZSwgc2V0dGluZyBmcm9tIHBnX3NldHRpbmdzIHdoZXJlIG5hbWUgbGlrZSAnZW5hYmxlJSc7 CiAgZW5hYmxlX2dhdGhlcm1lcmdlICAgICAgICAgICAgIHwgb24KICBlbmFibGVfaGFzaGFn ZyAgICAgICAgICAgICAgICAgfCBvbgogIGVuYWJsZV9oYXNoam9pbiAgICAgICAgICAgICAg ICB8IG9uCi0gZW5hYmxlX2luY3JlbWVudGFsc29ydCAgICAgICAgIHwgb24KKyBlbmFibGVf aW5jcmVtZW50YWxfc29ydCAgICAgICAgfCBvbgogIGVuYWJsZV9pbmRleG9ubHlzY2FuICAg ICAgICAgICB8IG9uCiAgZW5hYmxlX2luZGV4c2NhbiAgICAgICAgICAgICAgIHwgb24KICBl bmFibGVfbWF0ZXJpYWwgICAgICAgICAgICAgICAgfCBvbgpkaWZmIC0tZ2l0IGEvc3JjL3Rl c3QvcmVncmVzcy9zcWwvaW5jcmVtZW50YWxfc29ydC5zcWwgYi9zcmMvdGVzdC9yZWdyZXNz L3NxbC9pbmNyZW1lbnRhbF9zb3J0LnNxbAppbmRleCAzNzNlNjJhYzEzLi45YzA0MGM5MGU2 IDEwMDY0NAotLS0gYS9zcmMvdGVzdC9yZWdyZXNzL3NxbC9pbmNyZW1lbnRhbF9zb3J0LnNx bAorKysgYi9zcmMvdGVzdC9yZWdyZXNzL3NxbC9pbmNyZW1lbnRhbF9zb3J0LnNxbApAQCAt MjEwLDEwICsyMTAsMTAgQEAKIGNyZWF0ZSBpbmRleCBvbiB0IChhKTsKIGFuYWx5emUgdDsK IAotc2V0IGVuYWJsZV9pbmNyZW1lbnRhbHNvcnQgPSBvZmY7CitzZXQgZW5hYmxlX2luY3Jl bWVudGFsX3NvcnQgPSBvZmY7CiBleHBsYWluIChjb3N0cyBvZmYpIHNlbGVjdCBhLGIsc3Vt KGMpIGZyb20gdCBncm91cCBieSAxLDIgb3JkZXIgYnkgMSwyLDMgbGltaXQgMTsKIAotc2V0 IGVuYWJsZV9pbmNyZW1lbnRhbHNvcnQgPSBvbjsKK3NldCBlbmFibGVfaW5jcmVtZW50YWxf c29ydCA9IG9uOwogZXhwbGFpbiAoY29zdHMgb2ZmKSBzZWxlY3QgYSxiLHN1bShjKSBmcm9t IHQgZ3JvdXAgYnkgMSwyIG9yZGVyIGJ5IDEsMiwzIGxpbWl0IDE7CiAKIC0tIEluY3JlbWVu dGFsIHNvcnQgdnMuIHNldCBvcGVyYXRpb25zIHdpdGggdmFybm8gMApkaWZmIC0tZ2l0IGEv c3JjL3Rlc3QvcmVncmVzcy9zcWwvcGFydGl0aW9uX2FnZ3JlZ2F0ZS5zcWwgYi9zcmMvdGVz dC9yZWdyZXNzL3NxbC9wYXJ0aXRpb25fYWdncmVnYXRlLnNxbAppbmRleCAxNzhmMjA3OWZh Li4xMTdmNjVlY2I0IDEwMDY0NAotLS0gYS9zcmMvdGVzdC9yZWdyZXNzL3NxbC9wYXJ0aXRp b25fYWdncmVnYXRlLnNxbAorKysgYi9zcmMvdGVzdC9yZWdyZXNzL3NxbC9wYXJ0aXRpb25f YWdncmVnYXRlLnNxbApAQCAtMTMsNyArMTMsNyBAQAogLS0gRGlzYWJsZSBwYXJhbGxlbCBw bGFucy4KIFNFVCBtYXhfcGFyYWxsZWxfd29ya2Vyc19wZXJfZ2F0aGVyIFRPIDA7CiAtLSBE aXNhYmxlIGluY3JlbWVudGFsIHNvcnQsIHdoaWNoIGNhbiBpbmZsdWVuY2Ugc2VsZWN0ZWQg cGxhbnMgZHVlIHRvIGZ1enogZmFjdG9yLgotU0VUIGVuYWJsZV9pbmNyZW1lbnRhbHNvcnQg VE8gb2ZmOworU0VUIGVuYWJsZV9pbmNyZW1lbnRhbF9zb3J0IFRPIG9mZjsKIAogLS0KIC0t IFRlc3RzIGZvciBsaXN0IHBhcnRpdGlvbmVkIHRhYmxlcy4KLS0gCjIuMjcuMAoK --------------01B68CFF3355291B66DF3A20--