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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/selftests/mock_gem_device.c between commit: 9f9f4101fc98 ("drm/i915/selftests: Push the fake iommu device from the stack to data") from the drm-intel tree and commit: cd01269d11a3

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/display/intel_dp_mst.c between commit: 743acd115070 ("drm/i915: Get rid of silly void* from MST code") from the drm-intel tree and commit: 20c22ad32957 ("drm/dp_mst: Remove

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c between commit: 70d6894d1456 ("drm/i915: Serialize against vma moves") from the drm-intel tree and commit: 52791eeec1d9 ("dma-buf: rename reservation_object to

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: include/drm/drm_mode_config.h between commit: 585b000de23b ("drm: move content protection property to mode_config") from the drm-intel tree and commit: fbb5d0353c62 ("drm: Add HDR source metadata property") from

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_atomic_uapi.c between commit: 585b000de23b ("drm: move content protection property to mode_config") from the drm-intel tree and commit: fbb5d0353c62 ("drm: Add HDR source metadata property")

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_hdmi.c between commit: fbf08556ed43 ("drm/i915: Precompute HDMI infoframes") from the drm-intel tree and commit: 2f146b78d5a9 ("drm/i915: Attach colorspace property and enable modeset")

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

Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/gpu/drm/i915/intel_dp.c drivers/gpu/drm/i915/intel_drv.h between commits: e845f099f1c6 ("drm/i915/dsc: Add Per connector debugfs node for DSC support/enable") f6bff60e927b ("drm/i915/icl: Fix HPD handling

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

Hi all, The following conflict now exists between the drm and drm-intel trees. On Thu, 20 Jul 2017 11:23:33 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/i915/i915_drv.c > > between commit: > >

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/i915_drv.c between commit: 99c539bef538 ("drm/i915: unregister interfaces first in unload") from the drm-intel tree and commit: baf54385af78 ("drm/i915: Drop drm_vblank_cleanup") from the

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

Hi Dave, Just cc'ing you as I guess you will need to fix this up at some point. On Tue, 23 May 2017 12:00:32 +1000 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 > >

linux-next: manual merge of the drm-misc tree with the drm-intel 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 commits: 1cecc830e6b6 ("drm/i915: Refactor CURBASE calculation") 024faac7d59b ("drm/i915: Support variable cursor height on ivb+") from the drm-intel tree and commit:

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/i915_debugfs.c between commits: 418e3cd80051 ("drm/i915: Show the current i915_params in debugfs/i915_capabilites") 317eaa95081b ("drm/i915/debugfs: Add i915_hpd_storm_ctl") from the drm-intel

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_pm.c between commit: e339d67eeb02 ("drm/i915: Pass crtc state to vlv_compute_wm_level()") from the drm-intel tree and commit: 353c85989963 ("drm: Replace drm_format_plane_cpp() with

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_overlay.c between commit: 39ccc04e7435 ("drm/i915: Use primary plane->state for overlay ckey setup") from the drm-intel tree and commits: 1967b34d5afb ("drm/i915: Add local 'fb'

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/i915_vma.c between commit: 7d1d9aea3ee0 ("drm/i915: Tidy i915_gem_valid_gtt_space()") from the drm-intel tree and commit: 3f85fb3462dc ("drm: Wrap drm_mm_node.hole_follows") from the drm-misc

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/i915_gem_evict.c between commit: 49d73912cbfc ("drm/i915: Convert vm->dev backpointer to vm->i915") from the drm-intel tree and commit: 9a71e277888b ("drm: Extract struct drm_mm_scan from

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_pm.c between commit: 1186fa85eb9b ("drm/i915/gen9: minimum scanlines for Y tile is not always 4") from the drm-intel tree and commit: bd2ef25d921c ("drm: Add drm_rotation_90_or_270()")

linux-next: manual merge of the drm-misc tree with the drm-intel 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 commits: f7e5838bb37d ("drm/i915: Simplify reset_counter handling during atomic modesetting") from the drm-intel tree and commit: 81072bfd13f2 ("drm/i915: Rename async

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

On Tue, May 03, 2016 at 01:24:12PM +1000, 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 commits: > > f7e5838bb37d ("drm/i915: Simplify reset_counter handling during atomic >

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_dp.c between commit: 86ee27b5aa75 ("drm/i915: Read eDP Display control capability registers") from the drm-intel tree and commit: 9f085ebb1a50 ("rm/i915: Get rid of

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_dp.c between commit: 893da0c9bcb2 ("drm/i915: check for return value") from the drm-intel tree and commit: 13a3d91f17a5 ("drm: Pass 'name' to drm_encoder_init()") from the drm-misc

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/i915_irq.c between commit: fd8f507c0de9 ("drm/i915: s/PIPE_FRMCOUNT_GM45/PIPE_FRMCOUNT_G4X/ etc.") from the drm-intel tree and commit: 88e72717c2de ("drm/irq: Use unsigned int pipe in public

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_audio.c between commit: b8abe859c9d6 ("drm/i915: Always call the adjusted mode 'adjusted_mode'") from the drm-intel tree and commit: 9e5a3b529e84 ("drm: Remove the 'mode' argument from