linux-kernel - linux-next: manual merge of the drm-misc tree with the pmdomain tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20240829110020.4c57cc46@canb.auug.org.au>
Date: Thu, 29 Aug 2024 11:00:20 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Daniel Vetter <daniel.vetter@...ll.ch>, Ulf Hansson
 <ulf.hansson@...aro.org>
Cc: Intel Graphics <intel-gfx@...ts.freedesktop.org>, DRI
 <dri-devel@...ts.freedesktop.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Thierry Reding <treding@...dia.com>
Subject: linux-next: manual merge of the drm-misc tree with the pmdomain
 tree

Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in:

  drivers/gpu/drm/tegra/gr3d.c

between commit:

  606cb5b75827 ("drm/tegra: gr3d: Convert into devm_pm_domain_attach_list()")

from the pmdomain tree and commit:

  f790b5c09665 ("drm/tegra: gr3d: Convert into dev_pm_domain_attach|detach_list()")

from the drm-misc tree.

I fixed it up (I just used the former) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped