From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Sverre Hvammen Johansen" Subject: [PATCH] Fast forward strategies allow, never, and only Date: Sun, 11 May 2008 22:17:26 -0700 Message-ID: <402c10cd0805112217u2688eac6h8a650b7ab7bb4883@mail.gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_2101_11123404.1210569446178" To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon May 12 07:18:47 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JvQQv-0006g3-42 for gcvg-git-2@gmane.org; Mon, 12 May 2008 07:18:46 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751579AbYELFRb (ORCPT ); Mon, 12 May 2008 01:17:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751752AbYELFRb (ORCPT ); Mon, 12 May 2008 01:17:31 -0400 Received: from fg-out-1718.google.com ([72.14.220.159]:6758 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751575AbYELFR2 (ORCPT ); Mon, 12 May 2008 01:17:28 -0400 Received: by fg-out-1718.google.com with SMTP id 19so1673410fgg.17 for ; Sun, 11 May 2008 22:17:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to:subject:mime-version:content-type; bh=n3tcm9+5aPp9fV0rXJZtmDMBE5csB54nhvgFnnLHitI=; b=Vi30eAyxXpT5Z1rBBdrf/eWXNVtuS7SW+GuFWjw+V2tZ1gDziXMVUUXXztRk15krMYxqZubYQ2s7wnXTzM0D1bFPs8EZfk4IJQuaPNP0U0ZjHttbeIh7Cuh6b4itB15uJ+wjWGo4xpqQawh2x0uwf37McDzjZvQXys2yHUwqzg0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:mime-version:content-type; b=CKAOTD36FRK5IrQvWrDbYLaSh4nEBNWraSSwA6bGliMLPcrQyll/oM8ZI5+SK6ekZx69pFMQ5+JJTBmzNWBl0gtNTL0bASROGwD7rsvD1EKSmJ6SDUVw4jEQlUmBZKyYlFblu45s4ZDRkeADhkZTCt39bK3ZTL5S+P8bBE08qrc= Received: by 10.82.170.3 with SMTP id s3mr772000bue.72.1210569446176; Sun, 11 May 2008 22:17:26 -0700 (PDT) Received: by 10.82.172.1 with HTTP; Sun, 11 May 2008 22:17:26 -0700 (PDT) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: ------=_Part_2101_11123404.1210569446178 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline I am hereby sending an updated version of these patches as attachments to this mail. The patch series consists of the following six patches: 0001-Documentation-for-joining-more-than-two-histories.patch 0002-New-merge-tests.patch 0003-Introduce-ff-fast-forward-option.patch 0004-Restructure-git-merge.sh.patch 0005-Head-reduction-before-selecting-merge-strategy.patch 0006-Introduce-fast-forward-option-only.patch The first patch add some documentation, for how git currently handles merges where more than one remote is involved. The second patch add some tests. The third, fifth, and sixth adds new features and they are all trivial. The fourth patch computes the reduced parents but uses it only to determine whether we are up-to-date or doing a fast forward. -- Sverre Hvammen Johansen ------=_Part_2101_11123404.1210569446178 Content-Type: text/x-patch; name=0001-Documentation-for-joining-more-than-two-histories.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fg4lhlvf0 Content-Disposition: attachment; filename=0001-Documentation-for-joining-more-than-two-histories.patch RnJvbSA3ODFiM2MxMDI5NGRiNDZlOTFkNjMzYzg1YTE1ZmMyZTFlMTA5M2IxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdmVycmUgSHZhbW1lbiBKb2hhbnNlbiA8aHZhbW1lbkBnbWFp bC5jb20+CkRhdGU6IFN1biwgMTEgTWF5IDIwMDggMTc6MTk6MTIgLTA3MDAKU3ViamVjdDogW1BB VENIIDEvNl0gRG9jdW1lbnRhdGlvbiBmb3Igam9pbmluZyBtb3JlIHRoYW4gdHdvIGhpc3Rvcmll cwoKQWRkZWQgc29tZSBkb2N1bWVudGF0aW9uIGZvciBob3cgZ2l0LW1lcmdlIGN1cnJlbnRseQp3 b3JrcyB3aGVuIG1vcmUgdGhhbiB0d28gaGlzdG9yaWVzIGFyZSBqb2luZWQuCgpTaWduZWQtb2Zm LWJ5OiBTdmVycmUgSHZhbW1lbiBKb2hhbnNlbiA8aHZhbW1lbkBnbWFpbC5jb20+Ci0tLQogRG9j dW1lbnRhdGlvbi9naXQtbWVyZ2UudHh0IHwgICAzNiArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysKIDEgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2dpdC1tZXJnZS50eHQgYi9Eb2N1bWVu dGF0aW9uL2dpdC1tZXJnZS50eHQKaW5kZXggZWYxZjA1NS4uYWE1NjUxMiAxMDA2NDQKLS0tIGEv RG9jdW1lbnRhdGlvbi9naXQtbWVyZ2UudHh0CisrKyBiL0RvY3VtZW50YXRpb24vZ2l0LW1lcmdl LnR4dApAQCAtMTUxLDYgKzE1MSw0MiBAQCBBZnRlciBzZWVpbmcgYSBjb25mbGljdCwgeW91IGNh biBkbyB0d28gdGhpbmdzOgogICAgc2hvdWxkIGJlLCBhbmQgcnVuIGBnaXQtY29tbWl0YCB0byBj b21taXQgdGhlIHJlc3VsdC4KIAogCitKT0lOSU5HIE1PUkUgVEhBTiBUV08gSElTVE9SSUVTCist LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCisKK01vcmUgdGhhbiBvbmUgcmVtb3RlIG1h eSBiZSBzcGVjaWZpZWQgb24gdGhlIGNvbW1hbmQgbGluZS4gIFRob3NlCityZW1vdGVzIGFyZSB1 c2VkIGZvciBzZWxlY3RpbmcgdGhlIG1lcmdlIHN0YXJ0ZWd5IGFuZCBpcyBhbHNvIHVzZWQgaW4K K3RoZSBtZXJnZSBjb21taXQgbWVzc2FnZS4gIEhvd2V2ZXIsIHNvbWUgb2YgdGhlc2UgcmVtb3Rl cyBtYXkgbm90IGJlCitpbmRlcGVuZGVudC4gIE9ubHkgcmVtb3RlcyB3aXRoIGluZGVwZW5kZW50 IGhlYWRzIChyZWR1Y2VkIHBhcmVudHMpCit3aWxsIGJlIHJlY29yZGVkIGluIHRoZSBtZXJnZSBj b21taXQgb2JqZWN0LgorCitUaGUgZm9sbG93aW5nIHNob3dzIG1hc3RlciBhbmQgdHdvIHRvcGlj IGJyYW5jaGVzLiAgdG9waWNCIGlzIGJhc2VkCitvbiB0b3BpY0EsIHRvcGljQSBpcyBwcmV2aW91 c2x5IGJyYW5jaGVkIG9mZiBmcm9tIG1hc3RlcjoKKworLS0tLS0tLS0tLS0tCisgICAgICAgICAg ICAgICAgICAgIG8tLS1vLS0tbyAgdG9waWNCCisgICAgICAgICAgICAgICAgICAgLworICAgICAg ICAgIG8tLS1vLS0tbyAgdG9waWNBCisgICAgICAgICAvCisgICAgby0tLW8tLS1vLS0tby0tLW8t LS1vLS0tbyAgbWFzdGVyCisKKy0tLS0tLS0tLS0tLQorCitNZXJnaW5nIHRvcGljQSBhbmQgdG9w aWNCIHRvIHRoZSBtYXN0ZXIgYnJhbmNoIHdpbGwgc2VsZWN0IHRoZSBtZXJnZQorc3RyYXRlZ3kg YmFzZWQgb24gYWxsIHRocmVlIGJyYW5jaGVzIChhbiBPY3RvcHVzKS4gIG1hc3RlciBhbmQgdG9w aWNCCithcmUgdGhlIHJlZHVjZWQgcGFyZW50cyBhbmQgYXJlIHRoZXJlZm9yZSB0aGUgb25seSBw YXJlbnRzIHJlY29yZGVkIGluCit0aGUgbWVyZ2UgY29tbWl0IG9iamVjdDoKKworLS0tLS0tLS0t LS0tCisKKyAgICAgICAgICAgICAgICAgICAgby0tLW8tLS1vICB0b3BpY0IKKyAgICAgICAgICAg ICAgICAgICAvICAgICAgICAgXAorICAgICAgICAgIG8tLS1vLS0tbyAgdG9waWNBICAgbyAgbWFz dGVyCisgICAgICAgICAvICAgICAgICAgICAgICAgICAgIC8gCisgICAgby0tLW8tLS1vLS0tby0t LW8tLS1vLS0tbworCistLS0tLS0tLS0tLS0KKwogU0VFIEFMU08KIC0tLS0tLS0tCiBsaW5rZ2l0 OmdpdC1mbXQtbWVyZ2UtbXNnWzFdLCBsaW5rZ2l0OmdpdC1wdWxsWzFdLAotLSAKMS41LjUuNTQu Z2M2NTUwCgo= ------=_Part_2101_11123404.1210569446178 Content-Type: text/x-patch; name=0002-New-merge-tests.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fg4lirey1 Content-Disposition: attachment; filename=0002-New-merge-tests.patch RnJvbSAzOGZlNDMyZjgyNGExYzZkMjI1Y2MwY2IxN2M2NWE5Mzc0ZmU5NDhjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdmVycmUgSHZhbW1lbiBKb2hhbnNlbiA8aHZhbW1lbkBnbWFp bC5jb20+CkRhdGU6IFNhdCwgMyBNYXkgMjAwOCAyMTozNzoxNSAtMDcwMApTdWJqZWN0OiBbUEFU Q0ggMi82XSBOZXcgbWVyZ2UgdGVzdHMKCkludHJvZHVjZSBuZXcgbWVyZ2UgdGVzdHMgZm9yIHBy ZXBhcmF0aW9uIG9mIG5ldyBmZWF0dXJlczoKCiAgLS1mZj08ZmFzdCBmb3J3YXJkIG9wdGlvbj4K ICBIZWFkIHJlZHVjdGlvbgogIC0tZmY9b25seQoKU2V0IHVwIHRoZSBmcmFtZXdvcmsgKGJhc2Vk IG9uIHQ3NjAwKSBhbmQgYWRkIHNvbWUgdGVzdCBjYXNlcwp0aGF0IHNob3VsZCBzdWNjZWVkIGlu ZGVwZW5kZW50IG9mIHRoZSBuZXcgZmVhdHVyZXMuCgpTaWduZWQtb2ZmLWJ5OiBTdmVycmUgSHZh bW1lbiBKb2hhbnNlbiA8aHZhbW1lbkBnbWFpbC5jb20+Ci0tLQogdC90NzYwMS1tZXJnZS1mZi1v cHRpb25zLnNoIHwgIDQ3NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrCiAxIGZpbGVzIGNoYW5nZWQsIDQ3NyBpbnNlcnRpb25zKCspLCAwIGRlbGV0aW9ucygtKQog Y3JlYXRlIG1vZGUgMTAwNzU1IHQvdDc2MDEtbWVyZ2UtZmYtb3B0aW9ucy5zaAoKZGlmZiAtLWdp dCBhL3QvdDc2MDEtbWVyZ2UtZmYtb3B0aW9ucy5zaCBiL3QvdDc2MDEtbWVyZ2UtZmYtb3B0aW9u cy5zaApuZXcgZmlsZSBtb2RlIDEwMDc1NQppbmRleCAwMDAwMDAwLi5lNDk5YmY1Ci0tLSAvZGV2 L251bGwKKysrIGIvdC90NzYwMS1tZXJnZS1mZi1vcHRpb25zLnNoCkBAIC0wLDAgKzEsNDc3IEBA CisjIS9iaW4vc2gKKyMKKyMgQ29weXJpZ2h0IChjKSAyMDA4IFN2ZXJyZSBIdmFtbWVuIEpvaGFu c2VuLCBiYXNlZCBvbiB0NzYwMCBieSBMYXJzIEhqZW1saQorIworCit0ZXN0X2Rlc2NyaXB0aW9u PSdnaXQtbWVyZ2UKKworVGVzdGluZyBiYXNpYyBtZXJnZSBvcGVyYXRpb25zL29wdGlvbiBwYXJz aW5nLicKKworLiAuL3Rlc3QtbGliLnNoCisKK2NhdCA+ZmlsZSA8PEVPRgorMQorMgorMworNAor NQorNgorNworOAorOQorMTAKKzExCisxMgorRU9GCisKK2NhdCA+ZmlsZS4xIDw8RU9GCisxIFgK KzIKKzMKKzQKKzUKKzYKKzcKKzgKKzkKKzEwCisxMQorMTIKK0VPRgorCitjYXQgPmZpbGUuNSA8 PEVPRgorMQorMgorMworNAorNSBYCis2Cis3Cis4Cis5CisxMAorMTEKKzEyCitFT0YKKworY2F0 ID5maWxlLjkgPDxFT0YKKzEKKzIKKzMKKzQKKzUKKzYKKzcKKzgKKzkgWAorMTAKKzExCisxMgor RU9GCisKK2NhdCAgPnJlc3VsdC4wIDw8RU9GCisxCisyCiszCis0Cis1Cis2Cis3Cis4Cis5Cisx MAorMTEKKzEyCitFT0YKKworY2F0ICA+cmVzdWx0LjEgPDxFT0YKKzEgWAorMgorMworNAorNQor NgorNworOAorOQorMTAKKzExCisxMgorRU9GCisKK2NhdCA+cmVzdWx0LjEtNSA8PEVPRgorMSBY CisyCiszCis0Cis1IFgKKzYKKzcKKzgKKzkKKzEwCisxMQorMTIKK0VPRgorCitjYXQgPnJlc3Vs dC45IDw8RU9GCisxCisyCiszCis0Cis1Cis2Cis3Cis4Cis5IFgKKzEwCisxMQorMTIKK0VPRgor CitjYXQgPnJlc3VsdC4xLTUtOSA8PEVPRgorMSBYCisyCiszCis0Cis1IFgKKzYKKzcKKzgKKzkg WAorMTAKKzExCisxMgorRU9GCisKK2NhdCA+cmVzdWx0LjEtNS05LTEzIDw8RU9GCisxIFgKKzIK KzMKKzQKKzUgWAorNgorNworOAorOSBYCisxMAorMTEKKzEyCisxMyB4CitFT0YKKworY2F0ID5y ZXN1bHQuMS01LTEzIDw8RU9GCisxIFgKKzIKKzMKKzQKKzUgWAorNgorNworOAorOQorMTAKKzEx CisxMgorMTMgeAorRU9GCisKK2NhdCA+cmVzdWx0LjUtMTMgPDxFT0YKKzEKKzIKKzMKKzQKKzUg WAorNgorNworOAorOQorMTAKKzExCisxMgorMTMgeAorRU9GCisKK2NhdCA+cmVzdWx0LjEtMTMg PDxFT0YKKzEgWAorMgorMworNAorNQorNgorNworOAorOQorMTAKKzExCisxMgorMTMgeAorRU9G CisKK2NhdCA+ZXh0ZW5kIDw8RU9GCisxMyB4CitFT0YKKworCitjcmVhdGVfbWVyZ2VfbXNncygp IHsKKwllY2hvICJNZXJnZSBjb21taXQgJ2MyJyIgPm1zZy4xLTUgJiYKKwllY2hvICJNZXJnZSBj b21taXQgJ2MyJzsgY29tbWl0ICdjMyciID5tc2cuMS01LTkgJiYKKwllY2hvICJTcXVhc2hlZCBj b21taXQgb2YgdGhlIGZvbGxvd2luZzoiID5zcXVhc2guMSAmJgorCWVjaG8gPj5zcXVhc2guMSAm JgorCWdpdCBsb2cgLS1uby1tZXJnZXMgXkhFQUQgYzEgPj5zcXVhc2guMSAmJgorCWVjaG8gIlNx dWFzaGVkIGNvbW1pdCBvZiB0aGUgZm9sbG93aW5nOiIgPnNxdWFzaC4xLTUgJiYKKwllY2hvID4+ c3F1YXNoLjEtNSAmJgorCWdpdCBsb2cgLS1uby1tZXJnZXMgXkhFQUQgYzIgPj5zcXVhc2guMS01 ICYmCisJZWNobyAiU3F1YXNoZWQgY29tbWl0IG9mIHRoZSBmb2xsb3dpbmc6IiA+c3F1YXNoLjEt NS05ICYmCisJZWNobyA+PnNxdWFzaC4xLTUtOSAmJgorCWdpdCBsb2cgLS1uby1tZXJnZXMgXkhF QUQgYzIgYzMgPj5zcXVhc2guMS01LTkKK30KKwordmVyaWZ5X2RpZmYoKSB7CisJaWYgISBkaWZm IC11ICIkMSIgIiQyIgorCXRoZW4KKwkJZWNobyAiJDMiCisJCWZhbHNlCisJZmkKK30KKwordmVy aWZ5X21lcmdlKCkgeworCXZlcmlmeV9kaWZmICIkMiIgIiQxIiAiW09PUFNdIGJhZCBtZXJnZSBy ZXN1bHQiICYmCisJaWYgdGVzdCAkKGdpdCBscy1maWxlcyAtdSB8IHdjIC1sKSAtZ3QgMAorCXRo ZW4KKwkJZWNobyAiW09PUFNdIHVubWVyZ2VkIGZpbGVzIgorCQlmYWxzZQorCWZpICYmCisJaWYg ISBnaXQgZGlmZiAtLWV4aXQtY29kZQorCXRoZW4KKwkJZWNobyAiW09PUFNdIHdvcmtpbmcgdHJl ZSAhPSBpbmRleCIKKwkJZmFsc2UKKwlmaSAmJgorCWlmIHRlc3QgLW4gIiQzIgorCXRoZW4KKwkJ Z2l0IHNob3cgLXMgLS1wcmV0dHk9Zm9ybWF0OiVzIEhFQUQgPm1zZy5hY3QgJiYKKwkJdmVyaWZ5 X2RpZmYgIiQzIiBtc2cuYWN0ICJbT09QU10gYmFkIG1lcmdlIG1lc3NhZ2UiCisJZmkKK30KKwor dmVyaWZ5X2hlYWQoKSB7CisJaWYgdGVzdCAiJDEiICE9ICIkKGdpdCByZXYtcGFyc2UgSEVBRCki CisJdGhlbgorCQllY2hvICJbT09QU10gSEVBRCAhPSAkMSIKKwkJZmFsc2UKKwlmaQorfQorCit2 ZXJpZnlfcGFyZW50cygpIHsKKwlpPTEKKwl3aGlsZSB0ZXN0ICQjIC1ndCAwCisJZG8KKwkJaWYg dGVzdCAiJDEiICE9ICIkKGdpdCByZXYtcGFyc2UgSEVBRF4kaSkiCisJCXRoZW4KKwkJCWVjaG8g IltPT1BTXSBIRUFEXiRpICE9ICQxIgorCQkJcmV0dXJuIDEKKwkJZmkKKwkJaT0kKGV4cHIgJGkg KyAxKQorCQlzaGlmdAorCWRvbmUKK30KKwordmVyaWZ5X21lcmdlaGVhZHMoKSB7CisJaT0xCisJ aWYgISB0ZXN0IC1mIC5naXQvTUVSR0VfSEVBRAorCXRoZW4KKwkJZWNobyAiW09PUFNdIE1FUkdF X0hFQUQgaXMgbWlzc2luZyIKKwkJZmFsc2UKKwlmaSAmJgorCXdoaWxlIHRlc3QgJCMgLWd0IDAK KwlkbworCQloZWFkPSQoaGVhZCAtbiAkaSAuZ2l0L01FUkdFX0hFQUQgfCB0YWlsIC1uIDEpCisJ CWlmIHRlc3QgIiQxIiAhPSAiJGhlYWQiCisJCXRoZW4KKwkJCWVjaG8gIltPT1BTXSBNRVJHRV9I RUFEICRpICE9ICQxIgorCQkJcmV0dXJuIDEKKwkJZmkKKwkJaT0kKGV4cHIgJGkgKyAxKQorCQlz aGlmdAorCWRvbmUKK30KKwordmVyaWZ5X25vX21lcmdlaGVhZCgpIHsKKwlpZiB0ZXN0IC1mIC5n aXQvTUVSR0VfSEVBRAorCXRoZW4KKwkJZWNobyAiW09PUFNdIE1FUkdFX0hFQUQgZXhpc3RzIgor CQlmYWxzZQorCWZpCit9CisKKyMgU2V0dXAgd2l0aCB0aGUgZm9sbG93aW5nIGNvbW1pdHM6Cisj CisjICAgICAgICAgICAgIHkzCisjICAgICAgICAgICAgLyAgXAorIyAgICAgICAgICAgLyAgICBc CisjICAgICAgICAgeTEgICAgICB5MgorIyAgICAgICAgIHwgXCAgICAvIHwKKyMgICAgICAgICB8 ICBcICAvICB8CisjICAgICAgICAgeDEgIHgwICB4MgorIyAgICAgICAgIHwgIC8gIFwgIHwKKyMg ICAgICAgICB8IC8gICAgXCB8CisjICAgICAgICAgYzEgICAgICBjMgorIyAgICAgICAgICAgXCAg ICAvCisjICAgICAgICAgICAgXCAgLworIyAgICAgICAgICAgICBjMC0tLWMzCisjCisKK3Rlc3Rf ZXhwZWN0X3N1Y2Nlc3MgJ3NldHVwJyAnCisJZ2l0IGFkZCBmaWxlICYmCisJdGVzdF90aWNrICYm CisJZ2l0IGNvbW1pdCAtbSAiY29tbWl0IDAiICYmCisJZ2l0IHRhZyBjMCAmJgorCWMwPSQoZ2l0 IHJldi1wYXJzZSBIRUFEKSAmJgorCisJY3AgZmlsZS4xIGZpbGUgJiYKKwlnaXQgYWRkIGZpbGUg JiYKKwl0ZXN0X3RpY2sgJiYKKwlnaXQgY29tbWl0IC1tICJjb21taXQgMSIgJiYKKwlnaXQgdGFn IGMxICYmCisJYzE9JChnaXQgcmV2LXBhcnNlIEhFQUQpICYmCisJdGVzdF90aWNrICYmCisKKwln aXQgcmVzZXQgLS1oYXJkICIkYzAiICYmCisJY3AgZmlsZS41IGZpbGUgJiYKKwlnaXQgYWRkIGZp bGUgJiYKKwlnaXQgY29tbWl0IC1tICJjb21taXQgMiIgJiYKKwl0ZXN0X3RpY2sgJiYKKwlnaXQg dGFnIGMyICYmCisJYzI9JChnaXQgcmV2LXBhcnNlIEhFQUQpICYmCisKKwlnaXQgcmVzZXQgLS1o YXJkICIkYzAiICYmCisJY3AgZmlsZS45IGZpbGUgJiYKKwlnaXQgYWRkIGZpbGUgJiYKKwl0ZXN0 X3RpY2sgJiYKKwlnaXQgY29tbWl0IC1tICJjb21taXQgMyIgJiYKKwlnaXQgdGFnIGMzICYmCisJ YzM9JChnaXQgcmV2LXBhcnNlIEhFQUQpICYmCisJdGVzdF90aWNrICYmCisKKwlnaXQgcmVzZXQg LS1oYXJkICIkYzEiICYmCisJY2F0IGV4dGVuZCA+PmZpbGUgJiYKKwlnaXQgYWRkIGZpbGUgJiYK KwlnaXQgY29tbWl0IC1tICJjb21taXQgNCIgJiYKKwlnaXQgdGFnIHgxICYmCisJeDE9JChnaXQg cmV2LXBhcnNlIEhFQUQpICYmCisJdGVzdF90aWNrICYmCisKKwlnaXQgcmVzZXQgLS1oYXJkICIk YzEiICYmCisJZ2l0IG1lcmdlICIkYzIiICYmCisJZ2l0IHRhZyB4MCAmJgorCXgwPSQoZ2l0IHJl di1wYXJzZSBIRUFEKSAmJgorCXRlc3RfdGljayAmJgorCisJZ2l0IHJlc2V0IC0taGFyZCAiJGMy IiAmJgorCWNhdCBleHRlbmQgPj5maWxlICYmCisJZ2l0IGFkZCBmaWxlICYmCisJZ2l0IGNvbW1p dCAtbSAiY29tbWl0IDUiICYmCisJZ2l0IHRhZyB4MiAmJgorCXgyPSQoZ2l0IHJldi1wYXJzZSBI RUFEKSAmJgorCXRlc3RfdGljayAmJgorCisJZ2l0IHJlc2V0IC0taGFyZCAiJHgxIiAmJgorCWdp dCBtZXJnZSAiJHgwIiAmJgorCWdpdCB0YWcgeTEgJiYKKwl5MT0kKGdpdCByZXYtcGFyc2UgSEVB RCkgJiYKKwl0ZXN0X3RpY2sgJiYKKworCWdpdCByZXNldCAtLWhhcmQgIiR4MCIgJiYKKwlnaXQg bWVyZ2UgIiR4MiIgJiYKKwlnaXQgdGFnIHkyICYmCisJeTI9JChnaXQgcmV2LXBhcnNlIEhFQUQp ICYmCisJdGVzdF90aWNrICYmCisKKwlnaXQgcmVzZXQgLS1oYXJkICIkeTEiICYmCisJZ2l0IG1l cmdlICIkeTIiICYmCisJZ2l0IHRhZyB5MyAmJgorCXkzPSQoZ2l0IHJldi1wYXJzZSBIRUFEKSAm JgorCXRlc3RfdGljayAmJgorCWdpdCByZXNldCAtLWhhcmQgIiRjMCIgJiYKKwljcmVhdGVfbWVy Z2VfbXNncyAmJgorCisJZ2l0IHJlc2V0IC0taGFyZCB4MSAmJgorCWdpdCBjbG9uZSAuZ2l0IGNs b25lICYmCisJZ2l0IGNvbmZpZyByZW1vdGUuY2xvbmUudXJsIGNsb25lICYmCisJZ2l0IGNvbmZp ZyByZW1vdGUuY2xvbmUuZmV0Y2ggIityZWZzL2hlYWRzLyo6cmVmcy9yZW1vdGVzL2Nsb25lLyoi ICYmCisKKwkobWtkaXIgbmV3ICYmIGNkIG5ldyAmJiBnaXQgaW5pdCAmJiBjcCAuLi9maWxlLjkg ZmlsZTIgJiYgZ2l0IGFkZCBmaWxlMiAmJiB0ZXN0X3RpY2sgJiYgZ2l0IGNvbW1pdCAtbSAiY29t bWl0IG5ldyIpICYmCisJZ2l0IGNvbmZpZyByZW1vdGUubmV3LnVybCBuZXcgJiYKKwlnaXQgY29u ZmlnIHJlbW90ZS5uZXcuZmV0Y2ggIityZWZzL2hlYWRzLyo6cmVmcy9yZW1vdGVzL25ldy8qIgor JworCit0ZXN0X2RlYnVnICdnaXRrIC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJn ZSBjMSB3aXRoIGMwIGFuZCBjMCcgJworCWdpdCByZXNldCAtLWhhcmQgYzEgJiYKKwlnaXQgY29u ZmlnIGJyYW5jaC5tYXN0ZXIubWVyZ2VvcHRpb25zICIiICYmCisJdGVzdF90aWNrICYmCisJZ2l0 IG1lcmdlIGMwIGMwICYmCisJdmVyaWZ5X21lcmdlIGZpbGUgcmVzdWx0LjEgJiYKKwl2ZXJpZnlf aGVhZCAkYzEKKycKKwordGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcKKwordGVzdF9leHBlY3Rfc3Vj Y2VzcyAnbWVyZ2UgYzAgd2l0aCBjMSBhbmQgYzInICcKKwlnaXQgcmVzZXQgLS1oYXJkIGMwICYm CisJZ2l0IGNvbmZpZyBicmFuY2gubWFzdGVyLm1lcmdlb3B0aW9ucyAiIiAmJgorCXRlc3RfdGlj ayAmJgorCWdpdCBtZXJnZSBjMSBjMiAmJgorCXZlcmlmeV9tZXJnZSBmaWxlIHJlc3VsdC4xLTUg JiYKKwl2ZXJpZnlfcGFyZW50cyAkYzEgJGMyCisnCisKK3Rlc3RfZGVidWcgJ2dpdGsgLS1hbGwn CisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIGMxIHdpdGggYzAsIGMyLCBjMCwgYW5kIGMx JyAnCisJZ2l0IHJlc2V0IC0taGFyZCBjMSAmJgorCWdpdCBjb25maWcgYnJhbmNoLm1hc3Rlci5t ZXJnZW9wdGlvbnMgIiIgJiYKKwl0ZXN0X3RpY2sgJiYKKwlnaXQgbWVyZ2UgYzAgYzIgYzAgYzEg JiYKKwl2ZXJpZnlfbWVyZ2UgZmlsZSByZXN1bHQuMS01ICYmCisJdmVyaWZ5X3BhcmVudHMgJGMx ICRjMgorJworCit0ZXN0X2RlYnVnICdnaXRrIC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNjZXNz ICdtZXJnZSB5MiB3aXRoIHgwLCBjMywgYW5kIGMwJyAnCisJZ2l0IHJlc2V0IC0taGFyZCB5MiAm JgorCWdpdCBjb25maWcgYnJhbmNoLm1hc3Rlci5tZXJnZW9wdGlvbnMgIiIgJiYKKwl0ZXN0X3Rp Y2sgJiYKKwlnaXQgbWVyZ2UgeDAgYzMgYzAgJiYKKwl2ZXJpZnlfbWVyZ2UgZmlsZSByZXN1bHQu MS01LTktMTMgJiYKKwl2ZXJpZnlfcGFyZW50cyAkeTIgJGMzCisnCisKK3Rlc3RfZGVidWcgJ2dp dGsgLS1hbGwnCisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIHgwIHdpdGggeTIsIGMzLCBh bmQgYzAnICcKKwlnaXQgcmVzZXQgLS1oYXJkIHgwICYmCisJZ2l0IGNvbmZpZyBicmFuY2gubWFz dGVyLm1lcmdlb3B0aW9ucyAiIiAmJgorCXRlc3RfdGljayAmJgorCWdpdCBtZXJnZSB5MiBjMyBj MCAmJgorCXZlcmlmeV9tZXJnZSBmaWxlIHJlc3VsdC4xLTUtOS0xMyAmJgorCXZlcmlmeV9wYXJl bnRzICR5MiAkYzMKKycKKwordGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcKKworCit0ZXN0X2V4cGVj dF9zdWNjZXNzICdtZXJnZSBjMSB3aXRoIGMyIGFuZCB4MScgJworCWdpdCByZXNldCAtLWhhcmQg YzEgJiYKKwlnaXQgY29uZmlnIGJyYW5jaC5tYXN0ZXIubWVyZ2VvcHRpb25zICIiICYmCisJdGVz dF90aWNrICYmCisJZ2l0IG1lcmdlIGMyIHgxICYmCisJdmVyaWZ5X21lcmdlIGZpbGUgcmVzdWx0 LjEtNS0xMyAmJgorCXZlcmlmeV9wYXJlbnRzICRjMiAkeDEKKycKKwordGVzdF9kZWJ1ZyAnZ2l0 ayAtLWFsbCcKKwordGVzdF9kb25lCi0tIAoxLjUuNS41NC5nYzY1NTAKCg== ------=_Part_2101_11123404.1210569446178 Content-Type: text/x-patch; name=0003-Introduce-ff-fast-forward-option.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fg4liyo22 Content-Disposition: attachment; filename=0003-Introduce-ff-fast-forward-option.patch RnJvbSBiNzYzZGQ0OTNlNWNlYTQ1ZmZlY2RlYjExNTYxZGViNmIwNzMyYWVhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdmVycmUgSHZhbW1lbiBKb2hhbnNlbiA8aHZhbW1lbkBnbWFp bC5jb20+CkRhdGU6IFNhdCwgMyBNYXkgMjAwOCAxNzowMjo1MiAtMDcwMApTdWJqZWN0OiBbUEFU Q0ggMy82XSBJbnRyb2R1Y2UgLWZmPTxmYXN0IGZvcndhcmQgb3B0aW9uPgoKLS1mZiBub3cgdGFr ZXMgYW4gYXJndW1lbnQgYWxsb3dpbmcgLS1mZiB0byBiZSB3cml0dGVuCmFzIC0tZmY9YWxsb3cg YW5kIC1uby1mZiB0byBiZSB3cml0dGVuIGFzIC0tZmY9bmV2ZXIuClRoaXMgY2hhbmdlIGFsbG93 IG90aGVyIGZhc3QgZm9yd2FyZCBvcHRpb25zIHRvIGJlCmludHJvZHVjZWQgbGF0ZXIuCgpTZWUg dGhlIGRvY3VtZW50YXRpb24gZm9yIGEgZnVydGhlciBleHBsYW5hdGlvbiBvZiB0aGVzZSBvcHRp b25zLgoKU2lnbmVkLW9mZi1ieTogU3ZlcnJlIEh2YW1tZW4gSm9oYW5zZW4gPGh2YW1tZW5AZ21h aWwuY29tPgotLS0KIERvY3VtZW50YXRpb24vZmFzdC1mb3J3YXJkLW9wdGlvbnMudHh0IHwgICA0 NCArKysrKysrKwogRG9jdW1lbnRhdGlvbi9naXQtbWVyZ2UudHh0ICAgICAgICAgICAgfCAgICA2 ICstCiBEb2N1bWVudGF0aW9uL2dpdC1wdWxsLnR4dCAgICAgICAgICAgICB8ICAgIDIgKwogRG9j dW1lbnRhdGlvbi9tZXJnZS1vcHRpb25zLnR4dCAgICAgICAgfCAgICA5ICstCiBnaXQtbWVyZ2Uu c2ggICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgNDcgKysrKystLS0KIGdpdC1wdWxsLnNo ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgNCArLQogdC90NzYwMS1tZXJnZS1mZi1v cHRpb25zLnNoICAgICAgICAgICAgfCAgMTg4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrCiA3IGZpbGVzIGNoYW5nZWQsIDI3NyBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkK IGNyZWF0ZSBtb2RlIDEwMDY0NCBEb2N1bWVudGF0aW9uL2Zhc3QtZm9yd2FyZC1vcHRpb25zLnR4 dAoKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZmFzdC1mb3J3YXJkLW9wdGlvbnMudHh0IGIv RG9jdW1lbnRhdGlvbi9mYXN0LWZvcndhcmQtb3B0aW9ucy50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uOTVkMGU2ZgotLS0gL2Rldi9udWxsCisrKyBiL0RvY3VtZW50YXRp b24vZmFzdC1mb3J3YXJkLW9wdGlvbnMudHh0CkBAIC0wLDAgKzEsNDQgQEAKK0ZBU1QgRk9SV0FS RCBPUFRJT05TCistLS0tLS0tLS0tLS0tLS0tLS0tLQorCithbGxvdzo6CisKKwlEbyBub3QgZ2Vu ZXJhdGUgYSBtZXJnZSBjb21taXQgaWYgdGhlIG1lcmdlIHJlc29sdmVzIGFzIGEKKwlmYXN0LWZv cndhcmQsIG9ubHkgdXBkYXRlIHRoZSBicmFuY2ggcG9pbnRlci4gIFRoaXMgb3B0aW9uIGlzCisJ ZXF1aXZhbGVudCBvZiAnLS1mZicgd2l0aG91dCBhbnkgYXJndW1lbnQuICBUaGlzIGlzIHRoZQor CWRlZmF1bHQgYmVoYXZpb3IuCisKK25ldmVyOjoKKwlHZW5lcmF0ZSBhIG1lcmdlIGNvbW1pdCBl dmVuIGlmIHRoZSBtZXJnZSByZXNvbHZlcyBhcyBhCisJZmFzdC1mb3J3YXJkLiAgVGhpcyBvcHRp b24gaXMgZXF1aXZhbGVudCBvZiAnLS1uby1mZicuCisKK0lmIHlvdXIgd29ya2Zsb3cgaXMgYWx3 YXlzIHRvIGJyYW5jaCBmcm9tIHRoZSBzcGVjaWFsIGJyYW5jaAorKCJtYXN0ZXIiKSB3aGVuIHdv cmtpbmcgb24gYSB0b3BpYyBhbmQgbWVyZ2UgdGhhdCBiYWNrIHRvICJtYXN0ZXIiLCBpZgoreW91 IGhhcHBlbiB0byBoYXZlIHdvcmtlZCBvbmx5IG9uIGEgc2luZ2xlIHRvcGljIGFuZCB0aGUgIm1h c3RlciIgd2FzCituZXZlciBhZHZhbmNlZCBkdXJpbmcgdGhlIHRpbWUgeW91IHdvcmtlZCBvbiB0 aGF0IHRvcGljLCBtZXJnaW5nIHRoZQordG9waWMgYmFjayB0byAibWFzdGVyIiB3aWxsIHJlc3Vs dCBpbiBhIGZhc3QtZm9yd2FyZC4gIFdoZW4geW91IGxvb2sKK2JhY2sgdGhhdCBoaXN0b3J5LCB5 b3Ugd2lsbCBub3QgYmUgYWJsZSB0byB0ZWxsIHdoZXJlIHRoZSB0b3BpYworc3RhcnRlZCBhbmQg ZW5kZWQgYnkgZm9sbG93aW5nIHRoZSBhbmNlc3RyeSBjaGFpbiBvZiB0aGUgIm1hc3RlciIKK2Jy YW5jaC4KKworVXNpbmcgIm5ldmVyIGZhc3QgZm9yd2FyZCIgcG9saWN5IG9uIHN1Y2ggYSBzcGVj aWFsIGJyYW5jaCB3aWxsIGJlIGEKK3dheSB0byBtYWtlIHN1cmUgdGhhdCBhbGwgY29tbWl0cyBv biB0aGUgZmlyc3QtcGFyZW50IGFuY2VzdHJ5IG9mIHRoYXQKK3NwZWNpYWwgYnJhbmNoIHdpbGwg YmUgbWVyZ2VzIGZyb20gc29tZXRoaW5nIGVsc2UuICBGcm9tIHRoZSBoaXN0b3J5Cit5b3UgY2Fu IGRldGVybWluZSB3aGVyZSB0aGUgdG9waWMgc3RhcnRlZCBhbmQgZW5kZWQuCisKK1RoZSBmb2xs b3dpbmcgc2hvd3MgdHdvIGJyYW5jaGVzIGZvcmtlZCBvZmYgZnJvbSAibWFzdGVyIi4gIFRoZSBi cmFuY2gKKyJtYXN0ZXIiIGhhdmUgbWVyZ2VkIGluIGNoYW5nZXMgZnJvbSBicmFuY2ggInRvcGlj QSIgdHdpY2UgYW5kCisidG9waWNCIiBvbmNlOgorCistLS0tLS0tLS0tLS0KKyAgICAgICAgIG8t LS1vLS0tby0tLW8tLS1vICB0b3BpY0EKKyAgICAgICAgLyAgICAgXCAgICAgICAgICAgXAorICAg IC0tLSotLS0tLS0tKi0tLS0tLS0qLS0tKiAgbWFzdGVyCisgICAgICAvICAgICAgICAgXCAgICAg LworICAgICAgICAgICAgICAgICBvLS0tbyAgdG9waWNCCistLS0tLS0tLS0tLS0KKworVGhlIGZp cnN0IG1lcmdlIG9mIHRvcGljQSBvciB0aGUgb25seSBtZXJnZSBvZiB0b3BpY0Igd291bGQgaGF2 ZQorcmVzdWx0ZWQgaW4gYSBmYXN0IGZvcndhcmQgd2l0aG91dCAnLS1mZj1uZXZlcicuICBUb3Bp YyBBIGNvbnNpc3Qgb2YKK3Rob3NlIGNvbW1pdHMgdGhhdCBjYW4gYmUgcmVhY2hlZCBmcm9tIG1h c3Rlcl4yIHdpdGhvdXQgcGFzc2luZwordGhyb3VnaCBhbnkgb2YgdGhlIGZpcnN0LXBhcmVudCBh bmNlc3RyaWVzIG9mIG1hc3Rlci4KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZ2l0LW1lcmdl LnR4dCBiL0RvY3VtZW50YXRpb24vZ2l0LW1lcmdlLnR4dAppbmRleCBhYTU2NTEyLi43ZTFjYjdl IDEwMDY0NAotLS0gYS9Eb2N1bWVudGF0aW9uL2dpdC1tZXJnZS50eHQKKysrIGIvRG9jdW1lbnRh dGlvbi9naXQtbWVyZ2UudHh0CkBAIC05LDcgKzksOCBAQCBnaXQtbWVyZ2UgLSBKb2luIHR3byBv ciBtb3JlIGRldmVsb3BtZW50IGhpc3RvcmllcyB0b2dldGhlcgogU1lOT1BTSVMKIC0tLS0tLS0t CiBbdmVyc2VdCi0nZ2l0LW1lcmdlJyBbLW5dIFstLXN0YXRdIFstLW5vLWNvbW1pdF0gWy0tc3F1 YXNoXSBbLXMgPHN0cmF0ZWd5Pl0uLi4KKydnaXQtbWVyZ2UnIFstbl0gWy0tc3RhdF0gWy0tbm8t Y29tbWl0XSBbLS1zcXVhc2hdCisJWy1zIDxzdHJhdGVneT5dLi4uIFstLWZmWz08ZmFzdCBmb3J3 YXJkIG9wdGlvbj5dXQogCVstbSA8bXNnPl0gPHJlbW90ZT4gPHJlbW90ZT4uLi4KICdnaXQtbWVy Z2UnIDxtc2c+IEhFQUQgPHJlbW90ZT4uLi4KIApAQCAtMzcsNiArMzgsOSBAQCBpbmNsdWRlOjpt ZXJnZS1vcHRpb25zLnR4dFtdCiAJbGVhc3Qgb25lIDxyZW1vdGU+LiAgU3BlY2lmeWluZyBtb3Jl IHRoYW4gb25lIDxyZW1vdGU+CiAJb2J2aW91c2x5IG1lYW5zIHlvdSBhcmUgdHJ5aW5nIGFuIE9j dG9wdXMuCiAKKworaW5jbHVkZTo6ZmFzdC1mb3J3YXJkLW9wdGlvbnMudHh0W10KKwogaW5jbHVk ZTo6bWVyZ2Utc3RyYXRlZ2llcy50eHRbXQogCiAKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24v Z2l0LXB1bGwudHh0IGIvRG9jdW1lbnRhdGlvbi9naXQtcHVsbC50eHQKaW5kZXggNjYzMDRmMC4u ZWI4MTZiYyAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9naXQtcHVsbC50eHQKKysrIGIvRG9j dW1lbnRhdGlvbi9naXQtcHVsbC50eHQKQEAgLTUyLDYgKzUyLDggQEAgaW5jbHVkZTo6cHVsbC1m ZXRjaC1wYXJhbS50eHRbXQogCiBpbmNsdWRlOjp1cmxzLXJlbW90ZXMudHh0W10KIAoraW5jbHVk ZTo6ZmFzdC1mb3J3YXJkLW9wdGlvbnMudHh0W10KKwogaW5jbHVkZTo6bWVyZ2Utc3RyYXRlZ2ll cy50eHRbXQogCiBERUZBVUxUIEJFSEFWSU9VUgpkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9t ZXJnZS1vcHRpb25zLnR4dCBiL0RvY3VtZW50YXRpb24vbWVyZ2Utb3B0aW9ucy50eHQKaW5kZXgg ZjM3YTc3Ni4uOGY4Nzc1OCAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9tZXJnZS1vcHRpb25z LnR4dAorKysgYi9Eb2N1bWVudGF0aW9uL21lcmdlLW9wdGlvbnMudHh0CkBAIC00MiwxMiArNDIs MTEgQEAKIAogLS1uby1mZjo6CiAJR2VuZXJhdGUgYSBtZXJnZSBjb21taXQgZXZlbiBpZiB0aGUg bWVyZ2UgcmVzb2x2ZWQgYXMgYQotCWZhc3QtZm9yd2FyZC4KKwlmYXN0LWZvcndhcmQuICAtLW5v LWZmIGlzIGFuIGFsaWFzIGZvciAtLWZmPW5ldmVyLgogCi0tLWZmOjoKLQlEbyBub3QgZ2VuZXJh dGUgYSBtZXJnZSBjb21taXQgaWYgdGhlIG1lcmdlIHJlc29sdmVkIGFzCi0JYSBmYXN0LWZvcndh cmQsIG9ubHkgdXBkYXRlIHRoZSBicmFuY2ggcG9pbnRlci4gVGhpcyBpcwotCXRoZSBkZWZhdWx0 IGJlaGF2aW9yIG9mIGdpdC1tZXJnZS4KKy0tZmZbPTxmYXN0IGZvcndhcmQgb3B0aW9uPl06Ogor CVNlbGVjdCBmYXN0IGZvcndhcmQgb3B0aW9uLiAgLS1mZiB3aXRob3V0IGFueSBhcmd1bWVudAor CWlzIGFuIGFsaWFzIGZvciAtLWZmPWFsbG93IHdoaWNoIGlzIHRoZSBkZWZhdWx0IGJlaGF2aW9y LgogCiAtcyA8c3RyYXRlZ3k+LCBcLS1zdHJhdGVneT08c3RyYXRlZ3k+OjoKIAlVc2UgdGhlIGdp dmVuIG1lcmdlIHN0cmF0ZWd5OyBjYW4gYmUgc3VwcGxpZWQgbW9yZSB0aGFuCmRpZmYgLS1naXQg YS9naXQtbWVyZ2Uuc2ggYi9naXQtbWVyZ2Uuc2gKaW5kZXggNjliMzVkOC4uOTFmYWRhNyAxMDA3 NTUKLS0tIGEvZ2l0LW1lcmdlLnNoCisrKyBiL2dpdC1tZXJnZS5zaApAQCAtMTYsNyArMTYsNyBA QCBsb2cgICAgICAgICAgICAgICAgICBhZGQgbGlzdCBvZiBvbmUtbGluZSBsb2cgdG8gbWVyZ2Ug Y29tbWl0IG1lc3NhZ2UKIG5vLWxvZyAgICAgICAgICAgICAgIGRvbid0IGFkZCBsaXN0IG9mIG9u ZS1saW5lIGxvZyB0byBtZXJnZSBjb21taXQgbWVzc2FnZQogc3F1YXNoICAgICAgICAgICAgICAg Y3JlYXRlIGEgc2luZ2xlIGNvbW1pdCBpbnN0ZWFkIG9mIGRvaW5nIGEgbWVyZ2UKIGNvbW1pdCAg ICAgICAgICAgICAgIHBlcmZvcm0gYSBjb21taXQgaWYgdGhlIG1lcmdlIHN1Y2Vzc2VzIChkZWZh dWx0KQotZmYgICAgICAgICAgICAgICAgICAgYWxsb3cgZmFzdCBmb3J3YXJkIChkZWZhdWx0KQor ZmY/ICAgICAgICAgICAgICAgICAgZmFzdCBmb3J3YXJkIG9wdGlvbnMKIHMsc3RyYXRlZ3k9ICAg ICAgICAgIG1lcmdlIHN0cmF0ZWd5IHRvIHVzZQogbSxtZXNzYWdlPSAgICAgICAgICAgbWVzc2Fn ZSB0byBiZSB1c2VkIGZvciB0aGUgbWVyZ2UgY29tbWl0IChpZiBhbnkpCiAiCkBAIC0zOSw3ICsz OSw3IEBAIG5vX2Zhc3RfZm9yd2FyZF9zdHJhdGVnaWVzPSdzdWJ0cmVlIG91cnMnCiBub190cml2 aWFsX3N0cmF0ZWdpZXM9J3JlY3Vyc2l2ZSByZWN1ciBzdWJ0cmVlIG91cnMnCiB1c2Vfc3RyYXRl Z2llcz0KIAotYWxsb3dfZmFzdF9mb3J3YXJkPXQKK2Zhc3RfZm9yd2FyZD1hbGxvdwogYWxsb3df dHJpdmlhbF9tZXJnZT10CiBzcXVhc2g9IG5vX2NvbW1pdD0gbG9nX2FyZz0KIApAQCAtMTU5LDgg KzE1OSw2IEBAIHBhcnNlX2NvbmZpZyAoKSB7CiAJCS0tbG9nfC0tbm8tbG9nKQogCQkJbG9nX2Fy Zz0kMSA7OwogCQktLXNxdWFzaCkKLQkJCXRlc3QgIiRhbGxvd19mYXN0X2ZvcndhcmQiID0gdCB8 fAotCQkJCWRpZSAiWW91IGNhbm5vdCBjb21iaW5lIC0tc3F1YXNoIHdpdGggLS1uby1mZi4iCiAJ CQlzcXVhc2g9dCBub19jb21taXQ9dCA7OwogCQktLW5vLXNxdWFzaCkKIAkJCXNxdWFzaD0gbm9f Y29tbWl0PSA7OwpAQCAtMTY5LDExICsxNjcsMjYgQEAgcGFyc2VfY29uZmlnICgpIHsKIAkJLS1u by1jb21taXQpCiAJCQlub19jb21taXQ9dCA7OwogCQktLWZmKQotCQkJYWxsb3dfZmFzdF9mb3J3 YXJkPXQgOzsKKwkJCWNhc2UgIiQyIiBpbgorCQkJYWxsb3d8bmV2ZXIpCisJCQkJZmFzdF9mb3J3 YXJkPSQyOyBzaGlmdCA7OworCQkJLSopCisJCQkJZmFzdF9mb3J3YXJkPWFsbG93IDs7CisJCQkq KQorCQkJCWRpZSAiQXZhaWxhYmxlIGZhc3QtZm9yd2FyZCBvcHRpb25zIGFyZTogYWxsb3cgYW5k IG5ld2VyIiA7OworCQkJZXNhYworCQkJOzsKKwkJLS1mZj0qKQorCQkJZmFzdF9mb3J3YXJkPSR7 MSMtLWZmPX0KKwkJCWNhc2UgIiRmYXN0X2ZvcndhcmQiIGluCisJCQlhbGxvd3xuZXZlcikKKwkJ CQk7OworCQkJKikKKwkJCQlkaWUgIkF2YWlsYWJsZSBmYXN0LWZvcndhcmQgb3B0aW9ucyBhcmU6 IGFsbG93IGFuZCBuZXdlciIgOzsKKwkJCWVzYWMKKwkJCTs7CiAJCS0tbm8tZmYpCi0JCQl0ZXN0 ICIkc3F1YXNoIiAhPSB0IHx8Ci0JCQkJZGllICJZb3UgY2Fubm90IGNvbWJpbmUgLS1zcXVhc2gg d2l0aCAtLW5vLWZmLiIKLQkJCWFsbG93X2Zhc3RfZm9yd2FyZD1mIDs7CisJCQlmYXN0X2Zvcndh cmQ9bmV2ZXIgOzsKIAkJLXN8LS1zdHJhdGVneSkKIAkJCXNoaWZ0CiAJCQljYXNlICIgJGFsbF9z dHJhdGVnaWVzICIgaW4KQEAgLTE5NSw2ICsyMDgsOCBAQCBwYXJzZV9jb25maWcgKCkgewogCQll c2FjCiAJCXNoaWZ0CiAJZG9uZQorCXRlc3QgIiRmYXN0X2ZvcndhcmQiID0gYWxsb3cgLW8gIiRz cXVhc2giID0gIiIgfHwKKwkJZGllICJZb3UgY2Fubm90IGNvbWJpbmUgLS1zcXVhc2ggd2l0aCAt LWZmPW5ldmVyIgogCWFyZ3NfbGVmdD0kIwogfQogCkBAIC0zMTUsNyArMzMwLDcgQEAgZG8KIAlk bwogCQljYXNlICIgJHMgIiBpbgogCQkqIiAkc3MgIiopCi0JCQlhbGxvd19mYXN0X2ZvcndhcmQ9 ZgorCQkJZmFzdF9mb3J3YXJkPW5ldmVyCiAJCQlicmVhawogCQkJOzsKIAkJZXNhYwpAQCAtMzQx LDE3ICszNTYsMTcgQEAgY2FzZSAiJCMiIGluCiBlc2FjCiBlY2hvICIkaGVhZCIgPiIkR0lUX0RJ Ui9PUklHX0hFQUQiCiAKLWNhc2UgIiRhbGxvd19mYXN0X2ZvcndhcmQsJCMsJGNvbW1vbiwkbm9f Y29tbWl0IiBpbgotPywqLCcnLCopCitjYXNlICIkZmFzdF9mb3J3YXJkLCQjLCRjb21tb24sJG5v X2NvbW1pdCIgaW4KKyosKiwnJywqKQogCSMgTm8gY29tbW9uIGFuY2VzdG9ycyBmb3VuZC4gV2Ug bmVlZCBhIHJlYWwgbWVyZ2UuCiAJOzsKLT8sMSwiJDEiLCopCisqLDEsIiQxIiwqKQogCSMgSWYg aGVhZCBjYW4gcmVhY2ggYWxsIHRoZSBtZXJnZSB0aGVuIHdlIGFyZSB1cCB0byBkYXRlLgogCSMg YnV0IGZpcnN0IHRoZSBtb3N0IGNvbW1vbiBjYXNlIG9mIG1lcmdpbmcgb25lIHJlbW90ZS4KIAlm aW5pc2hfdXBfdG9fZGF0ZSAiQWxyZWFkeSB1cC10by1kYXRlLiIKIAlleGl0IDAKIAk7OwotdCwx LCIkaGVhZCIsKikKK2FsbG93LDEsIiRoZWFkIiwqKQogCSMgQWdhaW4gdGhlIG1vc3QgY29tbW9u IGNhc2Ugb2YgbWVyZ2luZyBvbmUgcmVtb3RlLgogCWVjaG8gIlVwZGF0aW5nICQoZ2l0IHJldi1w YXJzZSAtLXNob3J0ICRoZWFkKS4uJChnaXQgcmV2LXBhcnNlIC0tc2hvcnQgJDEpIgogCWdpdCB1 cGRhdGUtaW5kZXggLS1yZWZyZXNoIDI+L2Rldi9udWxsCkBAIC0zNjYsMTEgKzM4MSwxMSBAQCB0 LDEsIiRoZWFkIiwqKQogCWRyb3BzYXZlCiAJZXhpdCAwCiAJOzsKLT8sMSw/KiIkTEYiPyosKikK KyosMSw/KiIkTEYiPyosKikKIAkjIFdlIGFyZSBub3QgZG9pbmcgb2N0b3B1cyBhbmQgbm90IGZh c3QgZm9yd2FyZC4gIE5lZWQgYQogCSMgcmVhbCBtZXJnZS4KIAk7OwotPywxLCosKQorKiwxLCos KQogCSMgV2UgYXJlIG5vdCBkb2luZyBvY3RvcHVzLCBub3QgZmFzdCBmb3J3YXJkLCBhbmQgaGF2 ZSBvbmx5CiAJIyBvbmUgY29tbW9uLgogCWdpdCB1cGRhdGUtaW5kZXggLS1yZWZyZXNoIDI+L2Rl di9udWxsCkBAIC00ODgsNyArNTAzLDcgQEAgZG9uZQogIyBhdXRvIHJlc29sdmVkIHRoZSBtZXJn ZSBjbGVhbmx5LgogaWYgdGVzdCAnJyAhPSAiJHJlc3VsdF90cmVlIgogdGhlbgotICAgIGlmIHRl c3QgIiRhbGxvd19mYXN0X2ZvcndhcmQiID0gInQiCisgICAgaWYgdGVzdCAkZmFzdF9mb3J3YXJk ID0gYWxsb3cKICAgICB0aGVuCiAgICAgICAgIHBhcmVudHM9JChnaXQgc2hvdy1icmFuY2ggLS1p bmRlcGVuZGVudCAiJGhlYWQiICIkQCIpCiAgICAgZWxzZQpkaWZmIC0tZ2l0IGEvZ2l0LXB1bGwu c2ggYi9naXQtcHVsbC5zaAppbmRleCBiZjBjMjk4Li45ZTkxZTc1IDEwMDc1NQotLS0gYS9naXQt cHVsbC5zaAorKysgYi9naXQtcHVsbC5zaApAQCAtNCw3ICs0LDcgQEAKICMKICMgRmV0Y2ggb25l IG9yIG1vcmUgcmVtb3RlIHJlZnMgYW5kIG1lcmdlIGl0L3RoZW0gaW50byB0aGUgY3VycmVudCBI RUFELgogCi1VU0FHRT0nWy1uIHwgLS1uby1zdGF0XSBbLS1bbm8tXWNvbW1pdF0gWy0tW25vLV1z cXVhc2hdIFstLVtuby1dZmZdIFstcyBzdHJhdGVneV0uLi4gWzxmZXRjaC1vcHRpb25zPl0gPHJl cG8+IDxoZWFkPi4uLicKK1VTQUdFPSdbLW4gfCAtLW5vLXN0YXRdIFstLVtuby1dY29tbWl0XSBb LS1bbm8tXXNxdWFzaF0gWy0tZmY9PGZmLXN0cmF0ZWd5Pl0gWy1zIHN0cmF0ZWd5XS4uLiBbPGZl dGNoLW9wdGlvbnM+XSA8cmVwbz4gPGhlYWQ+Li4uJwogTE9OR19VU0FHRT0nRmV0Y2ggb25lIG9y IG1vcmUgcmVtb3RlIHJlZnMgYW5kIG1lcmdlIGl0L3RoZW0gaW50byB0aGUgY3VycmVudCBIRUFE LicKIFNVQkRJUkVDVE9SWV9PSz1ZZXMKIE9QVElPTlNfU1BFQz0KQEAgLTQxLDYgKzQxLDggQEAg ZG8KIAkJbm9fZmY9LS1mZiA7OwogCS0tbm8tZmYpCiAJCW5vX2ZmPS0tbm8tZmYgOzsKKwktLWZm PWFsbG93fC0tZmY9bmV2ZXIpCisJCW5vX2ZmPSQxIDs7CiAJLXM9KnwtLXM9KnwtLXN0PSp8LS1z dHI9KnwtLXN0cmE9KnwtLXN0cmF0PSp8LS1zdHJhdGU9KnxcCiAJCS0tc3RyYXRlZz0qfC0tc3Ry YXRlZ3k9KnxcCiAJLXN8LS1zfC0tc3R8LS1zdHJ8LS1zdHJhfC0tc3RyYXR8LS1zdHJhdGV8LS1z dHJhdGVnfC0tc3RyYXRlZ3kpCmRpZmYgLS1naXQgYS90L3Q3NjAxLW1lcmdlLWZmLW9wdGlvbnMu c2ggYi90L3Q3NjAxLW1lcmdlLWZmLW9wdGlvbnMuc2gKaW5kZXggZTQ5OWJmNS4uYzdjNmQxNCAx MDA3NTUKLS0tIGEvdC90NzYwMS1tZXJnZS1mZi1vcHRpb25zLnNoCisrKyBiL3QvdDc2MDEtbWVy Z2UtZmYtb3B0aW9ucy5zaApAQCAtNDc0LDQgKzQ3NCwxOTIgQEAgdGVzdF9leHBlY3Rfc3VjY2Vz cyAnbWVyZ2UgYzEgd2l0aCBjMiBhbmQgeDEnICcKIAogdGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcK IAordGVzdF9leHBlY3Rfc3VjY2VzcyAnbWVyZ2UgeDAgd2l0aCBjMSAoLS1zcXVhc2ggY29tYmlu ZWQgd2l0aCAtLWZmPWFsbG93KScgJworCWdpdCByZXNldCAtLWhhcmQgeDAgJiYKKwlnaXQgY29u ZmlnIGJyYW5jaC5tYXN0ZXIubWVyZ2VvcHRpb25zICIiICYmCisJdGVzdF90aWNrICYmCisJZ2l0 IG1lcmdlIGMxIC0tc3F1YXNoIC0tZmY9YWxsb3cgJiYKKwl2ZXJpZnlfbWVyZ2UgZmlsZSByZXN1 bHQuMS01ICYmCisJdmVyaWZ5X2hlYWQgJHgwCisnCisKK3Rlc3RfZGVidWcgJ2dpdGsgLS1hbGwn CisKKwordGVzdF9leHBlY3Rfc3VjY2VzcyAnbWVyZ2UgYzEgd2l0aCBjMiAoLS1zcXVhc2ggY29t YmluZWQgd2l0aCAtLWZmPWFsbG93KScgJworCWdpdCByZXNldCAtLWhhcmQgYzEgJiYKKwlnaXQg Y29uZmlnIGJyYW5jaC5tYXN0ZXIubWVyZ2VvcHRpb25zICIiICYmCisJdGVzdF90aWNrICYmCisJ Z2l0IG1lcmdlIGMyIC0tc3F1YXNoIC0tZmY9YWxsb3cgJiYKKwl2ZXJpZnlfbWVyZ2UgZmlsZSBy ZXN1bHQuMS01ICYmCisJdmVyaWZ5X2hlYWQgJGMxICYmCisJZ2l0IGNvbW1pdCAmJgorCXZlcmlm eV9wYXJlbnRzICRjMQorJworCit0ZXN0X2RlYnVnICdnaXRrIC0tYWxsJworCisKK3Rlc3RfZXhw ZWN0X3N1Y2Nlc3MgJ21lcmdlIGMxIHdpdGggeDAgKC0tbm8tY29tbWl0IGNvbWJpbmVkIHdpdGgg LS1mZj1hbGxvdyknICcKKwlnaXQgcmVzZXQgLS1oYXJkIGMxICYmCisJZ2l0IGNvbmZpZyBicmFu Y2gubWFzdGVyLm1lcmdlb3B0aW9ucyAiIiAmJgorCXRlc3RfdGljayAmJgorCWdpdCBtZXJnZSB4 MCAtLW5vLWNvbW1pdCAtLWZmPWFsbG93ICYmCisJdmVyaWZ5X21lcmdlIGZpbGUgcmVzdWx0LjEt NSAmJgorCXZlcmlmeV9wYXJlbnRzICRjMQorJworCit0ZXN0X2RlYnVnICdnaXRrIC0tYWxsJwor CisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIHgwIHdpdGggYzEgKC0tbm8tY29tbWl0IGNv bWJpbmVkIHdpdGggLS1mZj1hbGxvdyknICcKKwlnaXQgcmVzZXQgLS1oYXJkIHgwICYmCisJZ2l0 IGNvbmZpZyBicmFuY2gubWFzdGVyLm1lcmdlb3B0aW9ucyAiIiAmJgorCXRlc3RfdGljayAmJgor CWdpdCBtZXJnZSBjMSAtLW5vLWNvbW1pdCAtLWZmPWFsbG93ICYmCisJdmVyaWZ5X21lcmdlIGZp bGUgcmVzdWx0LjEtNSAmJgorCXZlcmlmeV9oZWFkICR4MAorJworCit0ZXN0X2RlYnVnICdnaXRr IC0tYWxsJworCisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIGMxIHdpdGggYzIgKC0tbm8t Y29tbWl0IGNvbWJpbmVkIHdpdGggLS1mZj1hbGxvdyknICcKKwlnaXQgcmVzZXQgLS1oYXJkIGMx ICYmCisJZ2l0IGNvbmZpZyBicmFuY2gubWFzdGVyLm1lcmdlb3B0aW9ucyAiIiAmJgorCXRlc3Rf dGljayAmJgorCWdpdCBtZXJnZSBjMiAtLW5vLWNvbW1pdCAtLWZmPWFsbG93ICYmCisJdmVyaWZ5 X21lcmdlIGZpbGUgcmVzdWx0LjEtNSAmJgorCXZlcmlmeV9oZWFkICRjMSAmJgorCWdpdCBjb21t aXQgJiYKKwl2ZXJpZnlfcGFyZW50cyAkYzEKKycKKwordGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcK KworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJnZSBjMSB3aXRoIHgxIChwdWxsIC0tZmY9YWxs b3cpJyAnCisJZ2l0IHJlc2V0IC0taGFyZCBjMSAmJgorCXRlc3RfdGljayAmJgorCWdpdCBwdWxs IC0tZmY9YWxsb3cgY2xvbmUgcmVmcy9oZWFkcy9tYXN0ZXIgJiYKKwl2ZXJpZnlfbWVyZ2UgZmls ZSByZXN1bHQuMS0xMyAmJgorCXZlcmlmeV9oZWFkICR4MQorJworCit0ZXN0X2RlYnVnICdnaXRr IC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJnZSB4MiB3aXRoIHgxIChwdWxsIC0t ZmY9YWxsb3cpJyAnCisJZ2l0IHJlc2V0IC0taGFyZCB4MiAmJgorCXRlc3RfdGljayAmJgorCWdp dCBwdWxsIC0tZmY9YWxsb3cgY2xvbmUgcmVmcy9oZWFkcy9tYXN0ZXIgJiYKKwl2ZXJpZnlfbWVy Z2UgZmlsZSByZXN1bHQuMS01LTEzICYmCisJdmVyaWZ5X3BhcmVudHMgJHgyICR4MQorJworCit0 ZXN0X2RlYnVnICdnaXRrIC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJnZSBjMSB3 aXRoIG5ldyByZXBvc2l0b3J5IChwdWxsIC0tZmY9YWxsb3cpJyAnCisJZ2l0IHJlc2V0IC0taGFy ZCBjMSAmJgorCXRlc3RfdGljayAmJgorCWdpdCBwdWxsIC0tZmY9YWxsb3cgbmV3IHJlZnMvaGVh ZHMvbWFzdGVyICYmCisJdmVyaWZ5X21lcmdlIGZpbGUgcmVzdWx0LjEgJiYKKwl2ZXJpZnlfbWVy Z2UgZmlsZTIgcmVzdWx0LjkKKycKKwordGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcKKwordGVzdF9l eHBlY3Rfc3VjY2VzcyAnbWVyZ2UgeDAgd2l0aCBjMSAoLS1zcXVhc2ggY29tYmluZWQgd2l0aCAt LWZmPW5ldmVyKScgJworCWdpdCByZXNldCAtLWhhcmQgeDAgJiYKKwlnaXQgY29uZmlnIGJyYW5j aC5tYXN0ZXIubWVyZ2VvcHRpb25zICIiICYmCisJdGVzdF90aWNrICYmCisJdGVzdF9tdXN0X2Zh aWwgZ2l0IG1lcmdlIGMxIC0tc3F1YXNoIC0tZmY9bmV2ZXIgJiYKKwl2ZXJpZnlfbWVyZ2UgZmls ZSByZXN1bHQuMS01ICYmCisJdmVyaWZ5X2hlYWQgJHgwCisnCisKK3Rlc3RfZGVidWcgJ2dpdGsg LS1hbGwnCisKKwordGVzdF9leHBlY3Rfc3VjY2VzcyAnbWVyZ2UgYzEgd2l0aCBjMiAoLS1zcXVh c2ggY29tYmluZWQgd2l0aCAtLWZmPW5ldmVyKScgJworCWdpdCByZXNldCAtLWhhcmQgYzEgJiYK KwlnaXQgY29uZmlnIGJyYW5jaC5tYXN0ZXIubWVyZ2VvcHRpb25zICIiICYmCisJdGVzdF90aWNr ICYmCisJdGVzdF9tdXN0X2ZhaWwgZ2l0IG1lcmdlIGMyIC0tc3F1YXNoIC0tZmY9bmV2ZXIgJiYK Kwl2ZXJpZnlfbWVyZ2UgZmlsZSByZXN1bHQuMSAmJgorCXZlcmlmeV9oZWFkICRjMQorJworCit0 ZXN0X2RlYnVnICdnaXRrIC0tYWxsJworCisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIGMx IHdpdGggeDAgKC0tbm8tY29tbWl0IGNvbWJpbmVkIHdpdGggLS1mZj1uZXZlciknICcKKwlnaXQg cmVzZXQgLS1oYXJkIGMxICYmCisJZ2l0IGNvbmZpZyBicmFuY2gubWFzdGVyLm1lcmdlb3B0aW9u cyAiIiAmJgorCXRlc3RfdGljayAmJgorCWdpdCBtZXJnZSB4MCAtLW5vLWNvbW1pdCAtLWZmPW5l dmVyICYmCisJdmVyaWZ5X21lcmdlIGZpbGUgcmVzdWx0LjEtNSAmJgorCXZlcmlmeV9oZWFkICRj MSAmJgorCWdpdCBjb21taXQgJiYKKwl2ZXJpZnlfcGFyZW50cyAkYzEKKycKKwordGVzdF9kZWJ1 ZyAnZ2l0ayAtLWFsbCcKKworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJnZSB4MCB3aXRoIGMx ICgtLW5vLWNvbW1pdCBjb21iaW5lZCB3aXRoIC0tZmY9bmV2ZXIpJyAnCisJZ2l0IHJlc2V0IC0t aGFyZCB4MCAmJgorCWdpdCBjb25maWcgYnJhbmNoLm1hc3Rlci5tZXJnZW9wdGlvbnMgIiIgJiYK Kwl0ZXN0X3RpY2sgJiYKKwlnaXQgbWVyZ2UgYzEgLS1uby1jb21taXQgLS1mZj1uZXZlciAmJgor CXZlcmlmeV9tZXJnZSBmaWxlIHJlc3VsdC4xLTUgJiYKKwl2ZXJpZnlfaGVhZCAkeDAKKycKKwor dGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcKKworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJnZSBj MSB3aXRoIGMyICgtLW5vLWNvbW1pdCBjb21iaW5lZCB3aXRoIC0tZmY9bmV2ZXIpJyAnCisJZ2l0 IHJlc2V0IC0taGFyZCBjMSAmJgorCWdpdCBjb25maWcgYnJhbmNoLm1hc3Rlci5tZXJnZW9wdGlv bnMgIiIgJiYKKwl0ZXN0X3RpY2sgJiYKKwlnaXQgbWVyZ2UgYzIgLS1uby1jb21taXQgLS1mZj1u ZXZlciAmJgorCXZlcmlmeV9tZXJnZSBmaWxlIHJlc3VsdC4xLTUgJiYKKwl2ZXJpZnlfaGVhZCAk YzEgJiYKKwlnaXQgY29tbWl0ICYmCisJdmVyaWZ5X3BhcmVudHMgJGMxCisnCisKK3Rlc3RfZGVi dWcgJ2dpdGsgLS1hbGwnCisKKwordGVzdF9leHBlY3Rfc3VjY2VzcyAnbWVyZ2UgYzEgd2l0aCB4 MSAocHVsbCAtLWZmPW5ldmVyKScgJworCWdpdCByZXNldCAtLWhhcmQgYzEgJiYKKwl0ZXN0X3Rp Y2sgJiYKKwlnaXQgcHVsbCAtLWZmPW5ldmVyIGNsb25lIHJlZnMvaGVhZHMvbWFzdGVyICYmCisJ dmVyaWZ5X21lcmdlIGZpbGUgcmVzdWx0LjEtMTMgJiYKKwl2ZXJpZnlfcGFyZW50cyAkYzEgJHgx CisnCisKK3Rlc3RfZGVidWcgJ2dpdGsgLS1hbGwnCisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21l cmdlIHgyIHdpdGggeDEgKHB1bGwgLS1mZj1uZXZlciknICcKKwlnaXQgcmVzZXQgLS1oYXJkIHgy ICYmCisJdGVzdF90aWNrICYmCisJZ2l0IHB1bGwgLS1mZj1uZXZlciBjbG9uZSByZWZzL2hlYWRz L21hc3RlciAmJgorCXZlcmlmeV9tZXJnZSBmaWxlIHJlc3VsdC4xLTUtMTMgJiYKKwl2ZXJpZnlf cGFyZW50cyAkeDIgJHgxCisnCisKK3Rlc3RfZGVidWcgJ2dpdGsgLS1hbGwnCisKK3Rlc3RfZXhw ZWN0X3N1Y2Nlc3MgJ21lcmdlIGMxIHdpdGggbmV3IHJlcG9zaXRvcnkgKHB1bGwgLS1mZj1uZXZl ciknICcKKwlnaXQgcmVzZXQgLS1oYXJkIGMxICYmCisJdGVzdF90aWNrICYmCisJZ2l0IHB1bGwg LS1mZj1uZXZlciBuZXcgcmVmcy9oZWFkcy9tYXN0ZXIgJiYKKwl2ZXJpZnlfbWVyZ2UgZmlsZSBy ZXN1bHQuMSAmJgorCXZlcmlmeV9tZXJnZSBmaWxlMiByZXN1bHQuOQorJworCit0ZXN0X2RlYnVn ICdnaXRrIC0tYWxsJworCiB0ZXN0X2RvbmUKLS0gCjEuNS41LjU0LmdjNjU1MAoK ------=_Part_2101_11123404.1210569446178 Content-Type: text/x-patch; name=0004-Restructure-git-merge.sh.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fg4lj46q3 Content-Disposition: attachment; filename=0004-Restructure-git-merge.sh.patch RnJvbSAyNjViZGIxMWYzNjNlOWM0ZTIzZDgxMjljMzFkZmM1MDZkMDA4MzAzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdmVycmUgSHZhbW1lbiBKb2hhbnNlbiA8aHZhbW1lbkBnbWFp bC5jb20+CkRhdGU6IFNhdCwgMyBNYXkgMjAwOCAxNjozMDoxMSAtMDcwMApTdWJqZWN0OiBbUEFU Q0ggNC82XSBSZXN0cnVjdHVyZSBnaXQtbWVyZ2Uuc2gKClJlc3RydWN0dXJlIGdpdC1tZXJnZS5z aCBmb3IgcHJlcGFyYXRpb24gb2YgbmV3IGZlYXR1cmU6CgogICAgICAgSGVhZCByZWR1Y3Rpb24g YmVmb3JlIHNlbGVjdGluZyBtZXJnZSBzdHJhdGVneQoKU29tZSBhc3BlY3RzIG9mIHRoaXMgcGF0 Y2ggZG9lcyBub3QgbWFrZSBtdWNoIHNlbnNlIHdpdGhvdXQKdGhlIG5leHQgcGF0Y2ggaW4gdGhp cyBzZXJpZXMuCgpTaWduZWQtb2ZmLWJ5OiBTdmVycmUgSHZhbW1lbiBKb2hhbnNlbiA8aHZhbW1l bkBnbWFpbC5jb20+Ci0tLQogZ2l0LW1lcmdlLnNoIHwgIDE4NiArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGVzIGNoYW5nZWQs IDEwNSBpbnNlcnRpb25zKCspLCA4MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9naXQtbWVy Z2Uuc2ggYi9naXQtbWVyZ2Uuc2gKaW5kZXggOTFmYWRhNy4uMmM5ZjE5ZiAxMDA3NTUKLS0tIGEv Z2l0LW1lcmdlLnNoCisrKyBiL2dpdC1tZXJnZS5zaApAQCAtMjEzLDYgKzIxMyw0NyBAQCBwYXJz ZV9jb25maWcgKCkgewogCWFyZ3NfbGVmdD0kIwogfQogCisjIEZpbmQgcmVkdWNlZCBwYXJlbnRz CisjIFRoZSBmb2xsb3dpbmcgdmFyaWFibGVzIGFyZSBzZXQgYXMgZm9sbG93OgorIyAgIHJlZHVj ZWRfcGFyZW50czogVGhlIHJlZHVjZWQgcGFyZW50cyBvZiB0aG9zZSBzcGVjaWZpZWQgb24gdGhl IGNvbW1hbmQgbGluZS4KKyMgICAgICAgICAgICAgICAgICAgIEhvd2V2ZXIsIHRoZSBhY3R1YWwg cGFyZW50cyBhcmUgaW5jbHVkZWQgaWYgd2UgbmV2ZXIgZmYuCisjICAgY29tbW9uOiAgICAgICAg ICBBbGwgY29tbW9uIGFuY2VzdG9ycyBvciBub3RfcXVlcmllZAorIyAgIGZmX2hlYWQ6ICAgICAg ICAgSGVhZCBvciBhbiByZWR1Y2VkIHBhcmVudCB0aGF0IG1heSBiZSBhIGNhbmRpZGF0ZSBmb3Ig ZmFzdCBmb3J3YXJkCitmaW5kX3JlZHVjZWRfcGFyZW50cyAoKSB7CisJaWYgdGVzdCAkZmFzdF9m b3J3YXJkID0gbmV2ZXIKKwl0aGVuCisJCXJlZHVjZWRfcGFyZW50cz0kKGdpdCByZXYtcGFyc2Ug IiRAIikKKwkJZmZfaGVhZD0kaGVhZAorCQljb21tb249bm90X3F1ZXJpZWQKKwllbHNlCisJCWlm IHRlc3QgJCMgPSAxCisJCXRoZW4KKwkJCWNvbW1vbj0kKGdpdCBtZXJnZS1iYXNlIC0tYWxsICRo ZWFkICIkMSIpCisJCQlpZiB0ZXN0ICIkY29tbW9uIiA9ICRoZWFkCisJCQl0aGVuCisJCQkJcmVk dWNlZF9wYXJlbnRzPQorCQkJCWZmX2hlYWQ9JDEKKwkJCWVsaWYgdGVzdCAiJGNvbW1vbiIgPSAi JDEiCisJCQl0aGVuCisJCQkJcmVkdWNlZF9wYXJlbnRzPQorCQkJCWZmX2hlYWQ9JGhlYWQKKwkJ CWVsc2UKKwkJCQlyZWR1Y2VkX3BhcmVudHM9JDEKKwkJCQlmZl9oZWFkPSRoZWFkCisJCQkgICAg CisJCQlmaQorCQllbHNlCisJCQlyZWR1Y2VkX3BhcmVudHM9JChnaXQgc2hvdy1icmFuY2ggLS1p bmRlcGVuZGVudCAkaGVhZCAiJEAiKQorCQkJIyBIZXJlIHdlIG1heSBhY3R1YWxseSBsaWUgYWJv dXQgd2hpY2ggYnJhbnNoIGlzIGZmIG9mIGhlYWQuCisJCQkjIFRoaXMgd2lsbCBwcmVzZXJ2ZSB0 aGUgb3JkZXIgdGhlIHVzZXIgZ2F2ZS4KKwkJCWZmX2hlYWQ9JHtyZWR1Y2VkX3BhcmVudHMlJSRM Rip9CisJCQlyZWR1Y2VkX3BhcmVudHM9JHtyZWR1Y2VkX3BhcmVudHMjJGZmX2hlYWR9CisJCQly ZWR1Y2VkX3BhcmVudHM9JHtyZWR1Y2VkX3BhcmVudHMjJExGfQorCQkJY29tbW9uPW5vdF9xdWVy aWVkCisJCWZpCisJZmkKK30KKwogdGVzdCAkIyAhPSAwIHx8IHVzYWdlCiAKIGhhdmVfbWVzc2Fn ZT0KQEAgLTMwMSwyNCArMzQyLDI4IEBAIGRvCiBkb25lCiBzZXQgeCAkcmVtb3RlaGVhZHMgOyBz aGlmdAogCitmaW5kX3JlZHVjZWRfcGFyZW50cyAiJEAiCisKK2FjdHVhbF9wYXJlbnRzPSQoZ2l0 IHJldi1wYXJzZSAiJEAiKQorCiBjYXNlICIkdXNlX3N0cmF0ZWdpZXMiIGluCiAnJykKLQljYXNl ICIkIyIgaW4KLQkxKQotCQl2YXI9ImBnaXQgY29uZmlnIC0tZ2V0IHB1bGwudHdvaGVhZGAiCisJ Y2FzZSAiJGFjdHVhbF9wYXJlbnRzIiBpbgorCT8qIiRMRiI/KikKKwkJdmFyPSJgZ2l0IGNvbmZp ZyAtLWdldCBwdWxsLm9jdG9wdXNgIgogCQlpZiB0ZXN0IC1uICIkdmFyIgogCQl0aGVuCiAJCQl1 c2Vfc3RyYXRlZ2llcz0iJHZhciIKIAkJZWxzZQotCQkJdXNlX3N0cmF0ZWdpZXM9IiRkZWZhdWx0 X3R3b2hlYWRfc3RyYXRlZ2llcyIKKwkJCXVzZV9zdHJhdGVnaWVzPSIkZGVmYXVsdF9vY3RvcHVz X3N0cmF0ZWdpZXMiCiAJCWZpIDs7CiAJKikKLQkJdmFyPSJgZ2l0IGNvbmZpZyAtLWdldCBwdWxs Lm9jdG9wdXNgIgorCQl2YXI9ImBnaXQgY29uZmlnIC0tZ2V0IHB1bGwudHdvaGVhZGAiCiAJCWlm IHRlc3QgLW4gIiR2YXIiCiAJCXRoZW4KIAkJCXVzZV9zdHJhdGVnaWVzPSIkdmFyIgogCQllbHNl Ci0JCQl1c2Vfc3RyYXRlZ2llcz0iJGRlZmF1bHRfb2N0b3B1c19zdHJhdGVnaWVzIgorCQkJdXNl X3N0cmF0ZWdpZXM9IiRkZWZhdWx0X3R3b2hlYWRfc3RyYXRlZ2llcyIKIAkJZmkgOzsKIAllc2Fj CiAJOzsKQEAgLTM0Niw4NyArMzkxLDY2IEBAIGRvCiAJZG9uZQogZG9uZQogCi1jYXNlICIkIyIg aW4KLTEpCi0JY29tbW9uPSQoZ2l0IG1lcmdlLWJhc2UgLS1hbGwgJGhlYWQgIiRAIikKLQk7Owot KikKLQljb21tb249JChnaXQgc2hvdy1icmFuY2ggLS1tZXJnZS1iYXNlICRoZWFkICIkQCIpCi0J OzsKLWVzYWMKIGVjaG8gIiRoZWFkIiA+IiRHSVRfRElSL09SSUdfSEVBRCIKIAotY2FzZSAiJGZh c3RfZm9yd2FyZCwkIywkY29tbW9uLCRub19jb21taXQiIGluCi0qLCosJycsKikKLQkjIE5vIGNv bW1vbiBhbmNlc3RvcnMgZm91bmQuIFdlIG5lZWQgYSByZWFsIG1lcmdlLgotCTs7Ci0qLDEsIiQx IiwqKQotCSMgSWYgaGVhZCBjYW4gcmVhY2ggYWxsIHRoZSBtZXJnZSB0aGVuIHdlIGFyZSB1cCB0 byBkYXRlLgotCSMgYnV0IGZpcnN0IHRoZSBtb3N0IGNvbW1vbiBjYXNlIG9mIG1lcmdpbmcgb25l IHJlbW90ZS4KLQlmaW5pc2hfdXBfdG9fZGF0ZSAiQWxyZWFkeSB1cC10by1kYXRlLiIKLQlleGl0 IDAKLQk7OwotYWxsb3csMSwiJGhlYWQiLCopCi0JIyBBZ2FpbiB0aGUgbW9zdCBjb21tb24gY2Fz ZSBvZiBtZXJnaW5nIG9uZSByZW1vdGUuCi0JZWNobyAiVXBkYXRpbmcgJChnaXQgcmV2LXBhcnNl IC0tc2hvcnQgJGhlYWQpLi4kKGdpdCByZXYtcGFyc2UgLS1zaG9ydCAkMSkiCi0JZ2l0IHVwZGF0 ZS1pbmRleCAtLXJlZnJlc2ggMj4vZGV2L251bGwKLQltc2c9IkZhc3QgZm9yd2FyZCIKLQlpZiB0 ZXN0IC1uICIkaGF2ZV9tZXNzYWdlIgoraWYgdGVzdCAteiAiJHJlZHVjZWRfcGFyZW50cyIKK3Ro ZW4KKwlpZiB0ZXN0ICRoZWFkID0gJGZmX2hlYWQKIAl0aGVuCi0JCW1zZz0iJG1zZyAobm8gY29t bWl0IGNyZWF0ZWQ7IC1tIG9wdGlvbiBpZ25vcmVkKSIKLQlmaQotCW5ld19oZWFkPSQoZ2l0IHJl di1wYXJzZSAtLXZlcmlmeSAiJDFeMCIpICYmCi0JZ2l0IHJlYWQtdHJlZSAtdiAtbSAtdSAtLWV4 Y2x1ZGUtcGVyLWRpcmVjdG9yeT0uZ2l0aWdub3JlICRoZWFkICIkbmV3X2hlYWQiICYmCi0JZmlu aXNoICIkbmV3X2hlYWQiICIkbXNnIiB8fCBleGl0Ci0JZHJvcHNhdmUKLQlleGl0IDAKLQk7Owot KiwxLD8qIiRMRiI/KiwqKQotCSMgV2UgYXJlIG5vdCBkb2luZyBvY3RvcHVzIGFuZCBub3QgZmFz dCBmb3J3YXJkLiAgTmVlZCBhCi0JIyByZWFsIG1lcmdlLgotCTs7Ci0qLDEsKiwpCi0JIyBXZSBh cmUgbm90IGRvaW5nIG9jdG9wdXMsIG5vdCBmYXN0IGZvcndhcmQsIGFuZCBoYXZlIG9ubHkKLQkj IG9uZSBjb21tb24uCi0JZ2l0IHVwZGF0ZS1pbmRleCAtLXJlZnJlc2ggMj4vZGV2L251bGwKLQlj YXNlICIkYWxsb3dfdHJpdmlhbF9tZXJnZSIgaW4KLQl0KQotCQkjIFNlZSBpZiBpdCBpcyByZWFs bHkgdHJpdmlhbC4KLQkJZ2l0IHZhciBHSVRfQ09NTUlUVEVSX0lERU5UID4vZGV2L251bGwgfHwg ZXhpdAotCQllY2hvICJUcnlpbmcgcmVhbGx5IHRyaXZpYWwgaW4taW5kZXggbWVyZ2UuLi4iCi0J CWlmIGdpdCByZWFkLXRyZWUgLS10cml2aWFsIC1tIC11IC12ICRjb21tb24gJGhlYWQgIiQxIiAm JgotCQkgICByZXN1bHRfdHJlZT0kKGdpdCB3cml0ZS10cmVlKQotCQl0aGVuCi0JCQllY2hvICJX b25kZXJmdWwuIgotCQkJcmVzdWx0X2NvbW1pdD0kKAotCQkJCXByaW50ZiAnJXNcbicgIiRtZXJn ZV9tc2ciIHwKLQkJCQlnaXQgY29tbWl0LXRyZWUgJHJlc3VsdF90cmVlIC1wIEhFQUQgLXAgIiQx IgotCQkJKSB8fCBleGl0Ci0JCQlmaW5pc2ggIiRyZXN1bHRfY29tbWl0IiAiSW4taW5kZXggbWVy Z2UiCi0JCQlkcm9wc2F2ZQotCQkJZXhpdCAwCi0JCWZpCi0JCWVjaG8gIk5vcGUuIgotCWVzYWMK LQk7OwotKikKLQkjIEFuIG9jdG9wdXMuICBJZiB3ZSBjYW4gcmVhY2ggYWxsIHRoZSByZW1vdGUg d2UgYXJlIHVwIHRvIGRhdGUuCi0JdXBfdG9fZGF0ZT10Ci0JZm9yIHJlbW90ZQotCWRvCi0JCWNv bW1vbl9vbmU9JChnaXQgbWVyZ2UtYmFzZSAtLWFsbCAkaGVhZCAkcmVtb3RlKQotCQlpZiB0ZXN0 ICIkY29tbW9uX29uZSIgIT0gIiRyZW1vdGUiCisJCWZpbmlzaF91cF90b19kYXRlICJBbHJlYWR5 IHVwLXRvLWRhdGUuIgorCQlleGl0IDAKKwllbGlmIHRlc3QgJGZhc3RfZm9yd2FyZCAhPSBuZXZl cgorCXRoZW4KKwkJZWNobyAiVXBkYXRpbmcgJChnaXQgcmV2LXBhcnNlIC0tc2hvcnQgJGhlYWQp Li4kKGdpdCByZXYtcGFyc2UgLS1zaG9ydCAkZmZfaGVhZCkiCisJCWdpdCB1cGRhdGUtaW5kZXgg LS1yZWZyZXNoIDI+L2Rldi9udWxsCisJCW1zZz0iRmFzdCBmb3J3YXJkIgorCQlpZiB0ZXN0IC1u ICIkaGF2ZV9tZXNzYWdlIgogCQl0aGVuCi0JCQl1cF90b19kYXRlPWYKLQkJCWJyZWFrCisJCQlt c2c9IiRtc2cgKG5vIGNvbW1pdCBjcmVhdGVkOyAtbSBvcHRpb24gaWdub3JlZCkiCiAJCWZpCi0J ZG9uZQotCWlmIHRlc3QgIiR1cF90b19kYXRlIiA9IHQKLQl0aGVuCi0JCWZpbmlzaF91cF90b19k YXRlICJBbHJlYWR5IHVwLXRvLWRhdGUuIFllZWFoISIKKwkJbmV3X2hlYWQ9JChnaXQgcmV2LXBh cnNlIC0tdmVyaWZ5ICIkZmZfaGVhZF4wIikgJiYKKwkJZ2l0IHJlYWQtdHJlZSAtdiAtbSAtdSAt LWV4Y2x1ZGUtcGVyLWRpcmVjdG9yeT0uZ2l0aWdub3JlICRoZWFkICIkbmV3X2hlYWQiICYmCisJ CWZpbmlzaCAiJG5ld19oZWFkIiAiJG1zZyIgfHwgZXhpdAorCQlkcm9wc2F2ZQogCQlleGl0IDAK IAlmaQorZmkKKworY2FzZSAiJGFjdHVhbF9wYXJlbnRzIiBpbgorPyoiJExGIj8qKQorCSMgV2Ug aGF2ZSBtb3JlIHRoYW4gb25lIGFjdHVhbCBwYXJlbnQKKwljb21tb249JChnaXQgc2hvdy1icmFu Y2ggLS1tZXJnZS1iYXNlICRoZWFkICRhY3R1YWxfcGFyZW50cykKIAk7OworKikKKwkjIFdlIGhh dmUgZXhhY3RseSBvbmUgYWN0dWFsIHBhcmVudAorCXRlc3QgIiRjb21tb24iICE9IG5vdF9xdWVy aWVkIHx8IGNvbW1vbj0kKGdpdCBtZXJnZS1iYXNlIC0tYWxsICRoZWFkICRhY3R1YWxfcGFyZW50 cykKKwljYXNlICIkY29tbW9uIiBpbgorCT8qIiRMRiI/KikKKwkJIyBXZSBhcmUgbm90IGRvaW5n IG9jdG9wdXMgYW5kIG5vdCBmYXN0IGZvcndhcmQuICBOZWVkIGEKKwkJIyByZWFsIG1lcmdlLgor CQk7OworCSopCisJCWdpdCB1cGRhdGUtaW5kZXggLS1yZWZyZXNoIDI+L2Rldi9udWxsCisJCWlm IHRlc3QgIiRhbGxvd190cml2aWFsX21lcmdlIiA9IHQKKwkJdGhlbgorCQkJIyBTZWUgaWYgaXQg aXMgcmVhbGx5IHRyaXZpYWwuCisJCQlnaXQgdmFyIEdJVF9DT01NSVRURVJfSURFTlQgPi9kZXYv bnVsbCB8fCBleGl0CisJCQllY2hvICJUcnlpbmcgcmVhbGx5IHRyaXZpYWwgaW4taW5kZXggbWVy Z2UuLi4iCisJCQlpZiBnaXQgcmVhZC10cmVlIC0tdHJpdmlhbCAtbSAtdSAtdiAkY29tbW9uICRo ZWFkICRhY3R1YWxfcGFyZW50cyAmJgorCQkJCXJlc3VsdF90cmVlPSQoZ2l0IHdyaXRlLXRyZWUp CisJCQl0aGVuCisJCQkJZWNobyAiV29uZGVyZnVsLiIKKwkJCQlyZXN1bHRfY29tbWl0PSQoCisJ CQkJCXByaW50ZiAnJXNcbicgIiRtZXJnZV9tc2ciIHwKKwkJCQkJZ2l0IGNvbW1pdC10cmVlICRy ZXN1bHRfdHJlZSAtcCBIRUFEIC1wICRhY3R1YWxfcGFyZW50cworCQkJCSkgfHwgZXhpdAorCQkJ CWZpbmlzaCAiJHJlc3VsdF9jb21taXQiICJJbi1pbmRleCBtZXJnZSIKKwkJCQlkcm9wc2F2ZQor CQkJCWV4aXQgMAorCQkJZmkKKwkJCWVjaG8gIk5vcGUuIgorCQlmaSA7OworCWVzYWMgOzsKIGVz YWMKIAogIyBXZSBhcmUgZ29pbmcgdG8gbWFrZSBhIG5ldyBjb21taXQuCkBAIC00NjcsNyArNDkx LDcgQEAgZG8KICAgICAjIFJlbWVtYmVyIHdoaWNoIHN0cmF0ZWd5IGxlZnQgdGhlIHN0YXRlIGlu IHRoZSB3b3JraW5nIHRyZWUKICAgICB3dF9zdHJhdGVneT0kc3RyYXRlZ3kKIAotICAgIGdpdC1t ZXJnZS0kc3RyYXRlZ3kgJGNvbW1vbiAtLSAiJGhlYWRfYXJnIiAiJEAiCisgICAgZ2l0LW1lcmdl LSRzdHJhdGVneSAkY29tbW9uIC0tICIkaGVhZF9hcmciICRhY3R1YWxfcGFyZW50cwogICAgIGV4 aXQ9JD8KICAgICBpZiB0ZXN0ICIkbm9fY29tbWl0IiA9IHQgJiYgdGVzdCAiJGV4aXQiID0gMAog ICAgIHRoZW4KQEAgLTUzNyw3ICs1NjEsNyBAQCBjYXNlICIkYmVzdF9zdHJhdGVneSIgaW4KIAll Y2hvICJSZXdpbmRpbmcgdGhlIHRyZWUgdG8gcHJpc3RpbmUuLi4iCiAJcmVzdG9yZXN0YXRlCiAJ ZWNobyAiVXNpbmcgdGhlICRiZXN0X3N0cmF0ZWd5IHRvIHByZXBhcmUgcmVzb2x2aW5nIGJ5IGhh bmQuIgotCWdpdC1tZXJnZS0kYmVzdF9zdHJhdGVneSAkY29tbW9uIC0tICIkaGVhZF9hcmciICIk QCIKKwlnaXQtbWVyZ2UtJGJlc3Rfc3RyYXRlZ3kgJGNvbW1vbiAtLSAiJGhlYWRfYXJnIiAkYWN0 dWFsX3BhcmVudHMKIAk7OwogZXNhYwogCi0tIAoxLjUuNS41NC5nYzY1NTAKCg== ------=_Part_2101_11123404.1210569446178 Content-Type: text/x-patch; name=0005-Head-reduction-before-selecting-merge-strategy.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fg4lj8wy4 Content-Disposition: attachment; filename=0005-Head-reduction-before-selecting-merge-strategy.patch RnJvbSAxOTg0ZWIzNWExOWYyZGJiYWU0MGQ5MWYzNmY3N2Q3MjM3NjdjNmFiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdmVycmUgSHZhbW1lbiBKb2hhbnNlbiA8aHZhbW1lbkBnbWFp bC5jb20+CkRhdGU6IFNhdCwgMyBNYXkgMjAwOCAyMTowODo1OSAtMDcwMApTdWJqZWN0OiBbUEFU Q0ggNS82XSBIZWFkIHJlZHVjdGlvbiBiZWZvcmUgc2VsZWN0aW5nIG1lcmdlIHN0cmF0ZWd5CgpU aGlzIGNvbW1pdCB1c2VzIHRoZSByZWR1Y2VkIHBhcmVudHMgaW5zdGVhZCBvZiB0aGUgYWN0dWFs CnBhcmVudHMgc3BlY2lmaWVkIGZvciBzZWxlY3RpbmcgdGhlIG1lcmdlIHN0cmF0ZWd5IHdoZW4g ZG9pbmcKYSBtZXJnZS4gIFRoZSByZWNvcmRlZCBwYXJlbnRzIGFuZCB0aGUgY29tbWl0IG1lc3Nh Z2Ugc3RheXMKdGhlIHNhbWUuCgpTb21lIGNhc2VzIHdoZXJlIHdlIGJlZm9yZSBuZWVkZWQgYW4g b2N0b3B1cyBzdHJhdGVneSBtYXkgbm93IGJlCmRvbmUgdXNpbmcgYSB0d28gaGVhZCBzdHJhdGVn eS4KClNlZSB0aGUgZG9jdW1lbnRhdGlvbiBmb3IgZnVydGhlciBkZXRhaWxzLgoKU2lnbmVkLW9m Zi1ieTogU3ZlcnJlIEh2YW1tZW4gSm9oYW5zZW4gPGh2YW1tZW5AZ21haWwuY29tPgotLS0KIERv Y3VtZW50YXRpb24vZ2l0LW1lcmdlLnR4dCB8ICAgMjAgKysrKysrKysrLS0tLS0tLQogZ2l0LW1l cmdlLnNoICAgICAgICAgICAgICAgIHwgICA1MCArKysrKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDMxIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZ2l0LW1lcmdlLnR4dCBiL0Rv Y3VtZW50YXRpb24vZ2l0LW1lcmdlLnR4dAppbmRleCA3ZTFjYjdlLi4xMWQ1M2U2IDEwMDY0NAot LS0gYS9Eb2N1bWVudGF0aW9uL2dpdC1tZXJnZS50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9naXQt bWVyZ2UudHh0CkBAIC0zNiw3ICszNiw3IEBAIGluY2x1ZGU6Om1lcmdlLW9wdGlvbnMudHh0W10K IDxyZW1vdGU+OjoKIAlPdGhlciBicmFuY2ggaGVhZCBtZXJnZWQgaW50byBvdXIgYnJhbmNoLiAg WW91IG5lZWQgYXQKIAlsZWFzdCBvbmUgPHJlbW90ZT4uICBTcGVjaWZ5aW5nIG1vcmUgdGhhbiBv bmUgPHJlbW90ZT4KLQlvYnZpb3VzbHkgbWVhbnMgeW91IGFyZSB0cnlpbmcgYW4gT2N0b3B1cy4K Kwl1c3VhbGx5IG1lYW5zIHlvdSBhcmUgdHJ5aW5nIGFuIE9jdG9wdXMuCiAKIAogaW5jbHVkZTo6 ZmFzdC1mb3J3YXJkLW9wdGlvbnMudHh0W10KQEAgLTE1OCwxMSArMTU4LDEyIEBAIEFmdGVyIHNl ZWluZyBhIGNvbmZsaWN0LCB5b3UgY2FuIGRvIHR3byB0aGluZ3M6CiBKT0lOSU5HIE1PUkUgVEhB TiBUV08gSElTVE9SSUVTCiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKLU1vcmUg dGhhbiBvbmUgcmVtb3RlIG1heSBiZSBzcGVjaWZpZWQgb24gdGhlIGNvbW1hbmQgbGluZS4gIFRo b3NlCi1yZW1vdGVzIGFyZSB1c2VkIGZvciBzZWxlY3RpbmcgdGhlIG1lcmdlIHN0YXJ0ZWd5IGFu ZCBpcyBhbHNvIHVzZWQgaW4KLXRoZSBtZXJnZSBjb21taXQgbWVzc2FnZS4gIEhvd2V2ZXIsIHNv bWUgb2YgdGhlc2UgcmVtb3RlcyBtYXkgbm90IGJlCi1pbmRlcGVuZGVudC4gIE9ubHkgcmVtb3Rl cyB3aXRoIGluZGVwZW5kZW50IGhlYWRzIChyZWR1Y2VkIHBhcmVudHMpCi13aWxsIGJlIHJlY29y ZGVkIGluIHRoZSBtZXJnZSBjb21taXQgb2JqZWN0LgorTW9yZSB0aGFuIG9uZSByZW1vdGUgbWF5 IGJlIHNwZWNpZmllZCBvbiB0aGUgY29tbWFuZCBsaW5lLiAgU29tZSBvZgordGhlc2UgcmVtb3Rl cyBtYXkgbm90IGhhdmUgaW5kZXBlbmRlbnQgaGVhZHMuICBHaXQgd2lsbCBvbmx5IHVzZSB0aGUK K3JlbW90ZXMgd2l0aCBpbmRlcGVuZGVudCBoZWFkcyAocmVkdWNlZCBwYXJlbnRzKSBmb3Igc2Vs ZWN0aW5nIHRoZQorbWVyZ2Ugc3RhcnRlZ3kuICBUaGUgcmVkdWNlZCBwYXJlbnRzIGFyZSB0aGUg cGFyZW50cyByZWNvcmRlZCBpbiB0aGUKK21lcmdlIGNvbW1pdCBvYmplY3QuICBIb3dldmVyLCB0 aGUgY29tbWl0IG1lc3NhZ2Ugd2lsbCByZWZsZWN0IHRoZQorcmVtb3RlcyBzcGVjaWZpZWQgb24g dGhlIGNvbW1hbmQgbGluZS4KIAogVGhlIGZvbGxvd2luZyBzaG93cyBtYXN0ZXIgYW5kIHR3byB0 b3BpYyBicmFuY2hlcy4gIHRvcGljQiBpcyBiYXNlZAogb24gdG9waWNBLCB0b3BpY0EgaXMgcHJl dmlvdXNseSBicmFuY2hlZCBvZmYgZnJvbSBtYXN0ZXI6CkBAIC0xNzcsOSArMTc4LDEwIEBAIG9u IHRvcGljQSwgdG9waWNBIGlzIHByZXZpb3VzbHkgYnJhbmNoZWQgb2ZmIGZyb20gbWFzdGVyOgog LS0tLS0tLS0tLS0tCiAKIE1lcmdpbmcgdG9waWNBIGFuZCB0b3BpY0IgdG8gdGhlIG1hc3RlciBi cmFuY2ggd2lsbCBzZWxlY3QgdGhlIG1lcmdlCi1zdHJhdGVneSBiYXNlZCBvbiBhbGwgdGhyZWUg YnJhbmNoZXMgKGFuIE9jdG9wdXMpLiAgbWFzdGVyIGFuZCB0b3BpY0IKLWFyZSB0aGUgcmVkdWNl ZCBwYXJlbnRzIGFuZCBhcmUgdGhlcmVmb3JlIHRoZSBvbmx5IHBhcmVudHMgcmVjb3JkZWQgaW4K LXRoZSBtZXJnZSBjb21taXQgb2JqZWN0Ogorc3RyYXRlZ3kgYmFzZWQgb24gdGhlIHR3byBpbmRl cGVuZGVudCBicmFuY2ggaGVhZHMsIHRpcCBvZiB0aGUgbWFzdGVyCiticmFuY2ggYW5kIHRoZSB0 aXAgb2YgdGhlIHRvcGljQiBicmFuY2ggKGEgdHdvIGhlYWQgc3RyYXRlZ3kpLiAgVGhlCitjb21t aXRzIGFyZSBhbHNvIHRoZSByZWR1Y2VkIHBhcmVudHMgcmVjb3JkZWQgaW4gdGhlIG1lcmdlIGNv bW1pdAorb2JqZWN0OgogCiAtLS0tLS0tLS0tLS0KIApkaWZmIC0tZ2l0IGEvZ2l0LW1lcmdlLnNo IGIvZ2l0LW1lcmdlLnNoCmluZGV4IDJjOWYxOWYuLmYwODA5ODYgMTAwNzU1Ci0tLSBhL2dpdC1t ZXJnZS5zaAorKysgYi9naXQtbWVyZ2Uuc2gKQEAgLTM0NCwxMSArMzQ0LDE2IEBAIHNldCB4ICRy ZW1vdGVoZWFkcyA7IHNoaWZ0CiAKIGZpbmRfcmVkdWNlZF9wYXJlbnRzICIkQCIKIAotYWN0dWFs X3BhcmVudHM9JChnaXQgcmV2LXBhcnNlICIkQCIpCisjIGZmX2hlYWQgbWF5IGJlIGluY2x1ZGVk IGhlcmUgb3IgbGF0ZXIgaW4gYWN0dWFsIHBhcmVudHMKK2lmIHRlc3QgLW4gIiRyZWR1Y2VkX3Bh cmVudHMiCit0aGVuCisJdGVzdCAkaGVhZCA9ICRmZl9oZWFkIHx8CisJCXJlZHVjZWRfcGFyZW50 cz0iJGZmX2hlYWQkTEYkcmVkdWNlZF9wYXJlbnRzIgorZmkKIAogY2FzZSAiJHVzZV9zdHJhdGVn aWVzIiBpbgogJycpCi0JY2FzZSAiJGFjdHVhbF9wYXJlbnRzIiBpbgorCWNhc2UgIiRyZWR1Y2Vk X3BhcmVudHMiIGluCiAJPyoiJExGIj8qKQogCQl2YXI9ImBnaXQgY29uZmlnIC0tZ2V0IHB1bGwu b2N0b3B1c2AiCiAJCWlmIHRlc3QgLW4gIiR2YXIiCkBAIC00MTMsMTcgKzQxOCwyMyBAQCB0aGVu CiAJCWZpbmlzaCAiJG5ld19oZWFkIiAiJG1zZyIgfHwgZXhpdAogCQlkcm9wc2F2ZQogCQlleGl0 IDAKKwllbHNlCisJCXJlZHVjZWRfcGFyZW50cz0iJGZmX2hlYWQiCisJCWZmX2hlYWQ9JGhlYWQK IAlmaQorZWxzZQorCXRlc3QgJGhlYWQgIT0gJGZmX2hlYWQgLWEgJGZhc3RfZm9yd2FyZCA9IG5l dmVyICYmCisJCXJlZHVjZWRfcGFyZW50cz0iJGZmX2hlYWQkTEYkcmVkdWNlZF9wYXJlbnRzIgog ZmkKIAotY2FzZSAiJGFjdHVhbF9wYXJlbnRzIiBpbgorY2FzZSAiJHJlZHVjZWRfcGFyZW50cyIg aW4KID8qIiRMRiI/KikKLQkjIFdlIGhhdmUgbW9yZSB0aGFuIG9uZSBhY3R1YWwgcGFyZW50Ci0J Y29tbW9uPSQoZ2l0IHNob3ctYnJhbmNoIC0tbWVyZ2UtYmFzZSAkaGVhZCAkYWN0dWFsX3BhcmVu dHMpCisJIyBXZSBoYXZlIG1vcmUgdGhhbiBvbmUgcmVkdWNlZCBwYXJlbnQKKwljb21tb249JChn aXQgc2hvdy1icmFuY2ggLS1tZXJnZS1iYXNlICRoZWFkICRyZWR1Y2VkX3BhcmVudHMpCiAJOzsK ICopCi0JIyBXZSBoYXZlIGV4YWN0bHkgb25lIGFjdHVhbCBwYXJlbnQKLQl0ZXN0ICIkY29tbW9u IiAhPSBub3RfcXVlcmllZCB8fCBjb21tb249JChnaXQgbWVyZ2UtYmFzZSAtLWFsbCAkaGVhZCAk YWN0dWFsX3BhcmVudHMpCisJIyBXZSBoYXZlIGV4YWN0bHkgb25lIHJlZHVjZWQgcGFyZW50CisJ dGVzdCAiJGNvbW1vbiIgIT0gbm90X3F1ZXJpZWQgfHwgY29tbW9uPSQoZ2l0IG1lcmdlLWJhc2Ug LS1hbGwgJGhlYWQgJHJlZHVjZWRfcGFyZW50cykKIAljYXNlICIkY29tbW9uIiBpbgogCT8qIiRM RiI/KikKIAkJIyBXZSBhcmUgbm90IGRvaW5nIG9jdG9wdXMgYW5kIG5vdCBmYXN0IGZvcndhcmQu ICBOZWVkIGEKQEAgLTQzNiwxMyArNDQ3LDEzIEBAIGNhc2UgIiRhY3R1YWxfcGFyZW50cyIgaW4K IAkJCSMgU2VlIGlmIGl0IGlzIHJlYWxseSB0cml2aWFsLgogCQkJZ2l0IHZhciBHSVRfQ09NTUlU VEVSX0lERU5UID4vZGV2L251bGwgfHwgZXhpdAogCQkJZWNobyAiVHJ5aW5nIHJlYWxseSB0cml2 aWFsIGluLWluZGV4IG1lcmdlLi4uIgotCQkJaWYgZ2l0IHJlYWQtdHJlZSAtLXRyaXZpYWwgLW0g LXUgLXYgJGNvbW1vbiAkaGVhZCAkYWN0dWFsX3BhcmVudHMgJiYKKwkJCWlmIGdpdCByZWFkLXRy ZWUgLS10cml2aWFsIC1tIC11IC12ICRjb21tb24gJGhlYWQgJHJlZHVjZWRfcGFyZW50cyAmJgog CQkJCXJlc3VsdF90cmVlPSQoZ2l0IHdyaXRlLXRyZWUpCiAJCQl0aGVuCiAJCQkJZWNobyAiV29u ZGVyZnVsLiIKIAkJCQlyZXN1bHRfY29tbWl0PSQoCiAJCQkJCXByaW50ZiAnJXNcbicgIiRtZXJn ZV9tc2ciIHwKLQkJCQkJZ2l0IGNvbW1pdC10cmVlICRyZXN1bHRfdHJlZSAtcCBIRUFEIC1wICRh Y3R1YWxfcGFyZW50cworCQkJCQlnaXQgY29tbWl0LXRyZWUgJHJlc3VsdF90cmVlIC1wIEhFQUQg LXAgJHJlZHVjZWRfcGFyZW50cwogCQkJCSkgfHwgZXhpdAogCQkJCWZpbmlzaCAiJHJlc3VsdF9j b21taXQiICJJbi1pbmRleCBtZXJnZSIKIAkJCQlkcm9wc2F2ZQpAQCAtNDkxLDcgKzUwMiw3IEBA IGRvCiAgICAgIyBSZW1lbWJlciB3aGljaCBzdHJhdGVneSBsZWZ0IHRoZSBzdGF0ZSBpbiB0aGUg d29ya2luZyB0cmVlCiAgICAgd3Rfc3RyYXRlZ3k9JHN0cmF0ZWd5CiAKLSAgICBnaXQtbWVyZ2Ut JHN0cmF0ZWd5ICRjb21tb24gLS0gIiRoZWFkX2FyZyIgJGFjdHVhbF9wYXJlbnRzCisgICAgZ2l0 LW1lcmdlLSRzdHJhdGVneSAkY29tbW9uIC0tICIkaGVhZF9hcmciICRyZWR1Y2VkX3BhcmVudHMK ICAgICBleGl0PSQ/CiAgICAgaWYgdGVzdCAiJG5vX2NvbW1pdCIgPSB0ICYmIHRlc3QgIiRleGl0 IiA9IDAKICAgICB0aGVuCkBAIC01MjcsMTcgKzUzOCwxMiBAQCBkb25lCiAjIGF1dG8gcmVzb2x2 ZWQgdGhlIG1lcmdlIGNsZWFubHkuCiBpZiB0ZXN0ICcnICE9ICIkcmVzdWx0X3RyZWUiCiB0aGVu Ci0gICAgaWYgdGVzdCAkZmFzdF9mb3J3YXJkID0gYWxsb3cKLSAgICB0aGVuCi0gICAgICAgIHBh cmVudHM9JChnaXQgc2hvdy1icmFuY2ggLS1pbmRlcGVuZGVudCAiJGhlYWQiICIkQCIpCi0gICAg ZWxzZQotICAgICAgICBwYXJlbnRzPSQoZ2l0IHJldi1wYXJzZSAiJGhlYWQiICIkQCIpCi0gICAg ZmkKLSAgICBwYXJlbnRzPSQoZWNobyAiJHBhcmVudHMiIHwgc2VkIC1lICdzL14vLXAgLycpCi0g ICAgcmVzdWx0X2NvbW1pdD0kKHByaW50ZiAnJXNcbicgIiRtZXJnZV9tc2ciIHwgZ2l0IGNvbW1p dC10cmVlICRyZXN1bHRfdHJlZSAkcGFyZW50cykgfHwgZXhpdAotICAgIGZpbmlzaCAiJHJlc3Vs dF9jb21taXQiICJNZXJnZSBtYWRlIGJ5ICR3dF9zdHJhdGVneS4iCi0gICAgZHJvcHNhdmUKLSAg ICBleGl0IDAKKwl0ZXN0ICRoZWFkID0gJGZmX2hlYWQgJiYgcmVkdWNlZF9wYXJlbnRzPSIkaGVh ZCRMRiRyZWR1Y2VkX3BhcmVudHMiCisJcGFyZW50cz0kKGVjaG8gIiRyZWR1Y2VkX3BhcmVudHMi IHwgc2VkIC1lICdzL14vLXAgLycpCisJcmVzdWx0X2NvbW1pdD0kKHByaW50ZiAnJXNcbicgIiRt ZXJnZV9tc2ciIHwgZ2l0IGNvbW1pdC10cmVlICRyZXN1bHRfdHJlZSAkcGFyZW50cykgfHwgZXhp dAorCWZpbmlzaCAiJHJlc3VsdF9jb21taXQiICJNZXJnZSBtYWRlIGJ5ICR3dF9zdHJhdGVneS4i CisJZHJvcHNhdmUKKwlleGl0IDAKIGZpCiAKICMgUGljayB0aGUgcmVzdWx0IGZyb20gdGhlIGJl c3Qgc3RyYXRlZ3kgYW5kIGhhdmUgdGhlIHVzZXIgZml4IGl0IHVwLgpAQCAtNTYxLDcgKzU2Nyw3 IEBAIGNhc2UgIiRiZXN0X3N0cmF0ZWd5IiBpbgogCWVjaG8gIlJld2luZGluZyB0aGUgdHJlZSB0 byBwcmlzdGluZS4uLiIKIAlyZXN0b3Jlc3RhdGUKIAllY2hvICJVc2luZyB0aGUgJGJlc3Rfc3Ry YXRlZ3kgdG8gcHJlcGFyZSByZXNvbHZpbmcgYnkgaGFuZC4iCi0JZ2l0LW1lcmdlLSRiZXN0X3N0 cmF0ZWd5ICRjb21tb24gLS0gIiRoZWFkX2FyZyIgJGFjdHVhbF9wYXJlbnRzCisJZ2l0LW1lcmdl LSRiZXN0X3N0cmF0ZWd5ICRjb21tb24gLS0gIiRoZWFkX2FyZyIgJHJlZHVjZWRfcGFyZW50cwog CTs7CiBlc2FjCiAKLS0gCjEuNS41LjU0LmdjNjU1MAoK ------=_Part_2101_11123404.1210569446178 Content-Type: text/x-patch; name=0006-Introduce-fast-forward-option-only.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fg4ljd375 Content-Disposition: attachment; filename=0006-Introduce-fast-forward-option-only.patch RnJvbSA2YjU4ZDM5ZjFjZjM2NGQ4YjBjOTFkYTUxOWFhY2U2MDcxNzJiNzI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdmVycmUgSHZhbW1lbiBKb2hhbnNlbiA8aHZhbW1lbkBnbWFp bC5jb20+CkRhdGU6IFNhdCwgMyBNYXkgMjAwOCAxNjo1NTo0NyAtMDcwMApTdWJqZWN0OiBbUEFU Q0ggNi82XSBJbnRyb2R1Y2UgZmFzdCBmb3J3YXJkIG9wdGlvbiBvbmx5CgpUaGlzIGNvbW1pdCBp bnRyb2R1Y2VzIGZhc3QgZm9yd2FyZCBvcHRpb24gJ29ubHknLiAgV2l0aCAtLWZmPW9ubHkKbWVy Z2Ugc3VjY2VlZHMgb25seSBpZiBpdCByZXNvbHZlcyB0byBmYXN0LWZvcndhcmQgbWVyZ2UuCgpU aGlzIGZlYXR1cmUgaXMgdXNlZnVsIGZvciBjYXNlcyB3aGVyZSBhIHJlYmFzZSBpcyBkZXNpcmVk Cmluc3RlYWQgb2YgYSByZWFsIG1lcmdlLiAgVGhpcyBvcHRpb24gY2FuIHRoZW4gYmUgdXNlZCB0 bwphdm9pZCBhbiBhY2NpZGVudGFsIG1lcmdlLgoKU2VlIHRoZSBkb2N1bWVudGF0aW9uIGZvciBm dXJ0aGVyIGRldGFpbHMuCgpTaWduZWQtb2ZmLWJ5OiBTdmVycmUgSHZhbW1lbiBKb2hhbnNlbiA8 aHZhbW1lbkBnbWFpbC5jb20+Ci0tLQogRG9jdW1lbnRhdGlvbi9mYXN0LWZvcndhcmQtb3B0aW9u cy50eHQgfCAgICA5ICsrCiBnaXQtbWVyZ2Uuc2ggICAgICAgICAgICAgICAgICAgICAgICAgICB8 ICAgMTIgKy0KIGdpdC1wdWxsLnNoICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgMiAr LQogdC90NzYwMS1tZXJnZS1mZi1vcHRpb25zLnNoICAgICAgICAgICAgfCAgMjE0ICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrCiA0IGZpbGVzIGNoYW5nZWQsIDIzMSBpbnNlcnRpb25z KCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZmFzdC1mb3J3 YXJkLW9wdGlvbnMudHh0IGIvRG9jdW1lbnRhdGlvbi9mYXN0LWZvcndhcmQtb3B0aW9ucy50eHQK aW5kZXggOTVkMGU2Zi4uNDQ0NWIwZSAxMDA2NDQKLS0tIGEvRG9jdW1lbnRhdGlvbi9mYXN0LWZv cndhcmQtb3B0aW9ucy50eHQKKysrIGIvRG9jdW1lbnRhdGlvbi9mYXN0LWZvcndhcmQtb3B0aW9u cy50eHQKQEAgLTEyLDYgKzEyLDEwIEBAIG5ldmVyOjoKIAlHZW5lcmF0ZSBhIG1lcmdlIGNvbW1p dCBldmVuIGlmIHRoZSBtZXJnZSByZXNvbHZlcyBhcyBhCiAJZmFzdC1mb3J3YXJkLiAgVGhpcyBv cHRpb24gaXMgZXF1aXZhbGVudCBvZiAnLS1uby1mZicuCiAKK29ubHk6OgorCU9ubHkgYWxsb3cg YSBmYXN0LWZvcndhcmQuICBUaGUgbWVyZ2Ugd2lsbCBmYWlsIHVubGVzcyBIRUFEIGlzCisJdXAg dG8gZGF0ZSBvciB0aGUgbWVyZ2UgcmVzb2x2ZXMgYXMgYSBmYXN0LWZvcndhcmQuCisKIElmIHlv dXIgd29ya2Zsb3cgaXMgYWx3YXlzIHRvIGJyYW5jaCBmcm9tIHRoZSBzcGVjaWFsIGJyYW5jaAog KCJtYXN0ZXIiKSB3aGVuIHdvcmtpbmcgb24gYSB0b3BpYyBhbmQgbWVyZ2UgdGhhdCBiYWNrIHRv ICJtYXN0ZXIiLCBpZgogeW91IGhhcHBlbiB0byBoYXZlIHdvcmtlZCBvbmx5IG9uIGEgc2luZ2xl IHRvcGljIGFuZCB0aGUgIm1hc3RlciIgd2FzCkBAIC00MiwzICs0Niw4IEBAIFRoZSBmaXJzdCBt ZXJnZSBvZiB0b3BpY0Egb3IgdGhlIG9ubHkgbWVyZ2Ugb2YgdG9waWNCIHdvdWxkIGhhdmUKIHJl c3VsdGVkIGluIGEgZmFzdCBmb3J3YXJkIHdpdGhvdXQgJy0tZmY9bmV2ZXInLiAgVG9waWMgQSBj b25zaXN0IG9mCiB0aG9zZSBjb21taXRzIHRoYXQgY2FuIGJlIHJlYWNoZWQgZnJvbSBtYXN0ZXJe MiB3aXRob3V0IHBhc3NpbmcKIHRocm91Z2ggYW55IG9mIHRoZSBmaXJzdC1wYXJlbnQgYW5jZXN0 cmllcyBvZiBtYXN0ZXIuCisKK0hvd2V2ZXIsIGlmIHRoZSB3b3JrZmxvdyByZXF1aXJlIHRoYXQg dGhlIGJyYW5jaCB5b3UgYXJlIG1lcmdpbmcgd2l0aAoraXMgYmFzZWQgb24gdGhlIGN1cnJlbnQg SEVBRCB5b3UgY2FuIHVzZSAib25seSBmYXN0IGZvcndhcmQiIHBvbGljeSB0bworZW5mb3JjZSBm YXN0IGZvcndhcmQgb3IgYSBmYWlsdXJlLiAgVGhlIGxhc3QgbWVyZ2Ugb2YgdG9waWNBIGluCit0 aGUgZXhhbXBsZSBhYm92ZSB3b3VsZCBoYXZlIGZhaWxlZCB3aXRoICctLWZmPW9ubHknLgpkaWZm IC0tZ2l0IGEvZ2l0LW1lcmdlLnNoIGIvZ2l0LW1lcmdlLnNoCmluZGV4IGYwODA5ODYuLjk0ZmY3 MTkgMTAwNzU1Ci0tLSBhL2dpdC1tZXJnZS5zaAorKysgYi9naXQtbWVyZ2Uuc2gKQEAgLTE2OCwy MSArMTY4LDIxIEBAIHBhcnNlX2NvbmZpZyAoKSB7CiAJCQlub19jb21taXQ9dCA7OwogCQktLWZm KQogCQkJY2FzZSAiJDIiIGluCi0JCQlhbGxvd3xuZXZlcikKKwkJCWFsbG93fG5ldmVyfG9ubHkp CiAJCQkJZmFzdF9mb3J3YXJkPSQyOyBzaGlmdCA7OwogCQkJLSopCiAJCQkJZmFzdF9mb3J3YXJk PWFsbG93IDs7CiAJCQkqKQotCQkJCWRpZSAiQXZhaWxhYmxlIGZhc3QtZm9yd2FyZCBvcHRpb25z IGFyZTogYWxsb3cgYW5kIG5ld2VyIiA7OworCQkJCWRpZSAiQXZhaWxhYmxlIGZhc3QtZm9yd2Fy ZCBvcHRpb25zIGFyZTogYWxsb3csIG5ld2VyLCBhbmQgb25seSIgOzsKIAkJCWVzYWMKIAkJCTs7 CiAJCS0tZmY9KikKIAkJCWZhc3RfZm9yd2FyZD0kezEjLS1mZj19CiAJCQljYXNlICIkZmFzdF9m b3J3YXJkIiBpbgotCQkJYWxsb3d8bmV2ZXIpCisJCQlhbGxvd3xuZXZlcnxvbmx5KQogCQkJCTs7 CiAJCQkqKQotCQkJCWRpZSAiQXZhaWxhYmxlIGZhc3QtZm9yd2FyZCBvcHRpb25zIGFyZTogYWxs b3cgYW5kIG5ld2VyIiA7OworCQkJCWRpZSAiQXZhaWxhYmxlIGZhc3QtZm9yd2FyZCBvcHRpb25z IGFyZTogYWxsb3csIG5ld2VyLCBhbmQgb25seSIgOzsKIAkJCWVzYWMKIAkJCTs7CiAJCS0tbm8t ZmYpCkBAIC0yMDksNyArMjA5LDcgQEAgcGFyc2VfY29uZmlnICgpIHsKIAkJc2hpZnQKIAlkb25l CiAJdGVzdCAiJGZhc3RfZm9yd2FyZCIgPSBhbGxvdyAtbyAiJHNxdWFzaCIgPSAiIiB8fAotCQlk aWUgIllvdSBjYW5ub3QgY29tYmluZSAtLXNxdWFzaCB3aXRoIC0tZmY9bmV2ZXIiCisJCWRpZSAi WW91IGNhbm5vdCBjb21iaW5lIC0tc3F1YXNoIHdpdGggLS1mZj1uZXZlciBvciAtLWZmPW9ubHku IgogCWFyZ3NfbGVmdD0kIwogfQogCkBAIC0zNDcsNiArMzQ3LDggQEAgZmluZF9yZWR1Y2VkX3Bh cmVudHMgIiRAIgogIyBmZl9oZWFkIG1heSBiZSBpbmNsdWRlZCBoZXJlIG9yIGxhdGVyIGluIGFj dHVhbCBwYXJlbnRzCiBpZiB0ZXN0IC1uICIkcmVkdWNlZF9wYXJlbnRzIgogdGhlbgorCXRlc3Qg JGZhc3RfZm9yd2FyZCA9IG9ubHkgJiYKKwkJZGllICItLWZmPW9ubHkgY2FuIG5vdCBoYW5kbGUg bW9yZSB0aGFuIG9uZSByZWFsIHBhcmVudCIKIAl0ZXN0ICRoZWFkID0gJGZmX2hlYWQgfHwKIAkJ cmVkdWNlZF9wYXJlbnRzPSIkZmZfaGVhZCRMRiRyZWR1Y2VkX3BhcmVudHMiCiBmaQpkaWZmIC0t Z2l0IGEvZ2l0LXB1bGwuc2ggYi9naXQtcHVsbC5zaAppbmRleCA5ZTkxZTc1Li5jNWZhMWVlIDEw MDc1NQotLS0gYS9naXQtcHVsbC5zaAorKysgYi9naXQtcHVsbC5zaApAQCAtNDEsNyArNDEsNyBA QCBkbwogCQlub19mZj0tLWZmIDs7CiAJLS1uby1mZikKIAkJbm9fZmY9LS1uby1mZiA7OwotCS0t ZmY9YWxsb3d8LS1mZj1uZXZlcikKKwktLWZmPWFsbG93fC0tZmY9b25seXwtLWZmPW5ldmVyKQog CQlub19mZj0kMSA7OwogCS1zPSp8LS1zPSp8LS1zdD0qfC0tc3RyPSp8LS1zdHJhPSp8LS1zdHJh dD0qfC0tc3RyYXRlPSp8XAogCQktLXN0cmF0ZWc9KnwtLXN0cmF0ZWd5PSp8XApkaWZmIC0tZ2l0 IGEvdC90NzYwMS1tZXJnZS1mZi1vcHRpb25zLnNoIGIvdC90NzYwMS1tZXJnZS1mZi1vcHRpb25z LnNoCmluZGV4IGM3YzZkMTQuLjU2ZTgzNzAgMTAwNzU1Ci0tLSBhL3QvdDc2MDEtbWVyZ2UtZmYt b3B0aW9ucy5zaAorKysgYi90L3Q3NjAxLW1lcmdlLWZmLW9wdGlvbnMuc2gKQEAgLTY2Miw0ICs2 NjIsMjE4IEBAIHRlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIGMxIHdpdGggbmV3IHJlcG9zaXRv cnkgKHB1bGwgLS1mZj1uZXZlciknICcKIAogdGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcKIAordGVz dF9leHBlY3Rfc3VjY2VzcyAnbWVyZ2UgYzAgd2l0aCBjMSAoLS1mZj1vbmx5IG92ZXJyaWRlcyAt LW5vLWZmKScgJworCWdpdCByZXNldCAtLWhhcmQgYzAgJiYKKwlnaXQgY29uZmlnIGJyYW5jaC5t YXN0ZXIubWVyZ2VvcHRpb25zICItLW5vLWZmIiAmJgorCWdpdCBtZXJnZSAtLWZmPW9ubHkgYzEg JiYKKwl2ZXJpZnlfbWVyZ2UgZmlsZSByZXN1bHQuMSAmJgorCXZlcmlmeV9oZWFkICRjMQorJwor Cit0ZXN0X2RlYnVnICdnaXRrIC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJnZSBj MCB3aXRoIGMxICgtLWZmPW9ubHkgaW4gY29uZmlnKScgJworCWdpdCByZXNldCAtLWhhcmQgYzAg JiYKKwlnaXQgY29uZmlnIGJyYW5jaC5tYXN0ZXIubWVyZ2VvcHRpb25zICItLWZmPW9ubHkiICYm CisJZ2l0IG1lcmdlIGMxICYmCisJdGVzdF90aWNrICYmCisJdmVyaWZ5X21lcmdlIGZpbGUgcmVz dWx0LjEgJiYKKwl2ZXJpZnlfaGVhZCAkYzEKKycKKwordGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcK KwordGVzdF9leHBlY3Rfc3VjY2VzcyAnbWVyZ2UgYzEgd2l0aCBjMCAoLS1mZj1vbmx5IGluIGNv bmZpZyknICcKKwlnaXQgcmVzZXQgLS1oYXJkIGMxICYmCisJZ2l0IGNvbmZpZyBicmFuY2gubWFz dGVyLm1lcmdlb3B0aW9ucyAiLS1mZj1vbmx5IiAmJgorCWdpdCBtZXJnZSBjMCAmJgorCXZlcmlm eV9tZXJnZSBmaWxlIHJlc3VsdC4xICYmCisJdmVyaWZ5X2hlYWQgJGMxCisnCisKK3Rlc3RfZGVi dWcgJ2dpdGsgLS1hbGwnCisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIGMxIHdpdGggYzIg KC0tZmY9b25seSBpbiBjb25maWcpJyAnCisJZ2l0IHJlc2V0IC0taGFyZCBjMSAmJgorCXRlc3Rf dGljayAmJgorCWdpdCBjb25maWcgYnJhbmNoLm1hc3Rlci5tZXJnZW9wdGlvbnMgIi0tZmY9b25s eSIgJiYKKwl0ZXN0X211c3RfZmFpbCBnaXQgbWVyZ2UgYzIgJiYKKwl2ZXJpZnlfbWVyZ2UgZmls ZSByZXN1bHQuMSAmJgorCXZlcmlmeV9oZWFkICRjMQorJworCit0ZXN0X2RlYnVnICdnaXRrIC0t YWxsJworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJnZSBjMCB3aXRoIGMxICgtLWZmPW9ubHkp JyAnCisJZ2l0IHJlc2V0IC0taGFyZCBjMCAmJgorCXRlc3RfdGljayAmJgorCWdpdCBtZXJnZSAt LWZmPW9ubHkgYzEgJiYKKwl2ZXJpZnlfbWVyZ2UgZmlsZSByZXN1bHQuMSAmJgorCXZlcmlmeV9o ZWFkICRjMQorJworCit0ZXN0X2RlYnVnICdnaXRrIC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNj ZXNzICdtZXJnZSBjMSB3aXRoIGMwICgtLWZmPW9ubHkpJyAnCisJZ2l0IHJlc2V0IC0taGFyZCBj MSAmJgorCXRlc3RfdGljayAmJgorCWdpdCBtZXJnZSAtLWZmPW9ubHkgYzAgJiYKKwl2ZXJpZnlf bWVyZ2UgZmlsZSByZXN1bHQuMSAmJgorCXZlcmlmeV9oZWFkICRjMQorJworCit0ZXN0X2RlYnVn ICdnaXRrIC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJnZSBjMCB3aXRoIGMxIGFu ZCBjMiAoLS1mZj1vbmx5KScgJworCWdpdCByZXNldCAtLWhhcmQgYzAgJiYKKwl0ZXN0X211c3Rf ZmFpbCBnaXQgbWVyZ2UgLS1mZj1vbmx5IGMxIGMyICYmCisJdmVyaWZ5X21lcmdlIGZpbGUgcmVz dWx0LjAgJiYKKwl2ZXJpZnlfaGVhZCAkYzAKKycKKwordGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcK KwordGVzdF9leHBlY3Rfc3VjY2VzcyAnbWVyZ2UgYzEgd2l0aCBjMCAoLS1mZj1vbmx5KScgJwor CWdpdCByZXNldCAtLWhhcmQgYzEgJiYKKwl0ZXN0X3RpY2sgJiYKKwlnaXQgbWVyZ2UgLS1mZj1v bmx5IGMwICYmCisJdmVyaWZ5X21lcmdlIGZpbGUgcmVzdWx0LjEgJiYKKwl2ZXJpZnlfaGVhZCAk YzEKKycKKwordGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcKKwordGVzdF9leHBlY3Rfc3VjY2VzcyAn bWVyZ2UgYzEgd2l0aCBjMiAoLS1mZj1vbmx5IG92ZXJyaWRlcyAtLW5vLWZmKScgJworCWdpdCBy ZXNldCAtLWhhcmQgYzEgJiYKKwlnaXQgY29uZmlnIGJyYW5jaC5tYXN0ZXIubWVyZ2VvcHRpb25z ICItLW5vLWZmIiAmJgorCXRlc3RfdGljayAmJgorCXRlc3RfbXVzdF9mYWlsIGdpdCBtZXJnZSBj MiAtLWZmPW9ubHkgJiYKKwl2ZXJpZnlfbWVyZ2UgZmlsZSByZXN1bHQuMSAmJgorCXZlcmlmeV9o ZWFkICRjMQorJworCit0ZXN0X2RlYnVnICdnaXRrIC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNj ZXNzICdtZXJnZSBjMCB3aXRoIGMxICgtLW5vLWZmIG92ZXJyaWRlcyAtLWZmPW9ubHkpJyAnCisJ Z2l0IHJlc2V0IC0taGFyZCBjMCAmJgorCWdpdCBjb25maWcgYnJhbmNoLm1hc3Rlci5tZXJnZW9w dGlvbnMgIi0tZmY9b25seSIgJiYKKwl0ZXN0X3RpY2sgJiYKKwlnaXQgbWVyZ2UgLS1uby1mZiBj MSAmJgorCXZlcmlmeV9tZXJnZSBmaWxlIHJlc3VsdC4xICYmCisJdmVyaWZ5X3BhcmVudHMgJGMw ICRjMQorJworCit0ZXN0X2RlYnVnICdnaXRrIC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNjZXNz ICdtZXJnZSBjMSB3aXRoIGMyICgtLWZmIG93ZXJyaWRlcyAtLWZmPW9ubHkpJyAnCisJZ2l0IHJl c2V0IC0taGFyZCBjMSAmJgorCWdpdCBjb25maWcgYnJhbmNoLm1hc3Rlci5tZXJnZW9wdGlvbnMg Ii0tZmY9b25seSIgJiYKKwl0ZXN0X3RpY2sgJiYKKwlnaXQgbWVyZ2UgLS1mZiBjMiAmJgorCXZl cmlmeV9tZXJnZSBmaWxlIHJlc3VsdC4xLTUgJiYKKwl2ZXJpZnlfcGFyZW50cyAkYzEgJGMyCisn CisKK3Rlc3RfZGVidWcgJ2dpdGsgLS1hbGwnCisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdl IGMxIHdpdGggeDAgKC0tc3F1YXNoIGNvbWJpbmVkIHdpdGggLS1mZj1vbmx5KScgJworCWdpdCBy ZXNldCAtLWhhcmQgYzEgJiYKKwlnaXQgY29uZmlnIGJyYW5jaC5tYXN0ZXIubWVyZ2VvcHRpb25z ICIiICYmCisJdGVzdF90aWNrICYmCisJdGVzdF9tdXN0X2ZhaWwgZ2l0IG1lcmdlIHgwIC0tc3F1 YXNoIC0tZmY9b25seSAmJgorCXZlcmlmeV9tZXJnZSBmaWxlIHJlc3VsdC4xICYmCisJdmVyaWZ5 X2hlYWQgJGMxCisnCisKK3Rlc3RfZGVidWcgJ2dpdGsgLS1hbGwnCisKKwordGVzdF9leHBlY3Rf c3VjY2VzcyAnbWVyZ2UgeDAgd2l0aCBjMSAoLS1zcXVhc2ggY29tYmluZWQgd2l0aCAtLWZmPW9u bHkpJyAnCisJZ2l0IHJlc2V0IC0taGFyZCB4MCAmJgorCWdpdCBjb25maWcgYnJhbmNoLm1hc3Rl ci5tZXJnZW9wdGlvbnMgIiIgJiYKKwl0ZXN0X3RpY2sgJiYKKwl0ZXN0X211c3RfZmFpbCBnaXQg bWVyZ2UgYzEgLS1zcXVhc2ggLS1mZj1vbmx5ICYmCisJdmVyaWZ5X21lcmdlIGZpbGUgcmVzdWx0 LjEtNSAmJgorCXZlcmlmeV9oZWFkICR4MAorJworCit0ZXN0X2RlYnVnICdnaXRrIC0tYWxsJwor CisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIGMxIHdpdGggYzIgKC0tc3F1YXNoIGNvbWJp bmVkIHdpdGggLS1mZj1vbmx5KScgJworCWdpdCByZXNldCAtLWhhcmQgYzEgJiYKKwlnaXQgY29u ZmlnIGJyYW5jaC5tYXN0ZXIubWVyZ2VvcHRpb25zICIiICYmCisJdGVzdF90aWNrICYmCisJdGVz dF9tdXN0X2ZhaWwgZ2l0IG1lcmdlIGMyIC0tc3F1YXNoIC0tZmY9b25seSAmJgorCXZlcmlmeV9t ZXJnZSBmaWxlIHJlc3VsdC4xICYmCisJdmVyaWZ5X2hlYWQgJGMxCisnCisKK3Rlc3RfZGVidWcg J2dpdGsgLS1hbGwnCisKKwordGVzdF9leHBlY3Rfc3VjY2VzcyAnbWVyZ2UgYzEgd2l0aCB4MCAo LS1uby1jb21taXQgY29tYmluZWQgd2l0aCAtLWZmPW9ubHkpJyAnCisJZ2l0IHJlc2V0IC0taGFy ZCBjMSAmJgorCWdpdCBjb25maWcgYnJhbmNoLm1hc3Rlci5tZXJnZW9wdGlvbnMgIiIgJiYKKwl0 ZXN0X3RpY2sgJiYKKwlnaXQgbWVyZ2UgeDAgLS1uby1jb21taXQgLS1mZj1vbmx5ICYmCisJdmVy aWZ5X21lcmdlIGZpbGUgcmVzdWx0LjEtNSAmJgorCXZlcmlmeV9oZWFkICR4MAorJworCit0ZXN0 X2RlYnVnICdnaXRrIC0tYWxsJworCisKK3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIHgwIHdp dGggYzEgKC0tbm8tY29tbWl0IGNvbWJpbmVkIHdpdGggLS1mZj1vbmx5KScgJworCWdpdCByZXNl dCAtLWhhcmQgeDAgJiYKKwlnaXQgY29uZmlnIGJyYW5jaC5tYXN0ZXIubWVyZ2VvcHRpb25zICIi ICYmCisJdGVzdF90aWNrICYmCisJZ2l0IG1lcmdlIGMxIC0tbm8tY29tbWl0IC0tZmY9b25seSAm JgorCXZlcmlmeV9tZXJnZSBmaWxlIHJlc3VsdC4xLTUgJiYKKwl2ZXJpZnlfaGVhZCAkeDAKKycK KwordGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcKKwordGVzdF9leHBlY3Rfc3VjY2VzcyAnbWVyZ2Ug YzEgd2l0aCBjMiAoLS1uby1jb21taXQgY29tYmluZWQgd2l0aCAtLWZmPW9ubHkpJyAnCisJZ2l0 IHJlc2V0IC0taGFyZCBjMSAmJgorCWdpdCBjb25maWcgYnJhbmNoLm1hc3Rlci5tZXJnZW9wdGlv bnMgIiIgJiYKKwl0ZXN0X3RpY2sgJiYKKwl0ZXN0X211c3RfZmFpbCBnaXQgbWVyZ2UgYzIgLS1u by1jb21taXQgLS1mZj1vbmx5ICYmCisJdmVyaWZ5X21lcmdlIGZpbGUgcmVzdWx0LjEgJiYKKwl2 ZXJpZnlfaGVhZCAkYzEKKycKKwordGVzdF9kZWJ1ZyAnZ2l0ayAtLWFsbCcKKwordGVzdF9leHBl Y3Rfc3VjY2VzcyAnbWVyZ2UgYzEgd2l0aCB4MSAocHVsbCAtLWZmPW9ubHkpJyAnCisJZ2l0IHJl c2V0IC0taGFyZCBjMSAmJgorCXRlc3RfdGljayAmJgorCWdpdCBwdWxsIC0tZmY9b25seSBjbG9u ZSByZWZzL2hlYWRzL21hc3RlciAmJgorCXZlcmlmeV9tZXJnZSBmaWxlIHJlc3VsdC4xLTEzICYm CisJdmVyaWZ5X2hlYWQgJHgxCisnCisKK3Rlc3RfZGVidWcgJ2dpdGsgLS1hbGwnCisKK3Rlc3Rf ZXhwZWN0X3N1Y2Nlc3MgJ21lcmdlIHgyIHdpdGggeDEgKHB1bGwgLS1mZj1vbmx5KScgJworCWdp dCByZXNldCAtLWhhcmQgeDIgJiYKKwl0ZXN0X3RpY2sgJiYKKwl0ZXN0X211c3RfZmFpbCBnaXQg cHVsbCAtLWZmPW9ubHkgY2xvbmUgcmVmcy9oZWFkcy9tYXN0ZXIgJiYKKwl2ZXJpZnlfbWVyZ2Ug ZmlsZSByZXN1bHQuNS0xMyAmJgorCXZlcmlmeV9oZWFkICR4MgorJworCit0ZXN0X2RlYnVnICdn aXRrIC0tYWxsJworCit0ZXN0X2V4cGVjdF9zdWNjZXNzICdtZXJnZSBjMSB3aXRoIG5ldyByZXBv c2l0b3J5IChwdWxsIC0tZmY9b25seSknICcKKwlnaXQgcmVzZXQgLS1oYXJkIGMxICYmCisJdGVz dF90aWNrICYmCisJdGVzdF9tdXN0X2ZhaWwgZ2l0IHB1bGwgLS1mZj1vbmx5IG5ldyByZWZzL2hl YWRzL21hc3RlciAmJgorCXZlcmlmeV9tZXJnZSBmaWxlIHJlc3VsdC4xICYmCisJdmVyaWZ5X2hl YWQgJGMxCisnCisKK3Rlc3RfZGVidWcgJ2dpdGsgLS1hbGwnCisKIHRlc3RfZG9uZQotLSAKMS41 LjUuNTQuZ2M2NTUwCgo= ------=_Part_2101_11123404.1210569446178--