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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/panthor/panthor_drv.c between commit: 2b55639a4e25 ("drm/panthor: Add FOP_UNSIGNED_OFFSET to fop_flags") from the drm-misc-fixes tree and commit: e16635d88fa0 ("drm/panthor: add DRM fdinfo support")

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/ast/ast_drv.h between commit: 0ce91928ec62 ("drm/ast: astdp: Wake up during connector status detection") from the drm-misc-fixes tree and commit: c91d75a3c6a2 ("drm/ast: astdp: Test firmware status

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_fbdev_generic.c between commits: cc88ad784e42 ("drm/fb-helper: Check fb_deferred_io_init() return value") d6591da5f3ff ("drm/fb-helper: Use a per-driver FB deferred I/O handler") from the drm-mis

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

Am 16.11.22 um 01:25 schrieb Stephen Rothwell: Hi all, On Wed, 16 Nov 2022 10:47:52 +1100 Stephen Rothwell wrote: Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c between commit: eca13f3c67b6 ("drm/amdgpu: use the last IB as g

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

Hi all, On Wed, 16 Nov 2022 10:47:52 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > > between commit: > > eca13f3c67b6 ("drm/amdgpu: use the last IB as gang leader v2") > > from the drm-misc

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

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: eca13f3c67b6 ("drm/amdgpu: use the last IB as gang leader v2") from the drm-misc-fixes tree and commit: 1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies f

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

Hi all, On Thu, 14 Apr 2022 09:47:15 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/radeon/radeon_sync.c > > between commit: > > 022074918042 ("drm/radeon: fix logic inversion in radeon_sync_resv") > > from the drm-m

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

Am 14.04.22 um 01:47 schrieb Stephen Rothwell: Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/radeon/radeon_sync.c between commit: 022074918042 ("drm/radeon: fix logic inversion in radeon_sync_resv") from the drm-misc-fixes tree and commit:

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/radeon/radeon_sync.c between commit: 022074918042 ("drm/radeon: fix logic inversion in radeon_sync_resv") from the drm-misc-fixes tree and commit: 7bc80a5462c3 ("dma-buf: add enum dma_resv_usage v4"

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_gem.c between commit: f49a51bfdc8e ("drm/shme-helpers: Fix dma_buf_mmap forwarding bug") from the drm-misc-fixes tree and commit: d693def4fd1c ("drm: Remove obsolete GEM and PRIME callbacks from

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

Hi Stephen, On 23/04/2020 06:17, Stephen Rothwell wrote: > Hi all, > > On Tue, 21 Apr 2020 09:10:25 +0300 Tomi Valkeinen > wrote: >> >> On 21/04/2020 04:52, Stephen Rothwell wrote: >>> >>> Today's linux-next merge of the drm-misc tree got a conflict in:he drm-misc >>> tree with the drm-misc-fi

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

Hi all, On Tue, 21 Apr 2020 09:10:25 +0300 Tomi Valkeinen wrote: > > On 21/04/2020 04:52, Stephen Rothwell wrote: > > > > Today's linux-next merge of the drm-misc tree got a conflict in:he drm-misc > > tree with the drm-misc-fixes tree > > > >drivers/gpu/drm/tidss/tidss_encoder.c > > > >

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

Hi, On 21/04/2020 04:52, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the drm-misc tree got a conflict in:he drm-misc tree with the drm-misc-fixes tree drivers/gpu/drm/tidss/tidss_encoder.c between commit: 9da67433f64e ("drm/tidss: fix crash related to accessing freed m

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in:he drm-misc tree with the drm-misc-fixes tree drivers/gpu/drm/tidss/tidss_encoder.c between commit: 9da67433f64e ("drm/tidss: fix crash related to accessing freed memory") from the drm-misc-fixes tree and commit: b

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

Hi Dave, The conflict below now exists between the drm-misc-fixes tree and the drm tree. On Tue, 18 Jul 2017 11:39:46 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/vc4/vc4_crtc.c > > between commit: > > 1ed134e6526b

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

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/vc4/vc4_crtc.c between commit: 1ed134e6526b ("drm/vc4: Fix VBLANK handling in crtc->enable() path") from the drm-misc-fixes tree and commit: 0b20a0f8c3cb ("drm: Add old state pointer to CRTC .enable