[lkml]   [2019]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the drm-misc tree with the drm tree
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 DRM_FILE_PAGE_OFFSET constant")
> 7d1500f9fbfc ("drm/ttm: Remove file_page_offset parameter from ttm_bo_device_init()")
> bed2dd84212e ("drm/ttm: Quick-test mmap offset in ttm_bo_mmap()")
> from the drm tree and commit:
> ab3e023b1b4c ("drm/cirrus: rewrite and modernize driver.")
> from the drm-misc tree.
> I fixed it up (I just removed the files) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

Ping drm-misc maintainers. Time to update drm-misc-next with a
backmerge I think?


 \ /
  Last update: 2019-04-09 09:24    [W:0.040 / U:29.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site