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 4C2FBC636D4 for ; Wed, 1 Feb 2023 07:47:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231735AbjBAHrC (ORCPT ); Wed, 1 Feb 2023 02:47:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230207AbjBAHqn (ORCPT ); Wed, 1 Feb 2023 02:46:43 -0500 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5243B5D12B; Tue, 31 Jan 2023 23:46:09 -0800 (PST) Received: (Authenticated sender: gregory.clement@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 1500CE0003; Wed, 1 Feb 2023 07:46:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1675237567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z25cfYozFGO7GRW7aRvp/LnRji5Y6L8B9ioccgyMGOo=; b=FVczT2DdcQRv21R6CZfD8lXiI6mt72zNv/4Dsv1FyVceB+PrtVgU3PeLgVGrLg2otMRWqe hR4dxyxdOb+hwvssL6bMIjIeajlHUISohPD3bvgqjMmplFkgaw0aUcOQ+AuaJgiGJjVhFY hUIIehahUdvRMoUx1F5FXX8IZZxu6hip3gzHuXxAbYQ7KG6h3rq6+siyp+CHGKbLPITWYY 4igq1MEU9EzThXmhOeM9BKwX8T3FL2fe6vhBXiEIpsFK9+48TiZGUm2k28ZlQuo6dVK+wU WVOB85Jl9inH8Vnak10doHqSRMhMCGtIa6KS15Zl39TNPUoBoSBKiJOegpwE+Q== From: Gregory CLEMENT To: Pali =?utf-8?Q?Roh=C3=A1r?= , Andrew Lunn , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards In-Reply-To: <20220713125644.3117-1-pali@kernel.org> References: <20220713125644.3117-1-pali@kernel.org> Date: Wed, 01 Feb 2023 08:46:05 +0100 Message-ID: <87h6w5bzgi.fsf@BL-laptop> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Pali Roh=C3=A1r writes: > All Armada 3720 boards have Armada 3720 processor which is of Armada 3700 > family and do not have Armada 3710 processor. So none of them should have > compatible string for Armada 3710 processor. > > Fix compatible string for all these boards by removing wrong processor > string "marvell,armada3710" and adding family string "marvell,armada3700" > as the last one. (Note that this is same way how are defined Armada 3710 > DTS files). > > Signed-off-by: Pali Roh=C3=A1r Fixedd a marge conflict and applied on mvebu/dt64 Thanks, Gregory > --- > arch/arm64/boot/dts/marvell/armada-3720-db.dts | 2 +- > arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts | 2 +- > arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts | 2 +- > arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts | 2 +- > arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts | 2 +- > arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 2 +- > arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +- > arch/arm64/boot/dts/marvell/armada-372x.dtsi | 2 +- > 8 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/= boot/dts/marvell/armada-3720-db.dts > index bd4e61d5448e..0cfb38492021 100644 > --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts > +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts > @@ -18,7 +18,7 @@ >=20=20 > / { > model =3D "Marvell Armada 3720 Development Board DB-88F3720-DDR3"; > - compatible =3D "marvell,armada-3720-db", "marvell,armada3720", "marvell= ,armada3710"; > + compatible =3D "marvell,armada-3720-db", "marvell,armada3720", "marvell= ,armada3700"; >=20=20 > chosen { > stdout-path =3D "serial0:115200n8"; > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts= b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts > index 5c4d8f379704..6715a19c1483 100644 > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts > @@ -18,7 +18,7 @@ > / { > model =3D "Globalscale Marvell ESPRESSOBin Board (eMMC)"; > compatible =3D "globalscale,espressobin-emmc", "globalscale,espressobin= ", > - "marvell,armada3720", "marvell,armada3710"; > + "marvell,armada3720", "marvell,armada3700"; > }; >=20=20 > &sdhci0 { > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dt= s b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts > index 070725b81be5..447760b69850 100644 > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts > @@ -13,7 +13,7 @@ > / { > model =3D "Globalscale Marvell ESPRESSOBin Ultra Board"; > compatible =3D "globalscale,espressobin-ultra", "marvell,armada3720", > - "marvell,armada3710"; > + "marvell,armada3700"; >=20=20 > aliases { > /* ethernet1 is WAN port */ > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.= dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts > index 75401eab4d42..2a8aa3901a9f 100644 > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts > @@ -19,7 +19,7 @@ > model =3D "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)"; > compatible =3D "globalscale,espressobin-v7-emmc", "globalscale,espresso= bin-v7", > "globalscale,espressobin", "marvell,armada3720", > - "marvell,armada3710"; > + "marvell,armada3700"; >=20=20 > aliases { > /* ethernet1 is wan port */ > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts b= /arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts > index 48a7f50fb427..b03af87611a9 100644 > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts > @@ -18,7 +18,7 @@ > / { > model =3D "Globalscale Marvell ESPRESSOBin Board V7"; > compatible =3D "globalscale,espressobin-v7", "globalscale,espressobin", > - "marvell,armada3720", "marvell,armada3710"; > + "marvell,armada3720", "marvell,armada3700"; >=20=20 > aliases { > /* ethernet1 is wan port */ > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/ar= ch/arm64/boot/dts/marvell/armada-3720-espressobin.dts > index 1542d836c090..c5a834b33b77 100644 > --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts > +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts > @@ -16,5 +16,5 @@ >=20=20 > / { > model =3D "Globalscale Marvell ESPRESSOBin Board"; > - compatible =3D "globalscale,espressobin", "marvell,armada3720", "marvel= l,armada3710"; > + compatible =3D "globalscale,espressobin", "marvell,armada3720", "marvel= l,armada3700"; > }; > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arc= h/arm64/boot/dts/marvell/armada-3720-turris-mox.dts > index caf9c8529fca..5840ed129309 100644 > --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts > +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts > @@ -14,7 +14,7 @@ > / { > model =3D "CZ.NIC Turris Mox Board"; > compatible =3D "cznic,turris-mox", "marvell,armada3720", > - "marvell,armada3710"; > + "marvell,armada3700"; >=20=20 > aliases { > spi0 =3D &spi0; > diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/bo= ot/dts/marvell/armada-372x.dtsi > index 5ce55bdbb995..02ae1e153288 100644 > --- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi > @@ -13,7 +13,7 @@ >=20=20 > / { > model =3D "Marvell Armada 3720 SoC"; > - compatible =3D "marvell,armada3720", "marvell,armada3710"; > + compatible =3D "marvell,armada3720", "marvell,armada3700"; >=20=20 > cpus { > cpu1: cpu@1 { > --=20 > 2.20.1 > --=20 Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com 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 69505C636D4 for ; Wed, 1 Feb 2023 07:47:21 +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:MIME-Version:Message-ID:Date:References :In-Reply-To:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CnSqv23aQxQ+Q3Zu/4DjF3nSshjmSu3q7G/iqWKWvZw=; b=sJG+eoY8Bi7Ppt hOyEkuD0eGZIP3iaeMU2Z3ltC5zL9tAKXcHHg5qgH0vwTwE1bwgDbEpjBwa3Zw7FHWibrJgxQJIjc DFhZsFYfSdUiqAIZto42cy1hz9PlfJloGoZ/QLBi5bmUrfLQ+/kZI+hDT+xlhM6mUNqQTIMrkxR4X JpjsT508AWFGjVrvBKhoalN6VaChKORJBE2GPqMtliAD5KsTWCQ7qdcrg9mIsEbLY17eARRAqq/x5 cwX+9zAXj/bABeKvcFFXswZxNTwIu7uMJiR56amrm76Ny46MZl2CtSA1+YbQAZTqL5shKe9mrrNYd M2L5uI9RZJKRApSy/HCg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pN7p1-00Ag6o-TZ; Wed, 01 Feb 2023 07:46:24 +0000 Received: from relay4-d.mail.gandi.net ([2001:4b98:dc4:8::224]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pN7ox-00Ag31-C8 for linux-arm-kernel@lists.infradead.org; Wed, 01 Feb 2023 07:46:22 +0000 Received: (Authenticated sender: gregory.clement@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 1500CE0003; Wed, 1 Feb 2023 07:46:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1675237567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z25cfYozFGO7GRW7aRvp/LnRji5Y6L8B9ioccgyMGOo=; b=FVczT2DdcQRv21R6CZfD8lXiI6mt72zNv/4Dsv1FyVceB+PrtVgU3PeLgVGrLg2otMRWqe hR4dxyxdOb+hwvssL6bMIjIeajlHUISohPD3bvgqjMmplFkgaw0aUcOQ+AuaJgiGJjVhFY hUIIehahUdvRMoUx1F5FXX8IZZxu6hip3gzHuXxAbYQ7KG6h3rq6+siyp+CHGKbLPITWYY 4igq1MEU9EzThXmhOeM9BKwX8T3FL2fe6vhBXiEIpsFK9+48TiZGUm2k28ZlQuo6dVK+wU WVOB85Jl9inH8Vnak10doHqSRMhMCGtIa6KS15Zl39TNPUoBoSBKiJOegpwE+Q== From: Gregory CLEMENT To: Pali =?utf-8?Q?Roh=C3=A1r?= , Andrew Lunn , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] arm64: dts: marvell: Fix compatible strings for Armada 3720 boards In-Reply-To: <20220713125644.3117-1-pali@kernel.org> References: <20220713125644.3117-1-pali@kernel.org> Date: Wed, 01 Feb 2023 08:46:05 +0100 Message-ID: <87h6w5bzgi.fsf@BL-laptop> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230131_234619_889926_0165AF52 X-CRM114-Status: GOOD ( 16.26 ) 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 UGFsaSBSb2jDoXIgPHBhbGlAa2VybmVsLm9yZz4gd3JpdGVzOgoKPiBBbGwgQXJtYWRhIDM3MjAg Ym9hcmRzIGhhdmUgQXJtYWRhIDM3MjAgcHJvY2Vzc29yIHdoaWNoIGlzIG9mIEFybWFkYSAzNzAw Cj4gZmFtaWx5IGFuZCBkbyBub3QgaGF2ZSBBcm1hZGEgMzcxMCBwcm9jZXNzb3IuIFNvIG5vbmUg b2YgdGhlbSBzaG91bGQgaGF2ZQo+IGNvbXBhdGlibGUgc3RyaW5nIGZvciBBcm1hZGEgMzcxMCBw cm9jZXNzb3IuCj4KPiBGaXggY29tcGF0aWJsZSBzdHJpbmcgZm9yIGFsbCB0aGVzZSBib2FyZHMg YnkgcmVtb3Zpbmcgd3JvbmcgcHJvY2Vzc29yCj4gc3RyaW5nICJtYXJ2ZWxsLGFybWFkYTM3MTAi IGFuZCBhZGRpbmcgZmFtaWx5IHN0cmluZyAibWFydmVsbCxhcm1hZGEzNzAwIgo+IGFzIHRoZSBs YXN0IG9uZS4gKE5vdGUgdGhhdCB0aGlzIGlzIHNhbWUgd2F5IGhvdyBhcmUgZGVmaW5lZCBBcm1h ZGEgMzcxMAo+IERUUyBmaWxlcykuCj4KPiBTaWduZWQtb2ZmLWJ5OiBQYWxpIFJvaMOhciA8cGFs aUBrZXJuZWwub3JnPgoKCkZpeGVkZCBhIG1hcmdlIGNvbmZsaWN0IGFuZCBhcHBsaWVkIG9uIG12 ZWJ1L2R0NjQKClRoYW5rcywKCkdyZWdvcnkKCj4gLS0tCj4gIGFyY2gvYXJtNjQvYm9vdC9kdHMv bWFydmVsbC9hcm1hZGEtMzcyMC1kYi5kdHMgICAgICAgICAgICAgICAgICB8IDIgKy0KPiAgYXJj aC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFkYS0zNzIwLWVzcHJlc3NvYmluLWVtbWMuZHRz ICAgIHwgMiArLQo+ICBhcmNoL2FybTY0L2Jvb3QvZHRzL21hcnZlbGwvYXJtYWRhLTM3MjAtZXNw cmVzc29iaW4tdWx0cmEuZHRzICAgfCAyICstCj4gIGFyY2gvYXJtNjQvYm9vdC9kdHMvbWFydmVs bC9hcm1hZGEtMzcyMC1lc3ByZXNzb2Jpbi12Ny1lbW1jLmR0cyB8IDIgKy0KPiAgYXJjaC9hcm02 NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFkYS0zNzIwLWVzcHJlc3NvYmluLXY3LmR0cyAgICAgIHwg MiArLQo+ICBhcmNoL2FybTY0L2Jvb3QvZHRzL21hcnZlbGwvYXJtYWRhLTM3MjAtZXNwcmVzc29i aW4uZHRzICAgICAgICAgfCAyICstCj4gIGFyY2gvYXJtNjQvYm9vdC9kdHMvbWFydmVsbC9hcm1h ZGEtMzcyMC10dXJyaXMtbW94LmR0cyAgICAgICAgICB8IDIgKy0KPiAgYXJjaC9hcm02NC9ib290 L2R0cy9tYXJ2ZWxsL2FybWFkYS0zNzJ4LmR0c2kgICAgICAgICAgICAgICAgICAgIHwgMiArLQo+ ICA4IGZpbGVzIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKPgo+IGRp ZmYgLS1naXQgYS9hcmNoL2FybTY0L2Jvb3QvZHRzL21hcnZlbGwvYXJtYWRhLTM3MjAtZGIuZHRz IGIvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFkYS0zNzIwLWRiLmR0cwo+IGluZGV4 IGJkNGU2MWQ1NDQ4ZS4uMGNmYjM4NDkyMDIxIDEwMDY0NAo+IC0tLSBhL2FyY2gvYXJtNjQvYm9v dC9kdHMvbWFydmVsbC9hcm1hZGEtMzcyMC1kYi5kdHMKPiArKysgYi9hcmNoL2FybTY0L2Jvb3Qv ZHRzL21hcnZlbGwvYXJtYWRhLTM3MjAtZGIuZHRzCj4gQEAgLTE4LDcgKzE4LDcgQEAKPiAgCj4g IC8gewo+ICAJbW9kZWwgPSAiTWFydmVsbCBBcm1hZGEgMzcyMCBEZXZlbG9wbWVudCBCb2FyZCBE Qi04OEYzNzIwLUREUjMiOwo+IC0JY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLGFybWFkYS0zNzIwLWRi IiwgIm1hcnZlbGwsYXJtYWRhMzcyMCIsICJtYXJ2ZWxsLGFybWFkYTM3MTAiOwo+ICsJY29tcGF0 aWJsZSA9ICJtYXJ2ZWxsLGFybWFkYS0zNzIwLWRiIiwgIm1hcnZlbGwsYXJtYWRhMzcyMCIsICJt YXJ2ZWxsLGFybWFkYTM3MDAiOwo+ICAKPiAgCWNob3NlbiB7Cj4gIAkJc3Rkb3V0LXBhdGggPSAi c2VyaWFsMDoxMTUyMDBuOCI7Cj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQvYm9vdC9kdHMvbWFy dmVsbC9hcm1hZGEtMzcyMC1lc3ByZXNzb2Jpbi1lbW1jLmR0cyBiL2FyY2gvYXJtNjQvYm9vdC9k dHMvbWFydmVsbC9hcm1hZGEtMzcyMC1lc3ByZXNzb2Jpbi1lbW1jLmR0cwo+IGluZGV4IDVjNGQ4 ZjM3OTcwNC4uNjcxNWExOWMxNDgzIDEwMDY0NAo+IC0tLSBhL2FyY2gvYXJtNjQvYm9vdC9kdHMv bWFydmVsbC9hcm1hZGEtMzcyMC1lc3ByZXNzb2Jpbi1lbW1jLmR0cwo+ICsrKyBiL2FyY2gvYXJt NjQvYm9vdC9kdHMvbWFydmVsbC9hcm1hZGEtMzcyMC1lc3ByZXNzb2Jpbi1lbW1jLmR0cwo+IEBA IC0xOCw3ICsxOCw3IEBACj4gIC8gewo+ICAJbW9kZWwgPSAiR2xvYmFsc2NhbGUgTWFydmVsbCBF U1BSRVNTT0JpbiBCb2FyZCAoZU1NQykiOwo+ICAJY29tcGF0aWJsZSA9ICJnbG9iYWxzY2FsZSxl c3ByZXNzb2Jpbi1lbW1jIiwgImdsb2JhbHNjYWxlLGVzcHJlc3NvYmluIiwKPiAtCQkgICAgICJt YXJ2ZWxsLGFybWFkYTM3MjAiLCAibWFydmVsbCxhcm1hZGEzNzEwIjsKPiArCQkgICAgICJtYXJ2 ZWxsLGFybWFkYTM3MjAiLCAibWFydmVsbCxhcm1hZGEzNzAwIjsKPiAgfTsKPiAgCj4gICZzZGhj aTAgewo+IGRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2Jvb3QvZHRzL21hcnZlbGwvYXJtYWRhLTM3 MjAtZXNwcmVzc29iaW4tdWx0cmEuZHRzIGIvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2Fy bWFkYS0zNzIwLWVzcHJlc3NvYmluLXVsdHJhLmR0cwo+IGluZGV4IDA3MDcyNWI4MWJlNS4uNDQ3 NzYwYjY5ODUwIDEwMDY0NAo+IC0tLSBhL2FyY2gvYXJtNjQvYm9vdC9kdHMvbWFydmVsbC9hcm1h ZGEtMzcyMC1lc3ByZXNzb2Jpbi11bHRyYS5kdHMKPiArKysgYi9hcmNoL2FybTY0L2Jvb3QvZHRz L21hcnZlbGwvYXJtYWRhLTM3MjAtZXNwcmVzc29iaW4tdWx0cmEuZHRzCj4gQEAgLTEzLDcgKzEz LDcgQEAKPiAgLyB7Cj4gIAltb2RlbCA9ICJHbG9iYWxzY2FsZSBNYXJ2ZWxsIEVTUFJFU1NPQmlu IFVsdHJhIEJvYXJkIjsKPiAgCWNvbXBhdGlibGUgPSAiZ2xvYmFsc2NhbGUsZXNwcmVzc29iaW4t dWx0cmEiLCAibWFydmVsbCxhcm1hZGEzNzIwIiwKPiAtCQkgICAgICJtYXJ2ZWxsLGFybWFkYTM3 MTAiOwo+ICsJCSAgICAgIm1hcnZlbGwsYXJtYWRhMzcwMCI7Cj4gIAo+ICAJYWxpYXNlcyB7Cj4g IAkJLyogZXRoZXJuZXQxIGlzIFdBTiBwb3J0ICovCj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQv Ym9vdC9kdHMvbWFydmVsbC9hcm1hZGEtMzcyMC1lc3ByZXNzb2Jpbi12Ny1lbW1jLmR0cyBiL2Fy Y2gvYXJtNjQvYm9vdC9kdHMvbWFydmVsbC9hcm1hZGEtMzcyMC1lc3ByZXNzb2Jpbi12Ny1lbW1j LmR0cwo+IGluZGV4IDc1NDAxZWFiNGQ0Mi4uMmE4YWEzOTAxYTlmIDEwMDY0NAo+IC0tLSBhL2Fy Y2gvYXJtNjQvYm9vdC9kdHMvbWFydmVsbC9hcm1hZGEtMzcyMC1lc3ByZXNzb2Jpbi12Ny1lbW1j LmR0cwo+ICsrKyBiL2FyY2gvYXJtNjQvYm9vdC9kdHMvbWFydmVsbC9hcm1hZGEtMzcyMC1lc3By ZXNzb2Jpbi12Ny1lbW1jLmR0cwo+IEBAIC0xOSw3ICsxOSw3IEBACj4gIAltb2RlbCA9ICJHbG9i YWxzY2FsZSBNYXJ2ZWxsIEVTUFJFU1NPQmluIEJvYXJkIFY3IChlTU1DKSI7Cj4gIAljb21wYXRp YmxlID0gImdsb2JhbHNjYWxlLGVzcHJlc3NvYmluLXY3LWVtbWMiLCAiZ2xvYmFsc2NhbGUsZXNw cmVzc29iaW4tdjciLAo+ICAJCSAgICAgImdsb2JhbHNjYWxlLGVzcHJlc3NvYmluIiwgIm1hcnZl bGwsYXJtYWRhMzcyMCIsCj4gLQkJICAgICAibWFydmVsbCxhcm1hZGEzNzEwIjsKPiArCQkgICAg ICJtYXJ2ZWxsLGFybWFkYTM3MDAiOwo+ICAKPiAgCWFsaWFzZXMgewo+ICAJCS8qIGV0aGVybmV0 MSBpcyB3YW4gcG9ydCAqLwo+IGRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2Jvb3QvZHRzL21hcnZl bGwvYXJtYWRhLTM3MjAtZXNwcmVzc29iaW4tdjcuZHRzIGIvYXJjaC9hcm02NC9ib290L2R0cy9t YXJ2ZWxsL2FybWFkYS0zNzIwLWVzcHJlc3NvYmluLXY3LmR0cwo+IGluZGV4IDQ4YTdmNTBmYjQy Ny4uYjAzYWY4NzYxMWE5IDEwMDY0NAo+IC0tLSBhL2FyY2gvYXJtNjQvYm9vdC9kdHMvbWFydmVs bC9hcm1hZGEtMzcyMC1lc3ByZXNzb2Jpbi12Ny5kdHMKPiArKysgYi9hcmNoL2FybTY0L2Jvb3Qv ZHRzL21hcnZlbGwvYXJtYWRhLTM3MjAtZXNwcmVzc29iaW4tdjcuZHRzCj4gQEAgLTE4LDcgKzE4 LDcgQEAKPiAgLyB7Cj4gIAltb2RlbCA9ICJHbG9iYWxzY2FsZSBNYXJ2ZWxsIEVTUFJFU1NPQmlu IEJvYXJkIFY3IjsKPiAgCWNvbXBhdGlibGUgPSAiZ2xvYmFsc2NhbGUsZXNwcmVzc29iaW4tdjci LCAiZ2xvYmFsc2NhbGUsZXNwcmVzc29iaW4iLAo+IC0JCSAgICAgIm1hcnZlbGwsYXJtYWRhMzcy MCIsICJtYXJ2ZWxsLGFybWFkYTM3MTAiOwo+ICsJCSAgICAgIm1hcnZlbGwsYXJtYWRhMzcyMCIs ICJtYXJ2ZWxsLGFybWFkYTM3MDAiOwo+ICAKPiAgCWFsaWFzZXMgewo+ICAJCS8qIGV0aGVybmV0 MSBpcyB3YW4gcG9ydCAqLwo+IGRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2Jvb3QvZHRzL21hcnZl bGwvYXJtYWRhLTM3MjAtZXNwcmVzc29iaW4uZHRzIGIvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2 ZWxsL2FybWFkYS0zNzIwLWVzcHJlc3NvYmluLmR0cwo+IGluZGV4IDE1NDJkODM2YzA5MC4uYzVh ODM0YjMzYjc3IDEwMDY0NAo+IC0tLSBhL2FyY2gvYXJtNjQvYm9vdC9kdHMvbWFydmVsbC9hcm1h ZGEtMzcyMC1lc3ByZXNzb2Jpbi5kdHMKPiArKysgYi9hcmNoL2FybTY0L2Jvb3QvZHRzL21hcnZl bGwvYXJtYWRhLTM3MjAtZXNwcmVzc29iaW4uZHRzCj4gQEAgLTE2LDUgKzE2LDUgQEAKPiAgCj4g IC8gewo+ICAJbW9kZWwgPSAiR2xvYmFsc2NhbGUgTWFydmVsbCBFU1BSRVNTT0JpbiBCb2FyZCI7 Cj4gLQljb21wYXRpYmxlID0gImdsb2JhbHNjYWxlLGVzcHJlc3NvYmluIiwgIm1hcnZlbGwsYXJt YWRhMzcyMCIsICJtYXJ2ZWxsLGFybWFkYTM3MTAiOwo+ICsJY29tcGF0aWJsZSA9ICJnbG9iYWxz Y2FsZSxlc3ByZXNzb2JpbiIsICJtYXJ2ZWxsLGFybWFkYTM3MjAiLCAibWFydmVsbCxhcm1hZGEz NzAwIjsKPiAgfTsKPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2Fy bWFkYS0zNzIwLXR1cnJpcy1tb3guZHRzIGIvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2Fy bWFkYS0zNzIwLXR1cnJpcy1tb3guZHRzCj4gaW5kZXggY2FmOWM4NTI5ZmNhLi41ODQwZWQxMjkz MDkgMTAwNjQ0Cj4gLS0tIGEvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFkYS0zNzIw LXR1cnJpcy1tb3guZHRzCj4gKysrIGIvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFk YS0zNzIwLXR1cnJpcy1tb3guZHRzCj4gQEAgLTE0LDcgKzE0LDcgQEAKPiAgLyB7Cj4gIAltb2Rl bCA9ICJDWi5OSUMgVHVycmlzIE1veCBCb2FyZCI7Cj4gIAljb21wYXRpYmxlID0gImN6bmljLHR1 cnJpcy1tb3giLCAibWFydmVsbCxhcm1hZGEzNzIwIiwKPiAtCQkgICAgICJtYXJ2ZWxsLGFybWFk YTM3MTAiOwo+ICsJCSAgICAgIm1hcnZlbGwsYXJtYWRhMzcwMCI7Cj4gIAo+ICAJYWxpYXNlcyB7 Cj4gIAkJc3BpMCA9ICZzcGkwOwo+IGRpZmYgLS1naXQgYS9hcmNoL2FybTY0L2Jvb3QvZHRzL21h cnZlbGwvYXJtYWRhLTM3MnguZHRzaSBiL2FyY2gvYXJtNjQvYm9vdC9kdHMvbWFydmVsbC9hcm1h ZGEtMzcyeC5kdHNpCj4gaW5kZXggNWNlNTViZGJiOTk1Li4wMmFlMWUxNTMyODggMTAwNjQ0Cj4g LS0tIGEvYXJjaC9hcm02NC9ib290L2R0cy9tYXJ2ZWxsL2FybWFkYS0zNzJ4LmR0c2kKPiArKysg Yi9hcmNoL2FybTY0L2Jvb3QvZHRzL21hcnZlbGwvYXJtYWRhLTM3MnguZHRzaQo+IEBAIC0xMyw3 ICsxMyw3IEBACj4gIAo+ICAvIHsKPiAgCW1vZGVsID0gIk1hcnZlbGwgQXJtYWRhIDM3MjAgU29D IjsKPiAtCWNvbXBhdGlibGUgPSAibWFydmVsbCxhcm1hZGEzNzIwIiwgIm1hcnZlbGwsYXJtYWRh MzcxMCI7Cj4gKwljb21wYXRpYmxlID0gIm1hcnZlbGwsYXJtYWRhMzcyMCIsICJtYXJ2ZWxsLGFy bWFkYTM3MDAiOwo+ICAKPiAgCWNwdXMgewo+ICAJCWNwdTE6IGNwdUAxIHsKPiAtLSAKPiAyLjIw LjEKPgoKLS0gCkdyZWdvcnkgQ2xlbWVudCwgQm9vdGxpbgpFbWJlZGRlZCBMaW51eCBhbmQgS2Vy bmVsIGVuZ2luZWVyaW5nCmh0dHA6Ly9ib290bGluLmNvbQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QK bGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRl YWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=