[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm tree

arly complex conflicts. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/drm/drm_crtc.h index e0170bf80bb0,12f2bd4cf38a.. --- a/include/drm/drm_crtc.h +++ b/include/drm/d

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index f1e17d60055a,fba20bd59cfa.. --- a/drivers/gpu/drm/amd/amdgpu/amdg

[Intel-gfx] linux-next: manual merge of the tip tree with the drm-misc-fixes tree

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/ttm/ttm_bo.c index 86e3b233b722,ffc6cb55c78c.. --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel tree

d int pipe in public API") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/i915_irq.c index e24378ee7eda,bc732eb52b50..0

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

n fb alloc failure, unref gem object where it gets refed") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c i

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel-fixes tree

s you only tested the combined branches). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index 98eaea3e5ed6,e78bd7f69d72.. --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@@ -14583,14

[Intel-gfx] linux-next: manual merge of the drm-intel tree with Linus' tree

I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_runtime_pm.c index d89c1d0aa1b7,f8167753f91b.. --- a/drivers/gpu/drm/i915/intel_runtime_pm.

[Intel-gfx] linux-next: manual merge of the drm-intel tree with Linus' tree

t;drm/i915: Apply broader WaRsDisableCoarsePowerGating for guc also") from the drm-intel tree. I fixed it up (I just used the latter version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

when crtc is active, v2.") from the drm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_display.c index beb0374a19f1,bda6b9c82e66..000

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

ider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/intel_dp_mst.c index 1dee9933005f,5af22a7c11bf.. --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel tree

ed 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/intel_display.c index 8217ed0e71

Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel tree

Hi Dave, Just cc'ing you as I guess you will need to fix this up at some point. On Tue, 23 May 2017 12:00:32 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/i915/intel_di

[Intel-gfx] linux-next: build warning after merge of the drm-intel-fixes tree

' [-Wunused-variable] struct drm_i915_private *dev_priv = engine->i915; ^ Introduced by commit d9533f19d840 ("drm/i915: Hold a wakeref for probing the ring registers") -- Cheers, Stephen Rothwell __

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

ream 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. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

ixed 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.

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

rned, 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. --

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

or merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedes

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

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. -- Cheers, Stephen Rothwell ___ Intel-g

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

ed for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/intel_pm.c index 078fd1bfa5ea,936eef1634c7.. --- a/drivers/gpu/drm/i915/int

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

ctl_kernel()") from Linus' tree. You should consider rebasing your branch onto v4.13-rc1 (or merging v4.13-rc1) so that these (unnecessary) conflicts don't keep happening during development and the next merge window. I have applied the following merge fix patch for today. From: Steph

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree

merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/vc4/vc4_crtc.c index a12cc7ea99b6,9e0c1500375c.. --- a/drivers/gpu/drm/vc4/vc4_crtc

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

al 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. -- Cheers, Stephen Rothwell

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging") from the staging.current tree. I have applied the following merge fix patch - please check that it is correct. From: Stephen Rothwell Date: Wed, 19 Jul 2017 11:41:01 +1000 Subject: [PATCH] drm: fixes for staging

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel tree

ider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_drv.c index f406aec8a499,04d9bd84ee43.. --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_

Re: [Intel-gfx] 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 &g

Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree

Hi Dave, The following is now applicable to the drm and staging.current trees ... On Wed, 19 Jul 2017 11:46:57 +1000 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/staging/vboxvi

Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel tree

Hi all, The following conflict now exists between the drm and drm-intel trees. On Thu, 20 Jul 2017 11:23:33 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/i915/i915_drv.c > > between commit: &g

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/intel_pm.c index 40b224b44d1b,ee2a349cfe68.. --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/driver

Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree

t confused. I'll just keep applying the merge resolution patch and will remind Dave and Greg about it during the week before the merge window opens so that they can let Linus know that the fix up is needed. -- Cheers, Stephen Rothwell ___ Intel-gfx

[Intel-gfx] linux-next: unsigned commits in the drm-misc tree

Hi all, I noticed a set of commits that have no Signed-off-by from their committer: d9864a1d2dfc ("drm/stm: drv: Rename platform driver name") to ed34d261a12a ("drm/stm: dsi: Constify phy ops structure") -- Cheers, Stephen Rothwell _

[Intel-gfx] linux-next: manual merge of the drm-intel tree with Linus' tree

