Messages in this thread | | | Date | Wed, 23 Jul 2014 23:23:23 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the drm tree |
| |
On Thu, Jul 24, 2014 at 03:56:30PM +1000, Stephen Rothwell wrote: > 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).
Looks good, thanks.
greg k-h
| |