Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/tests/drm_mm_test.c
between commit:
2ba157983974 ("drm/tests: Fix incorrect argument in drm_test_mm_insert_range")
from Linus' tree and commit:
078a5b498d6a ("drm/tests: Remove slow tests")
from th
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/accel/ivpu/ivpu_job.c
between commit:
6309727ef271 ("kthread: add kthread_stop_put")
from Linus' tree and commit:
57c7e3e4800a ("accel/ivpu: Stop job_done_thread on suspend")
from the drm-misc tree.
I fix
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/accel/ivpu/ivpu_ipc.c
between commit:
b0873eead1d1 ("accel/ivpu: Do not use wait event interruptible")
from Linus' tree and commit:
57c7e3e4800a ("accel/ivpu: Stop job_done_thread on suspend")
from the drm
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/accel/ivpu/ivpu_drv.c
between commit:
828d63042aec ("accel/ivpu: Don't enter d0i3 during FLR")
from Linus' tree and commit:
57c7e3e4800a ("accel/ivpu: Stop job_done_thread on suspend")
from the drm-misc tr
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/accel/qaic/qaic_data.c
between commit:
2d956177b7c9 ("accel/qaic: Fix slicing memory leak")
from Linus' tree and commit:
217b812364d3 ("accel/qaic: Add QAIC_DETACH_SLICE_BO IOCTL")
from the drm-misc tree.
On Wed, Sep 13, 2023 at 11:09:39AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/mediatek/mtk_dpi.c
>
> between commits:
>
> 47d4bb6bbcdb ("drm/mediatek: mtk_dpi: Simplify with devm_drm_bridge_add()")
> 90c95c3892dd ("
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/mediatek/mtk_dpi.c
between commits:
47d4bb6bbcdb ("drm/mediatek: mtk_dpi: Simplify with devm_drm_bridge_add()")
90c95c3892dd ("drm/mediatek: mtk_dpi: Switch to .remove_new() void callback")
from Linu
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
between commit:
570b295248b0 ("drm/amdgpu: fix number of fence calculations")
from Linus' tree and commit:
ca6c1e210aa7 ("drm/amdgpu: use the new drm_exec object for CS v3")
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
MAINTAINERS
between commit:
80e62bc8487b ("MAINTAINERS: re-sort all entries and fields")
from Linus' tree and commit:
0dd53308f74f ("MAINTAINERS: Add entry for Samsung S6D7AA0 LCD panel
controller driver")
from t
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/video/fbdev/stifb.c
between commit:
8000425739dc ("fbdev: stifb: Remove trailing whitespaces")
from Linus' tree and commit:
0d556f1f0e01 ("video: Remove trailing whitespaces")
from the drm-misc tree.
I fi
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/tiny/cirrus.c
between commit:
7245e629dcaa ("drm/cirrus: NULL-check pipe->plane.state->fb in
cirrus_pipe_update()")
from Linus' tree and commits:
d99c028941b3 ("drm/cirrus: Convert to regular atomi
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/vmwgfx/ttm_object.h
between commit:
a309c7194e8a ("drm/vmwgfx: Remove rcu locks from user resources")
from Linus' tree and commit:
13acb368bf02 ("drm/ttm/vmwgfx: move ttm_bo_wait into VMWGFX")
from
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/tests/drm_format_helper_test.c
between commit:
a52a5451f43b ("kunit: Use KUNIT_EXPECT_MEMEQ macro")
from Linus' tree and commits:
f21d62c9ce3d ("drm/format-helper: Store RGB565 in little-endian orde
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
include/drm/gpu_scheduler.h
between commit:
7b476affcccf ("drm/sched: add DRM_SCHED_FENCE_DONT_PIPELINE flag")
from Linus' tree and commit:
4d5230b50dd4 ("drm/scheduler: add drm_sched_job_add_resv_dependencies")
f
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
include/drm/drm_edid.h
between commit:
c7943bb324e5 ("drm/edid: Handle EDID 1.4 range descriptor h/vfreq offsets")
from Linus' tree and commit:
afd4429eba28 ("drm/edid: Define more flags")
from the drm-misc tree.
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/vc4/vc4_drv.c
between commit:
538f6061 ("drm/vc4: drv: Register a different driver on BCM2711")
from Linus' tree and commit:
da8e393e23ef ("drm/vc4: drv: Adopt the dma configuration from the HVS
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
include/uapi/linux/dma-buf.h
between commit:
7c3e9fcad9c7 ("dma-buf: fix use of DMA_BUF_SET_NAME_{A,B} in userspace")
from Linus' tree and commits:
20e10881a043 ("dma-buf: Add an API for exporting sync files (v14)"
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/nouveau/dispnv50/disp.c
between commit:
d6c6a76f80a1 ("drm: Update MST First Link Slot Information Based on Encoding
Format")
from Linus' tree and commit:
606be062c2e5 ("drm/nouveau/kms/nv50-: Remo
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/kmb/kmb_drv.c
between commit:
c026565fe9be ("drm/kmb: Enable alpha blended second plane")
from Linus' tree and commit:
099afadc533f ("drm/kmb: Enable support for framebuffer console")
from the drm-
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")
f9
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 stri
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 enable
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
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:
>
>
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:
a
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
drivers
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 amdgp
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 _unlock
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
MAINTAINERS
between commits:
4400b7d68f6e ("MAINTAINERS: sort entries by entry name")
3b50142d8528 ("MAINTAINERS: sort field names for all entries")
from Linus' tree and commits:
5304058b1526 ("dt-bindings: displ
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
MAINTAINERS
between commitis:
4400b7d68f6e ("MAINTAINERS: sort entries by entry name")
3b50142d8528 ("MAINTAINERS: sort field names for all entries")
from Linus' tree and commits:
8edb69970739 ("MAINTAINERS: Bett
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
include/drm/drm_dp_mst_helper.h
between commit:
14692a3637d4 ("drm/dp_mst: Add probe_lock")
from the Linus' tree and commit:
f79489074c59 ("drm/dp_mst: Clear all payload id tables downstream when
initializing")
f
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/drm_dp_mst_topology.c
between commit:
14692a3637d4 ("drm/dp_mst: Add probe_lock")
3f9b3f02dda5 ("drm/dp_mst: Protect drm_dp_mst_port members with locking")
6f85f73821f6 ("drm/dp_mst: Add basic topol
On Thu, May 23, 2019 at 11:10:39AM -0500, Rob Herring wrote:
> On Thu, May 23, 2019 at 6:54 AM Maxime Ripard
> wrote:
> >
> > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the drm-misc tree got a conflict in:
> > >
> > >
On Thu, May 23, 2019 at 6:54 AM Maxime Ripard wrote:
>
> On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> >
> > Documentation/devicetree/bindings/vendor-prefixes.txt
> >
> > between commit:
>
Hi Daniel,
On Thu, 23 May 2019 15:11:15 +0200 Daniel Vetter wrote:
>
> That commit is on top of drm-misc, and somehow the .txt version has
> been resurrect in drm-misc-next (so needs to be re-deleted too).
My mistake, the conflict went away (due to the back merge) so my
scripts assumed the file
On Thu, May 23, 2019 at 3:04 PM Stephen Rothwell wrote:
>
> Hi Maxime,
>
> On Thu, 23 May 2019 13:53:55 +0200 Maxime Ripard
> wrote:
> >
> > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> > >
> > > Today's linux-next merge of the drm-misc tree got a conflict in:
> > >
> > >
Hi Maxime,
On Thu, 23 May 2019 13:53:55 +0200 Maxime Ripard
wrote:
>
> On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> >
> > Documentation/devicetree/bindings/vendor-prefixes.txt
> >
> > between commit
On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> Documentation/devicetree/bindings/vendor-prefixes.txt
>
> between commit:
>
> 8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
Hi Maxime,
On Thu, 23 May 2019 10:10:22 +0200 Maxime Ripard
wrote:
>
> Hi Stephen,
>
> On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> >
> > Documentation/devicetree/bindings/vendor-prefix
Hi Stephen,
On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> Documentation/devicetree/bindings/vendor-prefixes.txt
>
> between commit:
>
> 8122de54602e ("dt-bindings: Convert vendor prefixes to
Hi Sean,
On Tue, 21 May 2019 10:51:51 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> Documentation/devicetree/bindings/vendor-prefixes.txt
>
> between commit:
>
> 8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.txt
between commit:
8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
from Linus' tree and commits:
b4a2c0055a4f ("dt-bindings: Add vendor prefix
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 th
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 power
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 Linus
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")
from
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 ("vg
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 b
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 act
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 nou
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 vswi
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 u
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")
f
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 vgacon_text_
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
drm_connector_unreg
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
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 ("drm/vmwg
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
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")
f36203
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 d
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 connectors_c
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 th
62 matches
Mail list logo
