From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6BDFC77B73 for ; Mon, 5 Jun 2023 14:28:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233628AbjFEO2F (ORCPT ); Mon, 5 Jun 2023 10:28:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233668AbjFEO2D (ORCPT ); Mon, 5 Jun 2023 10:28:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FBF9E6; Mon, 5 Jun 2023 07:28:01 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E5464612FF; Mon, 5 Jun 2023 14:28:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 260EBC433EF; Mon, 5 Jun 2023 14:28:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685975280; bh=sAHQ5mF26HJdsfS/vx6CqVHxcZ7iU5btoMnHgF4+vMc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=RrGK/P10Rp6wTL0cQRYFCqMiylE0bizhJ5uU9xRcPVzXWbM7aOBL/shjMpyFVTfhQ vDfrch+9U+i6xjviKtQ57OR9g0Z7JCHspEuSUKpHNm8eENcxIvJEIpA5VKtomF04P6 dJe+XBc2HA21rqfWIeIRGqPT+5lOcpjFJ0dObYpUKDAyQP40cQgJx4chFWnP70ticj Ouql7b7fju6VGGmuwU1hFsmOLbd0KdXkyI+IAiEaHAJ4086NWrgaFP/JBQQQBGVjln 67ugTTotJTSxIjSBiTxoBhPDALAYmPVbzMw/IA+vbj+xtn7R70CinoDjeVgtmxOjl+ Fmj+8mqa0UDqw== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 4503640692; Mon, 5 Jun 2023 11:27:57 -0300 (-03) Date: Mon, 5 Jun 2023 11:27:57 -0300 From: Arnaldo Carvalho de Melo To: Ravi Bangoria , Stephen Rothwell , Peter Zijlstra Cc: irogers@google.com, suzuki.poulose@arm.com, mike.leach@linaro.org, leo.yan@linaro.org, john.g.garry@oracle.com, will@kernel.org, james.clark@arm.com, mingo@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, namhyung@kernel.org, adrian.hunter@intel.com, kjain@linux.ibm.com, renyu.zj@linux.alibaba.com, kan.liang@linux.intel.com, zhengjun.xing@linux.intel.com, maddy@linux.ibm.com, atrajeev@linux.vnet.ibm.com, wangming01@loongson.cn, chenhuacai@kernel.org, sandipan.das@amd.com, 9erthalion6@gmail.com, seanjc@google.com, robh@kernel.org, tmricht@linux.ibm.com, tegongkang@gmail.com, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Subject: Re: [PATCH v2] perf test amd: Fix build failure with amd-ibs-via-core-pmu.c Message-ID: References: <20230603044650.286-1-ravi.bangoria@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230603044650.286-1-ravi.bangoria@amd.com> X-Url: http://acmel.wordpress.com Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Em Sat, Jun 03, 2023 at 10:16:50AM +0530, Ravi Bangoria escreveu: > Since amd-ibs-via-core-pmu.c was applied via Peter's tree, some of > the changes came via Arnaldo's tree did not reflect in this file, > which is causing build failures. > > arch/x86/tests/amd-ibs-via-core-pmu.c:47:25: error: ‘pmus’ undeclared > (first use in this function) > 47 | if (list_empty(&pmus)) > | ^~~~ > arch/x86/tests/amd-ibs-via-core-pmu.c:48:17: error: implicit declaration > of function ‘perf_pmu__scan’; did you mean > perf_pmus__scan’? [-Werror=implicit-function-declaration] > 48 | perf_pmu__scan(NULL); > | ^~~~~~~~~~~~~~ > | perf_pmus__scan > arch/x86/tests/amd-ibs-via-core-pmu.c:50:19: error: implicit declaration > of function ‘perf_pmu__find’; did you mean > perf_pmus__find’? [-Werror=implicit-function-declaration] > 50 | ibs_pmu = perf_pmu__find("ibs_op"); > | ^~~~~~~~~~~~~~ > | perf_pmus__find > > Fix those. > > Fixes: 1eaf496ed386 ("perf pmu: Separate pmu and pmus") > Signed-off-by: Ravi Bangoria I wonder how to solve the various merge issues here: 1. this clashes with: commit ae4aa00a1a9358e0007f6edc71b018a0b0d21190 Author: Ian Rogers Date: Tue May 2 15:38:27 2023 -0700 perf test: Move x86 hybrid tests to arch/x86 -------------- I tried cherry-picking the cset that introduces amd-ibs-via-core-pmu.c, moved the test__hybrid lines a bit and then tried test merging the result with tip/master, it works. But then I tried applying this fix as a follow up cset, perf-tools-next would have bisection history broken, but nah, but then I hit: ⬢[acme@toolbox perf-tools-next]$ git merge tip/master Auto-merging tools/perf/arch/x86/include/arch-tests.h Auto-merging tools/perf/arch/x86/tests/Build Auto-merging tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c CONFLICT (add/add): Merge conflict in tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c Auto-merging tools/perf/arch/x86/tests/arch-tests.c Automatic merge failed; fix conflicts and then commit the result. ⬢[acme@toolbox perf-tools-next]$ git diff diff --cc tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c index 78b1902f6f59d8ce,2902798ca5c1ed1c..0000000000000000 --- a/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c +++ b/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c @@@ -44,7 -44,10 +44,14 @@@ int test__amd_ibs_via_core_pmu(struct t int ret = TEST_OK; int fd, i; ++<<<<<<< HEAD + ibs_pmu = perf_pmus__find("ibs_op"); ++======= + if (list_empty(&pmus)) + perf_pmu__scan(NULL); + + ibs_pmu = perf_pmu__find("ibs_op"); ++>>>>>>> tip/master if (!ibs_pmu) return TEST_SKIP; How are things like this resolved in linux-next? Removing this test from tip/master and I carry a fixed up tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c introduction patch? Cheers, - Arnaldo > --- > v1->v2: > - Remove unnecessary perf_pmus__scan(NULL) as suggested by Ian. > > tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c b/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c > index 2902798ca5c1..78b1902f6f59 100644 > --- a/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c > +++ b/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c > @@ -44,10 +44,7 @@ int test__amd_ibs_via_core_pmu(struct test_suite *test __maybe_unused, > int ret = TEST_OK; > int fd, i; > > - if (list_empty(&pmus)) > - perf_pmu__scan(NULL); > - > - ibs_pmu = perf_pmu__find("ibs_op"); > + ibs_pmu = perf_pmus__find("ibs_op"); > if (!ibs_pmu) > return TEST_SKIP; > > -- > 2.40.1 > -- - Arnaldo From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ABBC0C7EE23 for ; Mon, 5 Jun 2023 14:28:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=E1F5gDlQzJzihmejwjuJkthpvtk8hqOh75X9alQVwJk=; b=e13kRbWkSBxMCr JlCu7UhM0B2vCHE+ZbELQV/MK+M/9ZcuPSH1txAaRMjgE8jmhEUZ3tyX0WYCj4KHbizfodk5MyGEy Mqt2LdRHYV2n4C2Ap9OSgHnpxMtbnDlpv9N5YPjkpoEN0+LD18p+dehQkjPwyQ2+o9S9X/qPRM+qw bA9JKApEYgmpOnjnjaitryBk5WAHo2OFcWdgLWhDe/qNpv+PwVX6M9JeRxdppgp2fCB91IKNfoCv1 x6LGgR5BpCUgaxhFruO6nEKenqWIRSbmnYxbMPvaVpCgx3gTNrYsaM7yBQddTw/zZKrpxx4K/jqZW iYlY20KhLoJTeOAxYoSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6BBk-00Fmt0-0v; Mon, 05 Jun 2023 14:28:04 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q6BBi-00Fms2-0b for linux-arm-kernel@bombadil.infradead.org; Mon, 05 Jun 2023 14:28:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Transfer-Encoding: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date: Sender:Reply-To:Content-ID:Content-Description; bh=Oj9LqXYESTpMaNq+1SJ+hVeAVKcomlPChrrN0tBJGAo=; b=G9rWdWW2ji9X5FM2Hpck6lfCUv c9NRM3RPpH9G+2fDbBUVxqb95Va68wUhns+4FxVteGJGkE+/40VqOJ4X9dwK9HD1IDiqDVFqMJF3d wxoLdYyASjVFmaKoUKbW8ZnpQoacCjUSEMel7Io+TuVV3012w2gb79MMfVhTxQC2ICMJ012avAHjH BtOQQ5JVW6SAe5YVPFrUKZMXMdahMwy4suioo7mVNTzPpwzrM7esoNs5ST8S/bN62N2dXfxerHyn6 fnfm2SgOBbXy4ZfF+AcOuHC7fa2WhZ0uLgzjJrCHxTMFxyKImMfnIpuVY7l0XwvjCsjfZ82PbZ8sN i7hR0shA==; Received: from [187.19.173.165] (helo=quaco.ghostprotocols.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1q6BBf-00C6Jk-W6; Mon, 05 Jun 2023 14:28:00 +0000 Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 4503640692; Mon, 5 Jun 2023 11:27:57 -0300 (-03) Date: Mon, 5 Jun 2023 11:27:57 -0300 From: Arnaldo Carvalho de Melo To: Ravi Bangoria , Stephen Rothwell , Peter Zijlstra Cc: irogers@google.com, suzuki.poulose@arm.com, mike.leach@linaro.org, leo.yan@linaro.org, john.g.garry@oracle.com, will@kernel.org, james.clark@arm.com, mingo@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, namhyung@kernel.org, adrian.hunter@intel.com, kjain@linux.ibm.com, renyu.zj@linux.alibaba.com, kan.liang@linux.intel.com, zhengjun.xing@linux.intel.com, maddy@linux.ibm.com, atrajeev@linux.vnet.ibm.com, wangming01@loongson.cn, chenhuacai@kernel.org, sandipan.das@amd.com, 9erthalion6@gmail.com, seanjc@google.com, robh@kernel.org, tmricht@linux.ibm.com, tegongkang@gmail.com, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Subject: Re: [PATCH v2] perf test amd: Fix build failure with amd-ibs-via-core-pmu.c Message-ID: References: <20230603044650.286-1-ravi.bangoria@amd.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230603044650.286-1-ravi.bangoria@amd.com> X-Url: http://acmel.wordpress.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RW0gU2F0LCBKdW4gMDMsIDIwMjMgYXQgMTA6MTY6NTBBTSArMDUzMCwgUmF2aSBCYW5nb3JpYSBl c2NyZXZldToKPiBTaW5jZSBhbWQtaWJzLXZpYS1jb3JlLXBtdS5jIHdhcyBhcHBsaWVkIHZpYSBQ ZXRlcidzIHRyZWUsIHNvbWUgb2YKPiB0aGUgY2hhbmdlcyBjYW1lIHZpYSBBcm5hbGRvJ3MgdHJl ZSBkaWQgbm90IHJlZmxlY3QgaW4gdGhpcyBmaWxlLAo+IHdoaWNoIGlzIGNhdXNpbmcgYnVpbGQg ZmFpbHVyZXMuCj4gCj4gICBhcmNoL3g4Ni90ZXN0cy9hbWQtaWJzLXZpYS1jb3JlLXBtdS5jOjQ3 OjI1OiBlcnJvcjog4oCYcG11c+KAmSB1bmRlY2xhcmVkCj4gICAoZmlyc3QgdXNlIGluIHRoaXMg ZnVuY3Rpb24pCj4gICAgICA0NyB8ICAgICAgICAgaWYgKGxpc3RfZW1wdHkoJnBtdXMpKQo+ICAg ICAgICAgfCAgICAgICAgICAgICAgICAgICAgICAgICBefn5+Cj4gICBhcmNoL3g4Ni90ZXN0cy9h bWQtaWJzLXZpYS1jb3JlLXBtdS5jOjQ4OjE3OiBlcnJvcjogaW1wbGljaXQgZGVjbGFyYXRpb24K PiAgIG9mIGZ1bmN0aW9uIOKAmHBlcmZfcG11X19zY2Fu4oCZOyBkaWQgeW91IG1lYW4KPiAgIHBl cmZfcG11c19fc2NhbuKAmT8gWy1XZXJyb3I9aW1wbGljaXQtZnVuY3Rpb24tZGVjbGFyYXRpb25d Cj4gICAgICA0OCB8ICAgICAgICAgICAgICAgICBwZXJmX3BtdV9fc2NhbihOVUxMKTsKPiAgICAg ICAgIHwgICAgICAgICAgICAgICAgIF5+fn5+fn5+fn5+fn5+Cj4gICAgICAgICB8ICAgICAgICAg ICAgICAgICBwZXJmX3BtdXNfX3NjYW4KPiAgIGFyY2gveDg2L3Rlc3RzL2FtZC1pYnMtdmlhLWNv cmUtcG11LmM6NTA6MTk6IGVycm9yOiBpbXBsaWNpdCBkZWNsYXJhdGlvbgo+ICAgb2YgZnVuY3Rp b24g4oCYcGVyZl9wbXVfX2ZpbmTigJk7IGRpZCB5b3UgbWVhbgo+ICAgcGVyZl9wbXVzX19maW5k 4oCZPyBbLVdlcnJvcj1pbXBsaWNpdC1mdW5jdGlvbi1kZWNsYXJhdGlvbl0KPiAgICAgIDUwIHwg ICAgICAgICBpYnNfcG11ID0gcGVyZl9wbXVfX2ZpbmQoImlic19vcCIpOwo+ICAgICAgICAgfCAg ICAgICAgICAgICAgICAgICBefn5+fn5+fn5+fn5+fgo+ICAgICAgICAgfCAgICAgICAgICAgICAg ICAgICBwZXJmX3BtdXNfX2ZpbmQKPiAKPiBGaXggdGhvc2UuCj4gCj4gRml4ZXM6IDFlYWY0OTZl ZDM4NiAoInBlcmYgcG11OiBTZXBhcmF0ZSBwbXUgYW5kIHBtdXMiKQo+IFNpZ25lZC1vZmYtYnk6 IFJhdmkgQmFuZ29yaWEgPHJhdmkuYmFuZ29yaWFAYW1kLmNvbT4KCkkgd29uZGVyIGhvdyB0byBz b2x2ZSB0aGUgdmFyaW91cyBtZXJnZSBpc3N1ZXMgaGVyZToKCjEuIHRoaXMgY2xhc2hlcyB3aXRo OgoKY29tbWl0IGFlNGFhMDBhMWE5MzU4ZTAwMDdmNmVkYzcxYjAxOGEwYjBkMjExOTAKQXV0aG9y OiBJYW4gUm9nZXJzIDxpcm9nZXJzQGdvb2dsZS5jb20+CkRhdGU6ICAgVHVlIE1heSAyIDE1OjM4 OjI3IDIwMjMgLTA3MDAKCiAgICBwZXJmIHRlc3Q6IE1vdmUgeDg2IGh5YnJpZCB0ZXN0cyB0byBh cmNoL3g4NgoKLS0tLS0tLS0tLS0tLS0KCkkgdHJpZWQgY2hlcnJ5LXBpY2tpbmcgdGhlIGNzZXQg dGhhdCBpbnRyb2R1Y2VzIGFtZC1pYnMtdmlhLWNvcmUtcG11LmMsCm1vdmVkIHRoZSB0ZXN0X19o eWJyaWQgbGluZXMgYSBiaXQgYW5kIHRoZW4gdHJpZWQgdGVzdCBtZXJnaW5nIHRoZQpyZXN1bHQg d2l0aCB0aXAvbWFzdGVyLCBpdCB3b3Jrcy4KCkJ1dCB0aGVuIEkgdHJpZWQgYXBwbHlpbmcgdGhp cyBmaXggYXMgYSBmb2xsb3cgdXAgY3NldCwgcGVyZi10b29scy1uZXh0CndvdWxkIGhhdmUgYmlz ZWN0aW9uIGhpc3RvcnkgYnJva2VuLCBidXQgbmFoLCBidXQgdGhlbiBJIGhpdDoKCuKsolthY21l QHRvb2xib3ggcGVyZi10b29scy1uZXh0XSQgZ2l0IG1lcmdlIHRpcC9tYXN0ZXIKQXV0by1tZXJn aW5nIHRvb2xzL3BlcmYvYXJjaC94ODYvaW5jbHVkZS9hcmNoLXRlc3RzLmgKQXV0by1tZXJnaW5n IHRvb2xzL3BlcmYvYXJjaC94ODYvdGVzdHMvQnVpbGQKQXV0by1tZXJnaW5nIHRvb2xzL3BlcmYv YXJjaC94ODYvdGVzdHMvYW1kLWlicy12aWEtY29yZS1wbXUuYwpDT05GTElDVCAoYWRkL2FkZCk6 IE1lcmdlIGNvbmZsaWN0IGluIHRvb2xzL3BlcmYvYXJjaC94ODYvdGVzdHMvYW1kLWlicy12aWEt Y29yZS1wbXUuYwpBdXRvLW1lcmdpbmcgdG9vbHMvcGVyZi9hcmNoL3g4Ni90ZXN0cy9hcmNoLXRl c3RzLmMKQXV0b21hdGljIG1lcmdlIGZhaWxlZDsgZml4IGNvbmZsaWN0cyBhbmQgdGhlbiBjb21t aXQgdGhlIHJlc3VsdC4K4qyiW2FjbWVAdG9vbGJveCBwZXJmLXRvb2xzLW5leHRdJCBnaXQgZGlm ZgpkaWZmIC0tY2MgdG9vbHMvcGVyZi9hcmNoL3g4Ni90ZXN0cy9hbWQtaWJzLXZpYS1jb3JlLXBt dS5jCmluZGV4IDc4YjE5MDJmNmY1OWQ4Y2UsMjkwMjc5OGNhNWMxZWQxYy4uMDAwMDAwMDAwMDAw MDAwMAotLS0gYS90b29scy9wZXJmL2FyY2gveDg2L3Rlc3RzL2FtZC1pYnMtdmlhLWNvcmUtcG11 LmMKKysrIGIvdG9vbHMvcGVyZi9hcmNoL3g4Ni90ZXN0cy9hbWQtaWJzLXZpYS1jb3JlLXBtdS5j CkBAQCAtNDQsNyAtNDQsMTAgKzQ0LDE0IEBAQCBpbnQgdGVzdF9fYW1kX2lic192aWFfY29yZV9w bXUoc3RydWN0IHQKICAgICAgICBpbnQgcmV0ID0gVEVTVF9PSzsKICAgICAgICBpbnQgZmQsIGk7 CiAgCisrPDw8PDw8PCBIRUFECiArICAgICAgaWJzX3BtdSA9IHBlcmZfcG11c19fZmluZCgiaWJz X29wIik7CisrPT09PT09PQorICAgICAgIGlmIChsaXN0X2VtcHR5KCZwbXVzKSkKKyAgICAgICAg ICAgICAgIHBlcmZfcG11X19zY2FuKE5VTEwpOworIAorICAgICAgIGlic19wbXUgPSBwZXJmX3Bt dV9fZmluZCgiaWJzX29wIik7CisrPj4+Pj4+PiB0aXAvbWFzdGVyCiAgICAgICAgaWYgKCFpYnNf cG11KQogICAgICAgICAgICAgICAgcmV0dXJuIFRFU1RfU0tJUDsKICAKCkhvdyBhcmUgdGhpbmdz IGxpa2UgdGhpcyByZXNvbHZlZCBpbiBsaW51eC1uZXh0PwoKUmVtb3ZpbmcgdGhpcyB0ZXN0IGZy b20gdGlwL21hc3RlciBhbmQgSSBjYXJyeSBhIGZpeGVkIHVwCnRvb2xzL3BlcmYvYXJjaC94ODYv dGVzdHMvYW1kLWlicy12aWEtY29yZS1wbXUuYyBpbnRyb2R1Y3Rpb24gcGF0Y2g/CgpDaGVlcnMs CgotIEFybmFsZG8KCj4gLS0tCj4gdjEtPnYyOgo+ICAgLSBSZW1vdmUgdW5uZWNlc3NhcnkgcGVy Zl9wbXVzX19zY2FuKE5VTEwpIGFzIHN1Z2dlc3RlZCBieSBJYW4uCj4gCj4gIHRvb2xzL3BlcmYv YXJjaC94ODYvdGVzdHMvYW1kLWlicy12aWEtY29yZS1wbXUuYyB8IDUgKy0tLS0KPiAgMSBmaWxl IGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCA0IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQg YS90b29scy9wZXJmL2FyY2gveDg2L3Rlc3RzL2FtZC1pYnMtdmlhLWNvcmUtcG11LmMgYi90b29s cy9wZXJmL2FyY2gveDg2L3Rlc3RzL2FtZC1pYnMtdmlhLWNvcmUtcG11LmMKPiBpbmRleCAyOTAy Nzk4Y2E1YzEuLjc4YjE5MDJmNmY1OSAxMDA2NDQKPiAtLS0gYS90b29scy9wZXJmL2FyY2gveDg2 L3Rlc3RzL2FtZC1pYnMtdmlhLWNvcmUtcG11LmMKPiArKysgYi90b29scy9wZXJmL2FyY2gveDg2 L3Rlc3RzL2FtZC1pYnMtdmlhLWNvcmUtcG11LmMKPiBAQCAtNDQsMTAgKzQ0LDcgQEAgaW50IHRl c3RfX2FtZF9pYnNfdmlhX2NvcmVfcG11KHN0cnVjdCB0ZXN0X3N1aXRlICp0ZXN0IF9fbWF5YmVf dW51c2VkLAo+ICAJaW50IHJldCA9IFRFU1RfT0s7Cj4gIAlpbnQgZmQsIGk7Cj4gIAo+IC0JaWYg KGxpc3RfZW1wdHkoJnBtdXMpKQo+IC0JCXBlcmZfcG11X19zY2FuKE5VTEwpOwo+IC0KPiAtCWli c19wbXUgPSBwZXJmX3BtdV9fZmluZCgiaWJzX29wIik7Cj4gKwlpYnNfcG11ID0gcGVyZl9wbXVz X19maW5kKCJpYnNfb3AiKTsKPiAgCWlmICghaWJzX3BtdSkKPiAgCQlyZXR1cm4gVEVTVF9TS0lQ Owo+ICAKPiAtLSAKPiAyLjQwLjEKPiAKCi0tIAoKLSBBcm5hbGRvCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcg bGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmlu ZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==