Received-SPF: pass (google.com: domain of linux-kernel+bounces-15810-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Feedback-ID: i56a14606:Fastmail
User-Agent: Cyrus-JMAP/3.9.0-alpha0-1364-ga51d5fd3b7-fm-20231219.001-ga51d5fd3
Precedence: bulk
MIME-Version: 1.0
Message-Id: <5a6d441a-54bb-42ed-9ab7-3a7f24c8a14b@app.fastmail.com>
In-Reply-To: <20240103173018.GD5954@willie-the-truck>
References: <20240103100324.05f47bb8@canb.auug.org.au>
 <20240103173018.GD5954@willie-the-truck>
Date: Wed, 03 Jan 2024 18:38:55 +0100
From: "Arnd Bergmann" <arnd@arndb.de>
To: "Will Deacon" <will@kernel.org>, "Stephen Rothwell" <sfr@canb.auug.org.au>
Cc: "Olof Johansson" <olof@lixom.net>,
 ARM <linux-arm-kernel@lists.infradead.org>,
 "Anshuman Khandual" <anshuman.khandual@arm.com>,
 "Linus Walleij" <linus.walleij@linaro.org>,
 "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
 linux-next <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm-perf tree
Content-Type: text/plain

On Wed, Jan 3, 2024, at 18:30, Will Deacon wrote:
> On Wed, Jan 03, 2024 at 10:03:24AM +1100, Stephen Rothwell wrote:
>>   static int armv6_map_event(struct perf_event *event)
>>   {
>>   	return armpmu_map_event(event, &armv6_perf_map,
>
> Thanks, this looks fine to me (just remove all the 11MPCore code).
>
> Arnd -- anything you need me to do in the perf tree here other than mention
> this in my pull request?

No, I think we're good here as far as I can tell.

    Arnd