Hello Stephen, On Tue, Oct 10, 2023 at 12:33:45PM +1100, Stephen Rothwell wrote: > Today's linux-next merge of the drm-msm tree got conflicts in: > > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c > drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c > drivers/gpu/drm/msm/msm_drv.c > > between commits: > > 01790d5e372f ("drm/msm: Convert to platform remove callback returning void") > cd61a76c210a ("drm/msm: dynamically allocate the drm-msm_gem shrinker") > > from the mm, drm trees and commits: > > 283add3e6405 ("drm/msm: remove shutdown callback from msm_platform_driver") > 506efcba3129 ("drm/msm: carve out KMS code from msm_drv.c") > > from the drm-msm 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. FTR: The conflict resolution looks right to me. Thanks! Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
Attachment:
signature.asc
Description: PGP signature