From nobody Mon Sep 28 06:34:45 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE9C24028C3; Tue, 25 Aug 2026 12:13:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787660041; cv=none; b=iqy7yfW6zMPZAOQdMWychzDuEWoab1XWY6/K2u/uWM7UKYrwvDYCk0ZxfTy4f/xl1ov3ACvF/4cxkVVgAGPKovAzVGJ5JmJEFpXmpwn2eKXYhXMZkb3riukO2Ud5LE3gu4P49WAAGRYje7h0VacTXgOvYfaQeAnLQnr0UqC4+40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787660041; c=relaxed/simple; bh=mU5TCWfHF4Ucj+/Q7YrZkhk8lUbA+cLaVfG5XMj4L/4=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=P08yqO2dWOFcTLx761/Q7H7k9z4TrDuynyiTrHUEjirjZx1UqpB8ybb7dD6Z26OYo1Pwvflh9kseBGiTGfjKrZRUVBfLr37cgUkvW4A6bUVkMyLnzzQ4vOXrxGIHBvzzmGVEAXCudkW+FIXmT1ZsZLndaltGtmTEvAYsmJxxsH4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ea7lV9U4; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ea7lV9U4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF6621F000E9; Tue, 25 Aug 2026 12:13:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787660039; bh=po14Aw8c554DizVs6FCmQTxU2TzseN2FKQN91g7xicQ=; h=Date:From:To:Cc:Subject; b=Ea7lV9U4gBuDtiMak+5xZcykwdkkjZwuGf3tl88qdruw1FQjtY9CWqSo7Ie2UonEs mBenG7xtvpg0xLAxBAJ6nSNSaQowTq+EgicdwGMizrtckWw5tZLtafB5A6tv7aUaqL VNhVqJGZwV8TKlHVu+Cx657kNKB8jPI2OXZI65SFwK3ECaoRi92Ga9qEdCW27yglHS WFkSG2HA1aVFGrTc9f53fmWfH163Pg4B74hmGKscbWBkXGjPDAXHiyIbkRh7w6A7R3 LcsuA7rJGFGwGIOB2llntYKwPB82MmxkFLeLSI69LLfQBvAbFbwk2ZopgWLlm5o4sB +2AOT8c9HGe2w== Date: Tue, 25 Aug 2026 13:13:54 +0100 From: Mark Brown To: Simona Vetter , Intel Graphics , DRI Cc: GuoHan Zhao , Linux Kernel Mailing List , Linux Next Mailing List , Rob Herring , Tomeu Vizoso Subject: linux-next: manual merge of the drm-misc-fixes tree with the origin tree Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ysEuOZ4LWzJOIpcL" Content-Disposition: inline --ysEuOZ4LWzJOIpcL Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the drm-misc-fixes tree got a conflict in: drivers/accel/ethosu/ethosu_drv.c between commit: 17cdb54644e7d ("accel: ethosu: Add performance counter support") from the origin tree and commit: 7ab64476a610f ("accel/ethosu: check MMIO mapping errors in probe") from the drm-misc-fixes tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/accel/ethosu/ethosu_drv.c index d121fb0d77328,b2901eb8a7a03..0000000000000 --- a/drivers/accel/ethosu/ethosu_drv.c +++ b/drivers/accel/ethosu/ethosu_drv.c @@@ -356,7 -342,8 +356,9 @@@ static int ethosu_probe(struct platform dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(40)); =20 ethosudev->regs =3D devm_platform_ioremap_resource(pdev, 0); + ethosudev->pmu_regs =3D ethosudev->regs; + if (IS_ERR(ethosudev->regs)) + return PTR_ERR(ethosudev->regs); =20 ethosudev->num_clks =3D devm_clk_bulk_get_all(&pdev->dev, ðosudev->cl= ks); if (ethosudev->num_clks < 0) --ysEuOZ4LWzJOIpcL Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmqNhwIACgkQJNaLcl1U h9D9pwf+JO0cbi+V8LVHLOfhkjV3CqrbyEu2p2wrBfdLitHygC2bX3ytfw3w02IQ cVgpfQ+6Z3AUrTcKnptVeZvJbNz34GgIMaDY6Mq4nfwygA9/QYHno6YMHO/R8aQF A3ER87pHwUSkzBlSUYYLWBL2qonSneLCtxtDAAaBcyX8rFvyjAGmkiK6fO1fqw5Y XqWKd1XfF2dpNtaUiVRuYLfHHBcvxoix9++ZF4jX333FdF+NKsiMugkPnNFPGYLU zvEVh8ES4wianHVJF6iVP+aYSwu3kEoqk5EBPA9ST15jH8ON0lkZZqisQHBXff1Z /mTjSRHkza/MV4LHLt9X656yj6N3pQ== =LRNV -----END PGP SIGNATURE----- --ysEuOZ4LWzJOIpcL--