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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/ttm/ttm_pool.c between commit: bb52cb0dec8d ("drm/ttm: make the pool shrinker lock a mutex") from Linus' tree and commits: ba051901d10f ("drm/ttm: add a debugfs file for the global page pools")

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/virtio/virtgpu_vq.c between commit: 75ef337bdba4 ("drm: virtio: fix common struct sg_table related issues") from Linus' tree and commit: 50c3d1938ee3 ("drm/virtio: implement blob resources: fix

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c between commit: e12e5263bf1d ("drm/msm/dpu: clean up some impossibilities") from Linus' tree and commit: 351f950db4ab ("drm/atomic: Pass the full state to CRTC atomic

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: include/drm/drm_dp_helper.h between commit: a77ed90da6bb ("drm/dp: Define protocol converter DPCD registers") from Linus' tree and commit: 6e5702980b14 ("drm/dp: add subheadings to DPCD address definitions") from

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

Hi all, On Wed, 26 Aug 2020 10:01:13 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the drm-misc tree got conflicts in: > > drivers/video/fbdev/arcfb.c > drivers/video/fbdev/atmel_lcdfb.c > drivers/video/fbdev/savage/savagefb_driver.c > > between commit: > >

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

Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/video/fbdev/arcfb.c drivers/video/fbdev/atmel_lcdfb.c drivers/video/fbdev/savage/savagefb_driver.c between commit: df561f6688fe ("treewide: Use fallthrough pseudo-keyword") from Linus' tree and commit:

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

Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/gpu/drm/nouveau/dispnv04/crtc.c drivers/gpu/drm/nouveau/dispnv04/overlay.c drivers/gpu/drm/nouveau/dispnv50/base507c.c drivers/gpu/drm/nouveau/dispnv50/wndw.c drivers/gpu/drm/nouveau/nouveau_dmem.c

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c between commit: eaad0c3aa978 ("drm/amdgpu: rename direct to immediate for VM updates") from the Linus' and commit: b1a8ef952a25 ("drm/amdgpu: move ttm bo->offset to

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/nouveau/nouveau_display.c between commit: 183405879255 ("drm/nouveau/kms: Remove field nvbo from struct nouveau_framebuffer") from Linus' tree and commit: cdc194cebd71 ("drm/nouveau: remove

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/omapdrm/omap_encoder.c between commit: 3c613a3bddd3 ("drm/omap: fix incorrect union usage") from Linus' tree and commit: 13d0add333af ("drm/edid: Pass connector to AVI infoframe functions") from

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

Hi all, On Thu, 15 Mar 2018 14:14:25 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > sound/pci/hda/hda_intel.c > > between commits: > > 1ba8f9d30817 ("ALSA: hda: Add a power_save blacklist") > 40088dc4e1ea

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

