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

On Fri, Feb 8, 2019 at 10:26 AM Stephen Rothwell wrote: > > Hi Daniel, > > On Fri, 8 Feb 2019 09:53:33 +0100 Daniel Vetter wrote: > > > > There isn't a "below" afaics > > Oops :-( However the merge diff is not very enlightening in this case > anyway. It makes more sense to look at the fina

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

Hi Daniel, On Fri, 8 Feb 2019 09:53:33 +0100 Daniel Vetter wrote: > > There isn't a "below" afaics Oops :-( However the merge diff is not very enlightening in this case anyway. It makes more sense to look at the final result when I finish up in a while. -- Cheers, Stephen Rothwell pgp

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

On Fri, Feb 08, 2019 at 12:27:44PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/i915/intel_display.c > > between commit: > > 9f58892ea996 ("drm/i915: Pull all the reset functionality together into > i915_r

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_display.c between commit: 9f58892ea996 ("drm/i915: Pull all the reset functionality together into i915_reset.c") from the drm tree and commit: d0e93599d396 ("drm/i915: prepare for drmP.h

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

On Mon, Mar 19, 2018 at 12:29:29PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/i915/intel_color.c > > between commit: > > db61d160b3ed ("drm/i915: Remove the pointless 1:1 matrix copy") > > from the drm t

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_color.c between commit: db61d160b3ed ("drm/i915: Remove the pointless 1:1 matrix copy") from the drm tree and commit: d5517a39dce4 ("drm/i915: Remove the blob->data casts") from the drm-

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: include/drm/drmP.h between commit: e7646f84ad4f ("drm: Add new LEASE debug level") from the drm tree and commit: 02c9656b2f0d ("drm: Move debug macros out of drmP.h") from the drm-misc tree. I fixed it up (I used

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

Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c between commits: 904bb5e5817f ("drm/vmwgfx: Switch over to internal atomic API for STDU") b0119cb9229d

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

Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/gpu/drm/sti/sti_dvo.c drivers/gpu/drm/sti/sti_hqvdp.c drivers/gpu/drm/sti/sti_mixer.c between commits: bdfd36ef8e64 ("drm/sti: Fix sparse warnings") b4bba92dfbe2 ("drm/sti: remove stih415-416 platform supp

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in Documentation/DocBook/drm.tmpl between commit 6f134d7bb434 ("drm/tile: expose the tile property to userspace (v3)") from the drm tree and commit e2beb6cd5d0f ("drm/Documentation: Fix rowspan value in drm-kms-properties") from

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in drivers/gpu/drm/drm_edid.c between commit 18df89fef2d5 ("drm: Decouple EDID parsing from I2C adapter") from the drm tree and commit d6885d659037 ("drm/edid: move drm_edid_is_zero to top, make edid argument const") from the drm