Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1693304
| Path | csiph.com!news.redatomik.org!weretis.net!feeder4.news.weretis.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the drm-misc tree with the drm-intel tree |
| Date | Fri, 21 Jul 2017 02:20:02 +0200 |
| Message-ID | <u5tPI-63h-5@gated-at.bofh.it> (permalink) |
| References | <u58rU-8rs-7@gated-at.bofh.it> |
| X-Original-To | Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>, Dave Airlie <airlied@linux.ie> |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1500595908; bh=/2I7JPwCXvRJBrpCt51iGKpExOCKjJW3MBP+KFCflTc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=okW5nIStFMSFEo70vJAQbdOyd4IpVBQBEyjqAGrCoJlWTZll91x/9i8/TwZqsxVfQ h1225lejGuVkKN7Zyao2uImSX0tXcJIC4/qxV6wZ5vIwqvmvf9sbKDopVnVGcGpn9B OjuK5N21eucwJxVcV4gmzeEUY5u+sWJXqhxj6uiCNmu4bgHBrtO3FwZq4OiC1I9uXC FS3XSAlBTu1oaAqWkxJEeNMJ/8EpMTivpAVelgExYdk4sbg0wKwZcfRh6zMyqUAdS5 La/EDOgqRitY10pF2d6j58JNw/z/31kOUSgZWvHctWxrMuigYq9bv3y2NEklQ988s3 /7YrQ6tDZusFQ== |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=US-ASCII |
| Content-Transfer-Encoding | 7bit |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 49 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> |
| X-Original-Date | Fri, 21 Jul 2017 10:11:48 +1000 |
| X-Original-Message-ID | <20170721101148.4b20f55e@canb.auug.org.au> |
| X-Original-References | <20170720112333.010b9ac8@canb.auug.org.au> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1693304 |
Show key headers only | View raw
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
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
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
csiph-web