From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
<intel-gfx@lists.freedesktop.org>,
<dri-devel@lists.freedesktop.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thierry Reding <treding@nvidia.com>
Subject: linux-next: manual merge of the drm-misc tree with Linus' tree
Date: Fri, 14 Aug 2015 12:06:15 +1000 [thread overview]
Message-ID: <20150814120615.2c73b7e4@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/drm_irq.c
between commit:
209e4dbc8dcd ("drm/vblank: Use u32 consistently for vblank counters")
from Linus' tree and commit:
b90180b057f7 ("drm/irq: More pipe/crtc consistency cleanups")
from the drm-misc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpu/drm/drm_irq.c
index ee14324522ce,70919d48f015..000000000000
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@@ -74,11 -74,11 +74,11 @@@ module_param_named(vblankoffdelay, drm_
module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600);
module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600);
- static void store_vblank(struct drm_device *dev, int crtc,
+ static void store_vblank(struct drm_device *dev, unsigned int pipe,
- unsigned vblank_count_inc,
+ u32 vblank_count_inc,
struct timeval *t_vblank)
{
- struct drm_vblank_crtc *vblank = &dev->vblank[crtc];
+ struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
u32 tslot;
assert_spin_locked(&dev->vblank_time_lock);
next reply other threads:[~2015-08-14 2:06 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-14 2:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-25 23:29 linux-next: manual merge of the drm-misc tree with Linus' tree Stephen Rothwell
2024-02-06 0:59 Stephen Rothwell
2024-02-06 1:06 ` Stephen Rothwell
2024-02-06 11:28 ` Michael Walle
2024-02-06 11:34 ` Dario Binacchi
2023-11-14 0:42 Stephen Rothwell
2023-11-14 0:36 Stephen Rothwell
2023-11-14 0:31 Stephen Rothwell
2023-11-14 0:25 Stephen Rothwell
2023-09-25 1:41 Stephen Rothwell
2023-09-20 1:12 Stephen Rothwell
2023-09-13 1:09 Stephen Rothwell
2023-09-13 9:04 ` Uwe Kleine-König
2023-07-12 23:58 Stephen Rothwell
2023-05-23 0:43 Stephen Rothwell
2023-05-15 1:14 Stephen Rothwell
2023-03-14 0:19 Stephen Rothwell
2023-01-19 1:13 Stephen Rothwell
2023-01-05 23:50 Stephen Rothwell
2022-11-03 23:15 Stephen Rothwell
2022-10-05 0:43 Stephen Rothwell
2022-06-29 1:06 Stephen Rothwell
2022-06-10 0:44 Stephen Rothwell
2021-11-16 22:29 Stephen Rothwell
2021-10-28 2:48 Stephen Rothwell
2021-01-21 1:24 Stephen Rothwell
2020-10-27 1:26 Stephen Rothwell
2020-10-27 1:20 Stephen Rothwell
2020-10-27 1:16 Stephen Rothwell
2020-08-26 0:01 Stephen Rothwell
2020-09-02 3:11 ` Stephen Rothwell
2020-06-29 1:14 Stephen Rothwell
2020-06-26 1:43 Stephen Rothwell
2020-06-17 0:46 Stephen Rothwell
2020-04-16 1:25 Stephen Rothwell
2020-04-15 1:46 Stephen Rothwell
2019-12-16 0:51 Stephen Rothwell
2019-12-16 0:46 Stephen Rothwell
2019-05-21 0:51 Stephen Rothwell
2019-05-23 0:27 ` Stephen Rothwell
2019-05-23 8:10 ` Maxime Ripard
2019-05-23 9:34 ` Stephen Rothwell
2019-05-23 11:53 ` Maxime Ripard
2019-05-23 13:04 ` Stephen Rothwell
2019-05-23 13:11 ` Daniel Vetter
2019-05-23 14:16 ` Stephen Rothwell
2019-05-23 16:10 ` Rob Herring
2019-05-24 7:12 ` Maxime Ripard
2019-01-11 0:14 Stephen Rothwell
2018-03-20 1:08 Stephen Rothwell
2018-03-23 0:43 ` Stephen Rothwell
2018-03-15 3:14 Stephen Rothwell
2018-03-23 0:45 ` Stephen Rothwell
2017-09-22 2:24 Stephen Rothwell
2017-08-02 2:23 Stephen Rothwell
2017-08-10 2:06 ` Stephen Rothwell
2017-07-19 1:30 Stephen Rothwell
2016-09-23 1:35 Stephen Rothwell
2016-06-07 1:32 Stephen Rothwell
2016-03-31 0:15 Stephen Rothwell
2016-03-29 23:49 Stephen Rothwell
2015-12-16 0:38 Stephen Rothwell
2015-12-14 1:12 Stephen Rothwell
2015-12-14 7:09 ` Thomas Hellstrom
2015-09-12 3:15 Stephen Rothwell
2015-08-03 2:11 Stephen Rothwell
2015-07-30 3:04 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150814120615.2c73b7e4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=treding@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).