Hi all, On Thu, 15 Mar 2018 14:14:25 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > sound/pci/hda/hda_intel.c > > between commits: > > 1ba8f9d30817 ("ALSA: hda: Add a power_save blacklist") > 40088dc4e1ea ("ALSA: hda - Revert

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

Hi all, On Tue, 20 Mar 2018 12:08:41 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/sun4i/sun4i_tcon.h > > between commit: > > e742a17cd360 ("drm/sun4i: tcon: Reduce the scope of the LVDS error

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

Hi all, On Tue, 20 Mar 2018 12:08:41 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/sun4i/sun4i_tcon.h > > between commit: > > e742a17cd360 ("drm/sun4i: tcon: Reduce the scope of the LVDS error a bit") > > from

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/sun4i/sun4i_tcon.h between commit: e742a17cd360 ("drm/sun4i: tcon: Reduce the scope of the LVDS error a bit") from Linus' tree and commit: 6664e9dc5383 ("drm/sun4i: Add support for A80 TCONs")

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/sun4i/sun4i_tcon.h between commit: e742a17cd360 ("drm/sun4i: tcon: Reduce the scope of the LVDS error a bit") from Linus' tree and commit: 6664e9dc5383 ("drm/sun4i: Add support for A80 TCONs")

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: sound/pci/hda/hda_intel.c between commits: 1ba8f9d30817 ("ALSA: hda: Add a power_save blacklist") 40088dc4e1ea ("ALSA: hda - Revert power_save option default value") from Linus' tree and commit: 07f4f97d7b4b

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: sound/pci/hda/hda_intel.c between commits: 1ba8f9d30817 ("ALSA: hda: Add a power_save blacklist") 40088dc4e1ea ("ALSA: hda - Revert power_save option default value") from Linus' tree and commit: 07f4f97d7b4b

linux-next: manual merge of the drm-misc tree with Linus' 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: fd70075f82b7 ("drm/i915: Trim struct_mutex usage for kms") from Linus' tree and commits: 21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too early

linux-next: manual merge of the drm-misc tree with Linus' 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: fd70075f82b7 ("drm/i915: Trim struct_mutex usage for kms") from Linus' tree and commits: 21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too early

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

Hi Dave, On Wed, 2 Aug 2017 12:23:06 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/nouveau/nv50_display.c > > between commit: > > 4a5431af19bc ("drm/nouveau/kms/nv50: update vblank state in

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

Hi Dave, On Wed, 2 Aug 2017 12:23:06 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/nouveau/nv50_display.c > > between commit: > > 4a5431af19bc ("drm/nouveau/kms/nv50: update vblank state in response to > modeset

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/nouveau/nv50_display.c between commit: 4a5431af19bc ("drm/nouveau/kms/nv50: update vblank state in response to modeset actions") from Linus' tree and commit: 3c847d6cdadb ("drm/nouveau: Convert

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/nouveau/nv50_display.c between commit: 4a5431af19bc ("drm/nouveau/kms/nv50: update vblank state in response to modeset actions") from Linus' tree and commit: 3c847d6cdadb ("drm/nouveau: Convert

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/i915_reg.h between commit: c379b897ba1a ("drm/i915/cnl: Fix the CURSOR_COEFF_MASK used in DDI Vswing Programming") from Linus' tree and commit: 5a8dd2af31a7 ("drm/i915/cnl: Fix RMW on ddi

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/i915_reg.h between commit: c379b897ba1a ("drm/i915/cnl: Fix the CURSOR_COEFF_MASK used in DDI Vswing Programming") from Linus' tree and commit: 5a8dd2af31a7 ("drm/i915/cnl: Fix RMW on ddi

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_crtc.c between commit: 6f00975c6190 ("drm: Reject page_flip for !DRIVER_MODESET") from Linus' tree and commit: 43968d7b806d ("drm: Extract drm_plane.[hc]") from the drm-misc tree. I fixed it

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_crtc.c between commit: 6f00975c6190 ("drm: Reject page_flip for !DRIVER_MODESET") from Linus' tree and commit: 43968d7b806d ("drm: Extract drm_plane.[hc]") from the drm-misc tree. I fixed it

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: Documentation/DocBook/device-drivers.tmpl between commit: eae1760fc838 ("doc: update/fixup dma-buf related DocBook") from Linus' tree and commit: ddac4b5a6c08 ("Documentation: add fence-array to kernel DocBook")

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: Documentation/DocBook/device-drivers.tmpl between commit: eae1760fc838 ("doc: update/fixup dma-buf related DocBook") from Linus' tree and commit: ddac4b5a6c08 ("Documentation: add fence-array to kernel DocBook")

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c between commit: 257bf15a4b97 ("drm/amdgpu: add slap cache for sync objects as well") from Linus' tree and commit: 44debe7a123c ("vgacon: dummy implementation for

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c between commit: 257bf15a4b97 ("drm/amdgpu: add slap cache for sync objects as well") from Linus' tree and commit: 44debe7a123c ("vgacon: dummy implementation for

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: include/drm/drm_crtc.h between commit: 5fff80bbdb6b ("drm/atomic: Allow for holes in connector state, v2.") from Linus' tree and commit: 6c87e5c3ec6d ("drm: Rename drm_connector_unplug_all() to

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: include/drm/drm_crtc.h between commit: 5fff80bbdb6b ("drm/atomic: Allow for holes in connector state, v2.") from Linus' tree and commit: 6c87e5c3ec6d ("drm: Rename drm_connector_unplug_all() to

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

Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c between commit: 8fbf9d92a7bc ("drm/vmwgfx: Implement the cursor_set2 callback v2") from Linus' tree and

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

Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c between commit: 8fbf9d92a7bc ("drm/vmwgfx: Implement the cursor_set2 callback v2") from Linus' tree and

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

On 12/14/2015 02:12 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got conflicts in: > > drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > between commit: > > 8fbf9d92a7bc

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

Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c between commit: 8fbf9d92a7bc ("drm/vmwgfx: Implement the cursor_set2 callback v2") from Linus' tree and

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

Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c between commit: 8fbf9d92a7bc ("drm/vmwgfx: Implement the cursor_set2 callback v2") from Linus' tree and

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

On 12/14/2015 02:12 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got conflicts in: > > drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > between commit: > > 8fbf9d92a7bc

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_dp_helper.c between commits: 79a2b161c12a ("drm/dp: Define AUX_RETRY_INTERVAL as 500 us") 4efa83c8c786 ("drm/dp: Adjust i2c-over-aux retry count based on message size and i2c bus speed")

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_dp_helper.c between commits: 79a2b161c12a ("drm/dp: Define AUX_RETRY_INTERVAL as 500 us") 4efa83c8c786 ("drm/dp: Adjust i2c-over-aux retry count based on message size and i2c bus speed")

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_irq.c between commit: 209e4dbc8dcd ("drm/vblank: Use u32 consistently for vblank counters") from Linus' tree and commit: b90180b057f7 ("drm/irq: More pipe/crtc consistency cleanups") from the

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_irq.c between commit: 209e4dbc8dcd (drm/vblank: Use u32 consistently for vblank counters) from Linus' tree and commit: b90180b057f7 (drm/irq: More pipe/crtc consistency cleanups) from the

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_atomic_helper.c between commit: 27667f4744fc ("i915: temporary fix for DP MST docking station NULL pointer dereference") from Linus' tree and commit: fc596660dd4e ("drm/atomic: add

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_atomic_helper.c between commit: 27667f4744fc (i915: temporary fix for DP MST docking station NULL pointer dereference) from Linus' tree and commit: fc596660dd4e (drm/atomic: add

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_crtc.c between commit: 5677d67ae394 ("drm: Stop resetting connector state to unknown") from Linus' tree and commit: 1c473be11958 ("drm: Fixup locking WARNINGs in drm_mode_config_reset") from

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_crtc.c between commit: 5677d67ae394 (drm: Stop resetting connector state to unknown) from Linus' tree and commit: 1c473be11958 (drm: Fixup locking WARNINGs in drm_mode_config_reset) from the