Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/nouveau/nouveau_fbcon.c
between commit:
4a16dd9d18a0 ("drm/nouveau/kms: switch to drm fbdev helpers")
from the drm tree and commits:
9877d8f6bc37 ("drm/fb_helper: Rename field fbdev to info in struc
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/i915/i915_gem_gtt.c
between commit:
1e0a96e50882 ("drm/i915: export color_differs")
from the drm tree and commit:
71724f708997 ("drm/mm: Use helpers for drm_mm_node booleans")
from the drm-misc tre
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/i915/i915_vma.c
between commits:
1e0a96e50882 ("drm/i915: export color_differs")
33dd88992313 ("drm/i915: cleanup cache-coloring")
b290a78b5c3d ("drm/i915: Use helpers for drm_mm_node booleans")
5
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/i915/i915_gem.c
between commits:
b290a78b5c3d ("drm/i915: Use helpers for drm_mm_node booleans")
2850748ef876 ("drm/i915: Pull i915_vma_pin under the vm->mutex")
from the drm tree and commit:
7172
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:
2d6f6f359fd8 ("drm/i915: add i915_driver_modeset_remove()")
from the drm tree and commit:
f2521f7731ed ("drm/i915: switch to
drm_fb_helper_remove_conflicting_pci_fra
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:
8a9a982767b7 ("drm/i915: use a separate context for gpu relocs")
from the drm tree and commit:
4ee92c7149da ("drm/mm: Convert drm_mm_node booleans to b
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
between commit:
a0a63940b0c9 ("drm/vmwgfx: Assign eviction priorities to resources")
from the drm tree and commit:
52791eeec1d9 ("dma-buf: rename reservation_object to dma_r
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c
between commit:
9b93eb475aa9 ("drm/amd/display: move clk_mgr files to right place")
from the drm tree and commit:
4fc4dca8320e ("drm/amd: drop use of drmp.h in os_ty
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
between commit:
899fbde14646 ("drm/amdgpu: replace get_user_pages with HMM mirror helpers")
from the drm tree and commit:
c366be543c5e ("drm/amd: drop dependencies on drm_os_
On Tue, Apr 09, 2019 at 11:34:10AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got conflicts in:
>
> drivers/gpu/drm/cirrus/cirrus_drv.h
> drivers/gpu/drm/cirrus/cirrus_ttm.c
>
> between commits:
>
> aa8e2435b3d4 ("drm/ttm: Define a single DR
Hi all,
Today's linux-next merge of the drm-misc tree got conflicts in:
drivers/gpu/drm/cirrus/cirrus_drv.h
drivers/gpu/drm/cirrus/cirrus_ttm.c
between commits:
aa8e2435b3d4 ("drm/ttm: Define a single DRM_FILE_PAGE_OFFSET constant")
7d1500f9fbfc ("drm/ttm: Remove file_page_offset parame
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
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
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
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
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/Makefile
between commit:
2bb42410b1bd ("drm: Remove drm_global.{c,h} v2")
from the drm tree and commit:
c6fdea6e1a19 ("drm: Merge drm_info.c into drm_debugfs.c")
from the drm-misc tree.
I fixed it
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:
55ac5a1614f9 ("drm/i915: Attach the pci match data to the device upon
creation")
from the drm tree and commit:
1feb64c49d7f ("drm/i915: Clear DRIVER_ATOMIC on a per-
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/i915/intel_display.h
between commit:
dce888798d3e ("drm/i915: remove confusing GPIO vs PCH_GPIO")
from the drm tree and commit:
d78aa650670d ("drm: Add drm/drm_util.h header file")
from the drm-mis
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
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-
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
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
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
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
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
25 matches
Mail list logo