ted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/media/v4l2-core/videobuf2-dma-contig.c index 9f389f36566d,2405077fdc71.. --- a/drivers

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

ticularly complex conflicts. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm tree

rging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell Date: Wed, 1 Nov 2017 14:33:07 +1100 Subject: [PATCH] drm-misc: merge fix up for DEBUG printing macros move Signed-off-by: Stephen R

[Intel-gfx] linux-next: manual merge of the mali-dp tree with the drm-misc tree

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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/arm/malidp_planes.c index ee32361c87ac,b2d11df6b5e1.. --- a/drive

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/sun4i/sun4i_tcon.c index 2de586b7c98b,0d6c5ed44795.. --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/g

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

hen 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/nouveau/nv50_display.c index 9d40b2a8be4d,bd1199b67eb4..

Re: [Intel-gfx] 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 vbla

[Intel-gfx] linux-next: Signed-off-by missing for commit in the drm-misc-fixes tree

Hi all, Commit 8a510a5c7526 ("drm/vmwgfx: fix memory corruption with legacy/sou connectors") is missing a Signed-off-by from its committer. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop

Re: [Intel-gfx] linux-next: Signed-off-by missing for commit in the drm-misc-fixes tree

he correct approach? Please read "Developer's Certificate of Origin 1.1" in Documentation/process/submitting-patches.rst. Basically, if you handle the patch on its way to Linus (e.g. commit it to a branch of a git tree that Linus (or someone else along the path) merges) then you need

[Intel-gfx] linux-next: manual merge of the sunxi tree with the drm-misc tree

may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/sun4i/sun4i_drv.c index 9ccf7c4deb6d,1ec5b825aa64.. --- a/drivers/gpu/drm/sun4i/sun4i_drv.c ++

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel tree

ntioned 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_debugfs.c index 478f

[Intel-gfx] linux-next: build failure after merge of the sunxi tree

o member named 'drv' struct sun4i_drv *drv = scrtc->drv; ^ Caused by commit 50480a78e282 ("drm: sun4i: use vblank hooks in struct drm_crtc_funcs") from the drm-misc tree interacting with commit 1b8d109585df ("drm/sun4i: Add backend and tcon pointers to sun4i_crt

[Intel-gfx] linux-next: build failure after merge of the rcu tree

from the drm-intel tree. I added the following merge fix patch: From: Stephen Rothwell Date: Wed, 8 Mar 2017 12:09:49 +1100 Subject: [PATCH] drm/i915: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/sel

[Intel-gfx] linux-next: build warning after merge of the drm-misc tree

23ef59ef6dcc ("drm: Extract drm_pci.h") A forgotten include file (or maybe just a forward declaration of the struct). -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] linux-next: build failure after merge of the drm tree

ge resolution on my part. I reapplied that commit by hand. It would be nice if this conflict was resolved in the drm tree. This cherry picking of fixes from new development back to Linus' tree can be a real pain when so many other changes happen in the same files. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

t to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/gvt/cmd_parser.c index 2b92cc8a7d1a,81076d8ec41a.. --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

or merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/gvt/scheduler.c index 39a83eb7aecc,31d2240fdb1f.. --- a/drivers/gpu/drm/i

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

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. -- Cheers, Stephen Rothwell diff --cc drivers/gp

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

or merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_gem_shrinker.c index d5d2b4c6ed38,006a8b908f77.. --- a/drivers/gpu/drm/i915/

[Intel-gfx] linux-next: manual merge of the kspp tree with the drm-misc tree

ider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/drm/drm_drv.h index 53b98321df9b,ade960c65929.. --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@@ -510,19 -403,11 +510

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

d for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/intel_lrc.c index 91555d4e9129,77168e673e0a.. --- a/drivers/gpu/drm/i915/i

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/intel_ringbuffer.h index 8cb2078c5bfc,847aea554464.. --- a/drivers/gpu/drm/i915/intel_ringbuffe

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm tree

s 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.

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

