Hi all,
On Tue, 30 Jun 2020 11:52:02 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/gvt/handlers.c
>
> between commit:
>
> fc1e3aa0337c ("drm/i915/gvt: Fix incorrect check of
ith the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/video/fbdev/core/fbcon.c
index af9f5ab96f74,86fe41b1deb8..
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@@ -676,8 -676
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/drm_probe_helper.c
index 09e872e61315,601a4f25bb47..
--- a/drivers/g
ng. 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/drm_gem.c
index ee2058ad482c,a57f5379fc08..
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu
Hi all,
On Fri, 3 Jul 2020 14:35:50 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> drivers/gpu/drm/drm_edid.c
>
> between commit:
>
> 948de84233d3 ("drm : Insert blank lines after declarations.")
ivial 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
pgpywQjuMbT7H.pgp
Des
th the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
index e1b66898cb76,697bc2c6fdb2..
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+++ b/drivers/g
have included drm/drm_drv.h since it uses things declared there, and
drivers/gpu/drm/qxl/qxl_display.c should include drm/drm_modeset_lock.h
similarly.
I have added the following hack patch for today.
From: Stephen Rothwell
Date: Wed, 26 Aug 2020 10:40:18 +1000
Subject: [PATCH] fix interaction
Hi all,
On Wed, 26 Aug 2020 10:55:47 +1000 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/qxl/qxl_display.c: In function
> 'qxl_display_read_client_mon
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
Hi all,
On Wed, 26 Aug 2020 10:18:53 +1000 Stephen Rothwell
wrote:
>
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got conflicts in:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> drivers/gp
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
pgpdb4W8fHQ0P.pgp
Descript
transport")
--
Cheers,
Stephen Rothwell
pgpv2K9PsVd4N.pgp
Description: OpenPGP digital signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi Hans,
On Tue, 8 Sep 2020 10:22:06 +0200 Hans de Goede wrote:
>
> On 9/8/20 6:00 AM, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the drm-intel tree got a conflict in:
> >
> >drivers/gpu/drm/i915/display/intel_panel.c
> >
> >
ating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index 623c53ab5bd5,da94c9b12f1b..
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12496,14 -12430,13 +12496,21 @@@ F:
drivers/iio/
our 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/selftests/mock_gem_device.c
index 397c313a8b69,c207d2239791..0
;
> Fixes: 7edd32a9e614 ("drm/i915: use vmap in i915_gem_object_map")
> Signed-off-by: Dan Carpenter
> ---
> Hi Andrew, this should probably go through the -mm tree and get folded
> into the original patch.
Added to linux-next today.
--
Cheers,
Stephen Rothwell
p
ut 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
pgpDq6xXPZ9
ider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/virtio/virtgpu_object.c
index 3af7ec80c7da,c5cad949eb8d..
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++
Hi all,
There is a series of commits
54cff6479fd8 - c1802534e5a6
(not all in that range)
that are missing a Signed-off-by from their committer.
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https
have applied the following merge fix patch for today.
From: Stephen Rothwell
Date: Wed, 6 Dec 2017 11:56:32 +1100
Subject: [PATCH] drm/i915: fix up for "drm/i915: s/enum plane/enum
i9xx_plane_id/"
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/i915/intel_dsi.c | 2 +-
1 file cha
gt;
> https://cgit.freedesktop.org/drm/drm-tip/commit/?h=rerere-cache&id=481aa1c945447716ea793699e520b3ef31ef7c83~
>
> So the ideal is to apply this when merging drm-intel/for-linux-next now.
See my email earlier today which addresses exactly this.
--
Cheers,
Stephen Rothwell
_
earlier ones :-)
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
several times during the day (up
until the point it gets merged), so I have no idea what happened. You
do remember that I am in a very different time zone, right?
Just in case, I am fetching the for-linux-next-fixes and for-linux-next
branches of git://anongit.fre
Hi all,
Commit
365ad5df9caa ("drm/i915/gvt: Export intel_gvt_render_mmio_to_ring_id()")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop
ng. 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/drm_edid.c
index cb487148359a,524eace3d460..
--- a/drivers/gpu/drm/drm_edid.c
+++ b/d
ou 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_cdclk.c
index 60cf4e58389a,9c5ceb98d48f..
--- a/drivers/gpu/drm/i915/intel_cdclk.
om buses")
from the dma-mapping tree.
I have added the following merge fix patch:
From: Stephen Rothwell
Date: Tue, 8 May 2018 11:02:24 +1000
Subject: [PATCH] drm/xen-front: merge fix for "drivers: remove force dma flag
from buses"
Signed-off-by: Stephen Rothwell
---
drivers
for my linux-next merge fix patches to not
be fed into your patchwork/ci as they will never work out side
linux-next ...
--
Cheers,
Stephen Rothwell
pgppUO97yreq8.pgp
Description: OpenPGP digital signature
___
Intel-gfx mailing list
Intel-gfx@lis
Hi all,
On Tue, 8 May 2018 11:07:16 +1000 Stephen Rothwell
wrote:
>
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/xen/xen_drm_front.c: In function 'xen_drv_probe':
> drivers/gpu/drm/
dead.org/users/hch/dma-mapping.git dma-configure
>
> Gitweb:
>
>
> http://git.infradead.org/users/hch/dma-mapping.git/shortlog/refs/heads/dma-configure
>
> Feel free to pull this into the drm tree.
Thanks for that.
--
Cheers,
Stephen Rothwell
pgpwiGSy0YJud.pgp
orce_to_nonpriv registers")
b99f514f5dfa ("drm/i915/gvt: Remove disable_warn_untrack and print untracked
mmio with debug level")
are missing a Signed-off-by from their committer.
--
Cheers,
Stephen Rothwell
pgpcxOcECaM1u.pgp
Description: OpenPGP digital signature
_
ider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/gpu/index.rst
index ba92f45abb76,5ff3d2b236af..
--- a/Documentation/gpu/index.rst
+++ b/Documentation/gpu/index.rst
@@@ -12,4 -1
tree from next-20160822 for today.
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
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.
--
when your tree
is submitted for merging. You may also want to consider only putting
the fix patches into the drm-intel-fixes tree and then getting them
into the drm-intel tree by merging the -fixes tree instead of
cherry-picking them the other way.
--
Cheers,
Stephen Rot
ith the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
I just did a minimal fixup, and more work consolidating these changes
could probably be done.
--
Cheers,
Stephen Rothwell
diff --cc include/drm/drmP.h
index 94eb138753a9,734e4fb11f52..
--- a/include/drm
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/msm/hdmi/hdmi.c
index 23670907a29d,74ffc2412f68..
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/m
Hi all,
Commit
35b876db4a42 ("drm/i915/dsc: Add slice_row_per_frame in DSC PPS programming")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
pgpRSiwHDXzgO.pgp
Description: OpenPGP digital signature
___
ith the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/Makefile
index 7f3be3506057,7c88f12096c5..
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@@ -10,8 -10,8 +10,8 @@@ drm-y
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/meson/meson_crtc.c
index 191b314f9e9e,d78168f979db..
--- a/drivers/gpu/drm/meson/meson_crtc.c
++
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
pgpblI3qKgf
20(unsigned int bus_format)
^
Introduced by commit
def23aa7e982 ("drm: bridge: dw-hdmi: Switch to V4L bus format and encodings")
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://list
'tee_shm_dma_buf_ops.end_cpu_access')
Caused by commit
f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic
macro")
interacting with commit
967c9cca2cc5 ("tee: generic TEE subsystem")
from the arm-soc tree.
I applied the following merge fix
Hi all,
On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in
e, so Dave just needs to let Linus know that a
fix up is needed when this merges with the arm-soc stuff in Linus' tree.
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi all,
On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in
b.ko]
undefined!
Caused by commit
83d83bebf401 ("console/fbcon: Add support for deferred console takeover")
I have reverted that commit for today.
I note that this commit is in the drm-misc tree as well.
--
Cheers,
Stephen Rothwell
pgpd6GpPCQyFu.pgp
Des
r
from integer without a cast [-Wint-conversion]
return index;
^
Introduced by commit
af11942ee44e ("drm/sun4i: tcon-top: Cleanup clock handling")
--
Cheers,
Stephen Rothwell
pgpAmXukq0OE8.pgp
Description: OpenPGP digital signature
t;drm/i915/kvmgt: Check the pfn got from vfio_pin_pages")
from Linus' tree (v4.18-rc1).
I added the following merge fix patch:
From: Stephen Rothwell
Date: Fri, 13 Jul 2018 11:48:41 +1000
Subject: [PATCH] drm/i915/kvmgt: merge fixup for "Check the pfn got from
vfio_pin_pages"
Hi all,
On Fri, 13 Jul 2018 11:54:19 +1000 Stephen Rothwell
wrote:
>
> [Dave cc'd because this will probably turn up in the drm tree soon.]
And now it has ...
> After merging the drm-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
&
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/intel_display.h
index 0a79a46d5805,1f176a71e081..
--- a/drivers/gpu/drm/i915/intel_display.h
+++ b/drivers/gpu
Hi all,
On Thu, 26 Jul 2018 15:10:06 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> drivers/gpu/drm/i915/intel_display.h
>
> between commit:
>
> 6075546f57f8 ("drm/i915/icl: store the port type for TC po
w.
--
Cheers,
Stephen Rothwell
pgpttXuv28UH9.pgp
Description: OpenPGP digital signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi all,
Commit
ccb748df0058 ("drm/vc4: Fix the "no scaling" case on multi-planar YUV
formats")
is missing a Signed-off-by from its committer.
It was rebased.
--
Cheers,
Stephen Rothwell
pgpuW2ZnMKi1K.pgp
Description: OpenP
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_display.h
index e20e6a36a748,809c06ae4c07..
--- a/drivers/gpu/drm/i915/intel_display.h
+++ b/drivers/gpu/drm/i915/i
ng. 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_drv.c
index 5dd7fc582e6f,61199defb470..
--- a/drivers/gpu/drm/i915/i915_drv.c
+
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
diff --cc sound/pci/hda/hda_intel.c
index d5017adf9feb,ec4e6b829ee2..00
onsider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/i915/intel_color.c
index 89ab0f70aa22,768f1c26080e..
--- a/drivers/gpu/drm/i915/intel_color.c
+++ b/drivers/gpu/drm/i9
o 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.h
index abdc6ad6b384,d3a945b7bb60..
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.h
+++ b/driv
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 068126404151,a55b4975c154..
--- a/drivers/gpu/drm/i915/gvt/scheduler.c
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 o
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"
Hi all,
On Thu, 22 Mar 2018 13:21:29 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/gvt/scheduler.c
>
> between commit:
>
> fa3dd623e559 ("drm/i915/gvt: keep oa config in shad
#x27;
BUILD_BUG_ON(sizeof(_i) > sizeof(long)); \
^~~~
drivers/gpu/drm/i915/i915_query.c:118:15: note: in expansion of macro
'array_index_nospec'
func_idx = array_index_nospec(func_idx,
^~
Caused by commit
540ead8c5a0e ("drm/i915/que
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
___
In
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-g
, but argument 6 has type 'u64 {aka long long unsigned int}'
[-Wformat=]
snprintf(sync_file->name, sizeof(sync_file->name), "%s-%s%d-%d",
^
Introduced by commit
76bf0db55439 ("dma-buf/f
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 Documentation/DocBook/device-drivers.tmpl
index 8c68768ebee5,5744ec7d2d30..
--- a/Documentation/DocBook/device-drivers.tm
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.
--
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
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/sti/sti_drv.c
index 8abb57a94651,96bd3d08b2d4..
--- a/drivers/gpu/drm/sti/sti_drv.c
+++ b/drivers/gpu/drm/sti/sti_
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-
5:2: error: unknown field 'restore'
specified in initializer
.restore = tda998x_encoder_restore,
^
Caused by commit
79f13ad5d8e0 ("drm: Move encoder->save/restore into nouveau")
I have used the drm-misc tree from next-20151207 for today.
--
Cheers,
Stephen R
tel-fixes tree and commit:
e87a005d90c3 ("drm/i915: add helpers for platform specific revision id range
checks")
from the drm tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwells...@canb
it()")
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/intel_dp.c
index ae4c21febbb5,9b10526cc6dd..
--- a/drivers/gp
Linus' tree and commit:
f80de66eca65 ("drm/vmwgfx: Drop dummy save/restore hooks")
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 drive
Linus' tree and commit:
d7955fcff889 ("drm/vmwgfx: Constify function pointer structs")
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
di
mmio_base' in something not a structure or union
(gvt->dev_priv->engine[ring_id].mmio_base + (offset))
^
drivers/gpu/drm/i915/gvt/execlist.c:798:23: note: in expansion of macro
'execlist_ring_mmio'
ctx_
scanner")
interacting with commit
f8c417cdb1b8 ("drm/i915: Rename drm_gem_object_unreference in preparation for
lockless free")
from Linus' tree.
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
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 ea01b406d776,1472400ddce3..
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/driver
if (INTEL_GEN(dev) >= 4)
^
Caused by commit
93ca7e006670 ("drm/i915: Use the per-plane rotation property")
interacting with commit
55b8f2a76dff ("drm/i915: Make INTEL_GEN only take dev_priv")
from the drm-intel tree.
I added this merge fix patch:
From 3d8024dd
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 abaca03b9d36,9020c0d8399c..
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gp
in your tree now have
no Signed-off-by from you as the committer :-(
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
e, and as the person who committed those patches to
the tree, you are in the path.
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
s 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.
t;drm: Track drm_mm allocators and show leaks on shutdown")
I hate used the drm-misc tree from next-20161108 for today.
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
nce detect")
I have used the drm-misc tree from next-20160209 for today.
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
declared here
struct device *dev;
^
Introduced by commit
a75d68f62106 ("vgaarb: Use dev_printk() when possible")
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
t's the same aliasing branch concept as for drm-intel, to avoid
> trouble for you around the merge window.
I have added the drm-misc-fixes tree and updated the drm-misc tree.
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gf
Hi all,
There is something seriaously wrong with anongit.freedesktop.org this
morning. Fething trees from there takes an enormous amount of time -
so long that I had to abort the fetches ...
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
if we have github/etc mirrors somewhere? I do have a github
> clone of mesa which is up to date as of ~10min ago.. I could do the
> same for other git trees if someone somewhere is stuck)
I have managed (with a lot of persistence) to fetch all the trees I
need from there today.
--
cial mirrors, then
git.kernel.org makes more sense for the kernel parts anyway.
--
Cheers,
Stephen Rothwell
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
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_dp.c
index 6bb0b2340e7c,b52676a032f9..
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/driver
es tree.
I applied the following merge fixup patch (which is suggested by the "v3:
Change dev_priv->edp_low_vswing to use dev_priv->vbt.edp.low_vswing"
comment in the drm-intel-fixes tree patch, but clearly could not be
done there).
From: Stephen Rothwell
Date: Thu, 28 Apr 2016
ng. 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 ff60241b1f76,5d29b838d8d7..
--- a/drivers/gpu/drm/i915/intel_displa
ith the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/msm/msm_atomic.c
index 5c6130969f4d,2b4142a05024..
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@@ -199,1
ivers/gpu/drm/i915/intel_drv.h:36:41: fatal error:
drm/drm_dp_dual_mode_helper.h: No such file or directory
Caused by commit
8d87410a019f ("drm/i915: Respect DP++ adaptor TMDS clock limit")
I have used the drm-intel tree from next-20160520 for today.
--
Cheers,
S
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
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
___
In
301 - 400 of 778 matches
Mail list logo
