Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1692332 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-07-20 03:30 +0200 |
| Last post | 2017-07-21 02:20 +0200 |
| Articles | 2 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the drm-misc tree with the drm-intel tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-20 03:30 +0200
Re: linux-next: manual merge of the drm-misc tree with the drm-intel tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-21 02:20 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-07-20 03:30 +0200 |
| Subject | linux-next: manual merge of the drm-misc tree with the drm-intel tree |
| Message-ID | <u58rU-8rs-7@gated-at.bofh.it> |
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/i915/i915_drv.c
between commit:
99c539bef538 ("drm/i915: unregister interfaces first in unload")
from the drm-intel tree and commit:
baf54385af78 ("drm/i915: Drop drm_vblank_cleanup")
from the drm-misc tree.
I fixed it up (see below) 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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/i915/i915_drv.c
index f406aec8a499,04d9bd84ee43..000000000000
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -1386,8 -1367,8 +1384,6 @@@ void i915_driver_unload(struct drm_devi
intel_gvt_cleanup(dev_priv);
- drm_vblank_cleanup(dev);
- i915_driver_unregister(dev_priv);
--
intel_modeset_cleanup(dev);
/*
[toc] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-07-21 02:20 +0200 |
| Subject | Re: linux-next: manual merge of the drm-misc tree with the drm-intel tree |
| Message-ID | <u5tPI-63h-5@gated-at.bofh.it> |
| In reply to | #1692332 |
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 <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_drv.c
>
> between commit:
>
> 99c539bef538 ("drm/i915: unregister interfaces first in unload")
>
> from the drm-intel tree and commit:
>
> baf54385af78 ("drm/i915: Drop drm_vblank_cleanup")
>
> from the drm-misc tree.
>
> I fixed it up (see below) 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/i915/i915_drv.c
> index f406aec8a499,04d9bd84ee43..000000000000
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@@ -1386,8 -1367,8 +1384,6 @@@ void i915_driver_unload(struct drm_devi
>
> intel_gvt_cleanup(dev_priv);
>
> - drm_vblank_cleanup(dev);
> - i915_driver_unregister(dev_priv);
> --
> intel_modeset_cleanup(dev);
>
> /*
--
Cheers,
Stephen Rothwell
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web