5817f ("drm/vmwgfx: Switch over to internal atomic API for STDU") b0119cb9229d ("drm/vmwgfx: Switch over to internal atomic API for SOU and LDU") from the drm tree. I added this merge fix patch for today: From: Stephen Rothwell Date: Mon, 3 Apr 2017 13:25:55 +1000 Subject: [P

[Intel-gfx] linux-next: manual merge of the drm-intel-fixes tree with the vfio-fixes tree

ted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/gvt/kvmgt.c index f8021a01df63,934963970288.. --- a/drivers/gpu/drm/i915/

[Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree

t;drm/i915/gvt/kvmgt: prevent double-release of vgpu") from the drm-intel-fixes tree. I applied this merge fix patch: From: Stephen Rothwell Date: Tue, 3 Jan 2017 10:38:48 +1100 Subject: [PATCH] vfio-mdev: fixup for "Make mdev_device private and abstract interfaces" Signed-off-b

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel tree

merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_gem_evict.c index 6457fd0c33a8,85ceff1b74b6.. --- a/drivers/gpu/drm/i915/i915_ge

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel tree

ider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_vma.c index e008e4e8b481,325b917c5ad7.. --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel tree

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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/intel_overlay.c index c95362327ffb,56

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel tree

merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/intel_pm.c index 4b12637e2084,ce03d9d5aca6.. --- a/drivers/gpu/drm/i915/intel_

Re: [Intel-gfx] linux-next: build failure after merge of the drm-intel-fixes tree

for possible interface change in > future we still need a pull request for i915 to resolve dependence earlier. This only happens because I merge both trees (I think) ... -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@li

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

build when LEDS_CLASS=m") I have reverted that commit for today (just because I had to to make sure that was the problem). -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree

Hi Jani, On Thu, 05 Jan 2017 12:24:13 +0200 Jani Nikula wrote: > > Daniel reverted it in drm-misc. OK, thanks. -- Cheers, Stephen Rothwell ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/li

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

t to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/drm/drm_atomic.h index 56814e8ae7ea,f96220ed4004.. --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@@ -144,7

[Intel-gfx] linux-next: build warning after merge of the drm-misc tree

Hi all, After merging the drm-misc tree, today's linux-next build (htmldocs) produced this warning: Documentation/gpu/todo.rst:469: ERROR: Unexpected indentation. Introduced by commit d2aacaf07395 ("drm/panel: Check for already prepared/enabled in drm_panel") -- Cheers, S

[Intel-gfx] linux-next: build warning after merge of the drm-misc tree

Add a way for other devices to follow panel state") -- Cheers, Stephen Rothwell pgpP4YEp06OoZ.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: build warning after merge of the drm-misc tree

^~ Introduced by commit 6b252cf42281 ("drm/nouveau: nvkm/vmm: implement raw ops to manage uvmm") -- Cheers, Stephen Rothwell pgp6JYkTvvPS1.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

ee from next-20230804 for today. -- Cheers, Stephen Rothwell pgpEToMq80uLP.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: manual merge of the fbdev tree with the drm-misc tree

ted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpx5Q6F41a8p.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

x-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. -- Cheers, Stephen

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

ooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/accel/qaic/qaic_data.c index f4b06792c6f1,c90fa6a430f6.. --- a/drivers/accel/qaic/qaic_data.c +++ b/drivers/accel/qaic/qaic_data.c

[Intel-gfx] linux-next: build warning after merge of the drm-misc tree

("drm/gpuvm: rename struct drm_gpuva_manager to struct drm_gpuvm") -- Cheers, Stephen Rothwell pgphiWJxtKLWJ.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/accel/ivpu/ivpu_fw.c index 0191cf8e5964,d57e103aae1c.. --- a/drivers/accel/ivpu/ivpu_fw.c +++ b/drivers/accel/ivpu/ivpu_fw.c

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

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

[Intel-gfx] linux-next: build warning after merge of the drm-misc tree

Hi all, After merging the drm-misc tree, today's linux-next build (htmldocs) produced this warning: Documentation/gpu/panfrost.rst: WARNING: document isn't included in any toctree Introduced by commit f11b0417eec2 ("drm/panfrost: Add fdinfo support GPU load metrics")

[Intel-gfx] linux-next: build warning after merge of the drm-misc-fixes tree

("drm/nouveau: exec: report max pushs through getparam") -- Cheers, Stephen Rothwell pgpwcj6Di6jNK.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: manual merge of the drm-msm-lumag tree with the drm-misc tree

inux-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. -- Cheers, S

[Intel-gfx] linux-next: build failure after merge of the drm-misc-fixes tree

, 0) | ^ cc1: all warnings being treated as errors Caused by commit 4481913607e5 ("drm/ttm: fix bulk_move corruption when adding a entry") I have used the drm-misc-fixes tree from next-20230622 for today. -- Cheers, Stephen Rothwell pgpOtDee3Xwhe.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

rging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/drm/gpu_scheduler.h index b29e347b10a9,e95b4837e5a3.. --- a/include/drm/gpu_scheduler.h +++ b/in

Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree

Hi all, On Tue, 27 Jun 2023 11:54:32 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > include/drm/gpu_scheduler.h > > between commit: > > db8b4968a8d0 ("drm/sched: Call drm_sched_fence_set_parent()

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

m 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. -- Cheers, Stephen Rothwell pgpddYrD_HyZv.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: duplicate patch in the drm-misc-fixes tree

sole.") in the drm-fixes tree. -- Cheers, Stephen Rothwell pgppQtV1gtJqw.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: manual merge of the drm-intel tree with Linus' tree

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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_driver.c index cf1c0970e

[Intel-gfx] linux-next: manual merge of the amdgpu tree with the drm-misc tree

entioned 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. -- Cheers, Stephen Rothwell pgp_UqgF6UlMV.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgphktCW08XDc.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

o want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc MAINTAINERS index 8e18bbafa740,7cc2bfa4af6f.. --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -6700,6 -6663,35 +6700,12 @@@ S:M

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_pci.c index 7

[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

icting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_drv.h index f23b030aaf09,e9c403def9c9.. --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@@ -407,11 -408,13 +408,13 @@@ static inline

Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

Hi all, On Tue, 30 May 2023 11:57:52 +1000 Stephen Rothwell wrote: > > @@@ -920,33 -587,8 +640,9 @@@ static const struct intel_device_info j > #define GEN12_FEATURES \ > GEN11_FEATURES, \ > GEN(12), \ > - .display.abox_mask = GENMASK(2, 1), \ > - .__ru

[Intel-gfx] linux-next: build failure after merge of the drm-misc tree

e46 ("usb: typec: altmodes/displayport: Signal hpd low when exiting mode") from the usb.current tree. I have applied the following merge fix patch. From: Stephen Rothwell Date: Thu, 12 Oct 2023 12:17:31 +1100 Subject: [PATCH] fix up for "drm: Add HPD state to drm_connector_oob_hotp

Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree

Hi all, On Thu, 12 Oct 2023 12:22:09 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/usb/typec/altmodes/displayport.c: In function 'dp_altmode_vdm': > drivers/usb

[Intel-gfx] linux-next: manual merge of the drm-misc tree with the asm-generic tree

ng. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpllvmjWIktX.pgp Description: OpenPGP digital signature

Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the asm-generic tree

Hi all, On Fri, 13 Oct 2023 11:46:02 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > arch/ia64/include/asm/fb.h > > between commit: > > cf8e8658100d ("arch: Remove Itanium (IA-64) architecture&qu

Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree

Hi all, On Thu, 12 Oct 2023 12:27:49 +1100 Stephen Rothwell wrote: > > On Thu, 12 Oct 2023 12:22:09 +1100 Stephen Rothwell > wrote: > > > > After merging the drm-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > &

Re: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the asm-generic tree

Hi all, On Wed, 18 Oct 2023 12:46:36 +1100 Stephen Rothwell wrote: > > On Fri, 13 Oct 2023 11:46:02 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the drm-misc tree got a conflict in: > > > > arch/ia64/include/asm/fb.h > >

[Intel-gfx] linux-next: Signed-off-by missing for commit in the drm-misc tree

Hi all, Commit 0da611a87021 ("dma-buf: add dma_fence_timestamp helper") is missing a Signed-off-by from its committer. -- Cheers, Stephen Rothwell pgpVEQIISTHPP.pgp Description: OpenPGP digital signature

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

o want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/accel/ivpu/ivpu_drv.c index 790603017653,51fa60b6254c.. --- a/drivers/accel/ivpu/ivpu_drv.c +++ b/drivers/accel/ivpu/iv

[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/accel/ivpu/ivpu_ipc.c index a4ca40b184d4,618dbc17df80.. --- a/drivers/accel/ivpu/ivpu_ipc.c +++ b/drivers/accel/ivpu/ivpu_i

<    1   2   3   4   5   6   7   8   >