, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
s...@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your
). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
s...@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors
Hi all,
After merging the drm-intel tree, today's linux-next build (x86_64
allmodconfig) failed like this:
ERROR: pm_vt_switch_unregister [drivers/video/fb.ko] undefined!
I have dropped the tree for today.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpbVHZH4ZWzz.pgp
, resulting in lots more regressions slipping through.
-next-queued is also what I run here on all my machines and what patch
development is usually based on for drm/i915.
Does that put your concerns at ease?
Some what, thanks.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
Hi Daniel,
On Fri, 15 Feb 2013 08:16:26 -0800 Jesse Barnes jbar...@virtuousgeek.org
wrote:
On Fri, 15 Feb 2013 10:30:16 +0100
Daniel Vetter daniel.vet...@ffwll.ch wrote:
On Fri, Feb 15, 2013 at 3:37 AM, Stephen Rothwell s...@canb.auug.org.au
wrote:
After merging the drm-intel
definitions) 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_hdmi.c
index fa8ec4a,4d222ec..000
--- a/drivers/gpu/drm/i915
+0xb1bac): undefined reference to `__udivdi3'
Caused by commit 2389cc500686 (drm/i915: use simple attribute in debugfs
routines) from the drm-intel tree.
I have reverted that commit for today.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgp6vYBH152dU.pgp
Description: PGP
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 d7d4afe,92a7c62..000
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -850,10 -792,10 +802,10
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_panel.c
index bee8cb6,0e7e873..000
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
Daniel, I assume all this stuff being added to the drm-intel tree is
going upstream very soon?
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/gpu/drm/i915
Hi Daniel,
On Tue, 7 May 2013 10:43:17 +0200 Daniel Vetter daniel.vet...@ffwll.ch wrote:
On Tue, May 7, 2013 at 3:27 AM, Stephen Rothwell s...@canb.auug.org.au
wrote:
Daniel, I assume all this stuff being added to the drm-intel tree is
going upstream very soon?
Oops, no that is stuff
,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/gpu/drm/i915/intel_dp.c
index 3d704b7,2bb4009..000
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -755,6 -782,10 +783,8 @@@ found
target_clock
: Be more informative when
reporting too large for aperture error) from the drm-intel tree.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
pgpMu91XL2oYQ.pgp
Description: PGP signature
___
dri-devel
for pixel_multiplier) 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
index 6eb99e1,218bc93..000
--- a/drivers/gpu/drm/i915
) 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_sdvo.c
index 7d31165,b8e1623..000
--- a/drivers/gpu/drm/i915/intel_sdvo.c
-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_fb.c
index 3b03c3c,244060a..000
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu
and commits 6c49f24180c3 (drm/i915: hw state readout support
for pixel_multiplier) and 9222be993921 (drm/i915: don't scream into
dmesg when a modeset fails) from the drm-intel tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell
it necessary.
--
Cheers,
Stephen Rothwell
s...@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from
-rps.lock) 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/i915_dma.c
index 095e3db,fd52de7..000
--- a/drivers/gpu/drm/i915
lists to new mm) 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/i915_gem.c
index 97afd26,9a523df..000
--- a/drivers/gpu/drm/i915
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_gem.c
index 50e26d3,a56feaa..000
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
in the same file) from the drm-intel tree.
I fixed it up (using the drm-intel tree version) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpr77eX5SDUA.pgp
Description: PGP signature
in the same file) from the drm-intel tree.
I fixed it up (using the drm-intel tree version) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgp2xQr0wqzRM.pgp
Description: PGP signature
Hi all,
Trying to fetch the drm-intel-fixes tree
(git://people.freedesktop.org/~danvet/drm-intel#drm-intel-fixes) this
morning produced this error:
fatal: remote error: access denied or repository not exported: ~danvet/drm-intel
--
Cheers,
Stephen Rothwells
On Mon, 29 Jul 2013 10:08:43 +1000 Stephen Rothwell s...@canb.auug.org.au
wrote:
Hi all,
Trying to fetch the drm-intel-fixes tree
(git://people.freedesktop.org/~danvet/drm-intel#drm-intel-fixes) this
morning produced this error:
fatal: remote error: access denied or repository
git,
I'll ask admin to look into it.
Thanks. In the mean time, I will use what I fetched on Friday.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpNgs6GFoq9j.pgp
Description: PGP signature
___
dri-devel mailing list
dri
Hi Dave,
On Mon, 29 Jul 2013 16:29:04 +1000 Dave Airlie airl...@gmail.com wrote:
Okay should all be back in place now.
Excellent, thanks.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgp3VeuvCymK5.pgp
Description: PGP signature
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_gem.c
index d31e15d,49db617..000
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915
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/drm_crtc.c
index 54b4169,190827d..000
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@@ -186,22 -193,23
?
(fetches more trees ...)
And now, I discover that they are the latter :-)
So your -fixes tree will be dropped, but all those patches will still be
merged via you drm-intel tree.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpH5iclLSo4i.pgp
Description: PGP signature
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_gem.c
index df9253d,d00d24f..000
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm
for has_dp_encoder and dp_m_n) 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_drv.h
index 28cae80,b85354f..000
--- a/drivers
-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
index d8a1d98,2ed974e..000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b
into pipe_config) 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
index e5822e7,d12d563..000
--- a/drivers/gpu/drm/i915
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
@@@ -16
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/gpu/drm
with 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/drmP
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 Rothwell
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
g.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
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
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.
--
Cheers,
Stephen Rothwell
tructure only for the
enabled engines")
interacting with some other commits that were merged without fixes being
applied (probably) in commit
06a75ace46e2 ("Merge tag 'gvt-next-2016-10-14' of
https://github.com/01org/gvt-linux into drm-intel-next-queued")
I have used the version of the drm-intel tree from next-20161017 for
today.
--
Cheers,
Stephen Rothwell
8c417cdb1b8 ("drm/i915: Rename drm_gem_object_unreference in preparation for
lockless free")
from Linus' tree.
--
Cheers,
Stephen Rothwell
lso 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/drivers/gpu
Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from drivers/gpu/drm/i915/intel_drv.h:32:0,
from drivers/gpu/drm/i915/intel_display.c:36:
drivers/gpu/drm/i915/intel_display.c: In function
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/i915/intel_display.c | 9 +
drivers/gpu/drm/i915/intel_sprite.c | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index c2a8df968b03
complex conflicts.
--
Cheers,
Stephen Rothwell
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/kvmgt.c
index f8021a01df63,934963970288..
--- a/drivers/gpu/drm/i915/gvt/k
le-release of vgpu")
from the drm-intel-fixes tree.
I applied this merge fix patch:
From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Tue, 3 Jan 2017 10:38:48 +1100
Subject: [PATCH] vfio-mdev: fixup for "Make mdev_device private and abstract
interfaces"
Signed-off-by: Step
erging. 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_gem_evi
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_vma.c
index e008e4e8b481,325b917c5ad7..
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@@ -32
intainer 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,568d194435fd..000
erging. 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_pm.c
le 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
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
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
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
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 -144
lso 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/drivers/gpu
erge 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 <s...@canb.auug.org.au>
Date: Thu, 28 Apr 2016 11:
consider 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 -12,10
in your tree now have
no Signed-off-by from you as the committer :-(
--
Cheers,
Stephen Rothwell
d as the person who committed those patches to
the tree, you are in the path.
--
Cheers,
Stephen Rothwell
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.
--
: Track drm_mm allocators and show leaks on shutdown")
I hate used the drm-misc tree from next-20161108 for today.
--
Cheers,
Stephen Rothwell
;
^
Introduced by commit
a75d68f62106 ("vgaarb: Use dev_printk() when possible")
--
Cheers,
Stephen Rothwell
;
> It'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
long long unsigned int}'
[-Wformat=]
snprintf(sync_file->name, sizeof(sync_file->name), "%s-%s%d-%d",
^
Introduced by commit
76bf0db55439 ("dma-buf/fence: make fence context 64 bit v2")
--
Cheers,
Stephen Rothwell
lso 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.tmpl
+++ b/D
on 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
just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr at canb.auug.org.au
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
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_drv.c
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
> private data")
> Link: https://lkml.org/lkml/2016/6/29/441
Added to the sound-asoc merge from today.
--
Cheers,
Stephen Rothwell
d up as they appear in
your tree (if any). Or be avoided by people developing against your
tree.
--
Cheers,
Stephen Rothwell
Hi Dave,
On Tue, 5 Jul 2016 09:59:16 +1000 Dave Airlie wrote:
>
> I think I've done it correctly, I've just pushed out drm-next with the
> pull and the
> two changes amended into the merge.
Looks great, thanks.
--
Cheers,
Stephen Rothwell
Hi all,
After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
In file included from include/uapi/linux/stddef.h:1:0,
from include/linux/stddef.h:4,
from include/uapi/linux/posix_types.h:4,
from
ainer 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/rockchip/rockchip_drm_drv.c
index 7fd20c0e1fc8,f0bd1e
tel-fixes tree.
I applied this merge fix patch:
From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Fri, 15 Jul 2016 13:34:05 +1000
Subject: [PATCH] drm/i915/opregion: fix up for argument change
Signed-off-by: Stephen Rothwell
---
drivers/gpu/drm/i915/intel_opregion.c | 2 +-
1 file changed, 1 i
from next-20160822 for today.
--
Cheers,
Stephen Rothwell
ncerned,
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 Rothwell
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 Rothwell
hen
git.kernel.org makes more sense for the kernel parts anyway.
--
Cheers,
Stephen Rothwell
lso 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/amdgpu_drv.c
+
. 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_display.c
+
with 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,11 -19
e_priv, handle);
> + obj = drm_gem_object_lookup(file_priv, handle);
> if (!obj) {
> DRM_ERROR("failed to lookup gem object.\n");
> return -EINVAL;
--
Cheers,
Stephen Rothwell
/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,
Stephen Rothwell
ag new warnings.
--
Cheers,
Stephen Rothwell
ned 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
ainer
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
used the drm-misc tree from next-20160209 for today.
--
Cheers,
Stephen Rothwell
n will be called with
> private data")
> ---
> The new driver is currently part of Dave Airlie's drm-next tree,
> while the API change is in Mark Brown's asoc-next tree, so my
> fix has to be done on top of both.
Thanks for sorting this out.
> I can see two ways out of this:
. 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/drm_crtc.h
ot;).
I have used the drm-intel tree from next-20140318 for today.
--
Cheers,
Stephen Rothwell
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL:
<http://lists.freede
use
reservation objects") from the dma-buf tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwellsfr at canb.auug.org.au
diff --cc drivers/gpu/drm/i915/i915_gem_dmabuf.c
index 580aa42443ed,817ec444c976..00
g of user
pages into video memory (userptr) ioctl") from the drm-intel tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwellsfr at canb.auug.org.au
diff --cc drivers/gpu/drm/i915/i915_drv.h
index d6dc54aa123a,d2da39
pu/drm/armada/armada_gem.c
> > > index 887816f..7adb0c3 100644
> > > --- a/drivers/gpu/drm/armada/armada_gem.c
> > > +++ b/drivers/gpu/drm/armada/armada_gem.c
> > > @@ -541,7 +541,7 @@ armada_gem_prime_export(struct drm_device *dev,
> > > struct drm_gem_o
1 - 100 of 1133 matches
Mail list logo
