Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/gpu/drm/armada/armada_crtc.c between commit d8c96083cf5e ("drm/armada: permit CRTCs to be registered as separate devices") from the drm tree and commit c9d53c0f2d23 ("devres: remove devm_request_and_ioremap()") from the driver-core tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc drivers/gpu/drm/armada/armada_crtc.c index 3f620e21e06b,3aedf9e993e6..000000000000 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@@ -1064,11 -1039,9 +1064,9 @@@ int armada_drm_crtc_create(struct drm_d if (ret) return ret; - base = devm_request_and_ioremap(dev, res); - if (!base) { - DRM_ERROR("failed to ioremap register\n"); - return -ENOMEM; - } - base = devm_ioremap_resource(dev->dev, res); ++ base = devm_ioremap_resource(dev, res); + if (IS_ERR(base)) + return PTR_ERR(base); dcrtc = kzalloc(sizeof(*dcrtc), GFP_KERNEL); if (!dcrtc) {
Attachment:
signature.asc
Description: PGP signature