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, "Thomas Hellstrom" <thellstrom@vmware.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com>, "Thierry Reding" <treding@nvidia.com>, "Boris Brezillon" <boris.brezillon@free-electrons.com> Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Date: Wed, 16 Dec 2015 11:38:07 +1100 [thread overview] Message-ID: <20151216113807.71dda644@canb.auug.org.au> (raw) Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c between commit: 8fbf9d92a7bc ("drm/vmwgfx: Implement the cursor_set2 callback v2") from 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 Rothwell sfr@canb.auug.org.au diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c index 78693a0a598c,2def684e61a4..000000000000 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c @@@ -294,8 -294,8 +294,8 @@@ static int vmw_ldu_crtc_set_config(stru return vmw_ldu_commit_list(dev_priv); } - static struct drm_crtc_funcs vmw_legacy_crtc_funcs = { + static const struct drm_crtc_funcs vmw_legacy_crtc_funcs = { - .cursor_set = vmw_du_crtc_cursor_set, + .cursor_set2 = vmw_du_crtc_cursor_set2, .cursor_move = vmw_du_crtc_cursor_move, .gamma_set = vmw_du_crtc_gamma_set, .destroy = vmw_ldu_crtc_destroy, diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c index 7ba5a00b3b68,ecac70af032a..000000000000 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c @@@ -530,8 -530,8 +530,8 @@@ out_no_fence return ret; } - static struct drm_crtc_funcs vmw_screen_object_crtc_funcs = { + static const struct drm_crtc_funcs vmw_screen_object_crtc_funcs = { - .cursor_set = vmw_du_crtc_cursor_set, + .cursor_set2 = vmw_du_crtc_cursor_set2, .cursor_move = vmw_du_crtc_cursor_move, .gamma_set = vmw_du_crtc_gamma_set, .destroy = vmw_sou_crtc_destroy, diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c index 58c38e7723d8,87fc00af8d28..000000000000 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c @@@ -1040,8 -1040,8 +1040,8 @@@ out_finish /* * Screen Target CRTC dispatch table */ - static struct drm_crtc_funcs vmw_stdu_crtc_funcs = { + static const struct drm_crtc_funcs vmw_stdu_crtc_funcs = { - .cursor_set = vmw_du_crtc_cursor_set, + .cursor_set2 = vmw_du_crtc_cursor_set2, .cursor_move = vmw_du_crtc_cursor_move, .gamma_set = vmw_du_crtc_gamma_set, .destroy = vmw_stdu_crtc_destroy,
WARNING: multiple messages have this Message-ID (diff)
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, "Thomas Hellstrom" <thellstrom@vmware.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com>, "Thierry Reding" <treding@nvidia.com>, "Boris Brezillon" <boris.brezillon@free-electrons.com> Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Date: Wed, 16 Dec 2015 11:38:07 +1100 [thread overview] Message-ID: <20151216113807.71dda644@canb.auug.org.au> (raw) Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c between commit: 8fbf9d92a7bc ("drm/vmwgfx: Implement the cursor_set2 callback v2") from 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 Rothwell sfr@canb.auug.org.au diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c index 78693a0a598c,2def684e61a4..000000000000 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c @@@ -294,8 -294,8 +294,8 @@@ static int vmw_ldu_crtc_set_config(stru return vmw_ldu_commit_list(dev_priv); } - static struct drm_crtc_funcs vmw_legacy_crtc_funcs = { + static const struct drm_crtc_funcs vmw_legacy_crtc_funcs = { - .cursor_set = vmw_du_crtc_cursor_set, + .cursor_set2 = vmw_du_crtc_cursor_set2, .cursor_move = vmw_du_crtc_cursor_move, .gamma_set = vmw_du_crtc_gamma_set, .destroy = vmw_ldu_crtc_destroy, diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c index 7ba5a00b3b68,ecac70af032a..000000000000 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c @@@ -530,8 -530,8 +530,8 @@@ out_no_fence return ret; } - static struct drm_crtc_funcs vmw_screen_object_crtc_funcs = { + static const struct drm_crtc_funcs vmw_screen_object_crtc_funcs = { - .cursor_set = vmw_du_crtc_cursor_set, + .cursor_set2 = vmw_du_crtc_cursor_set2, .cursor_move = vmw_du_crtc_cursor_move, .gamma_set = vmw_du_crtc_gamma_set, .destroy = vmw_sou_crtc_destroy, diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c index 58c38e7723d8,87fc00af8d28..000000000000 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c @@@ -1040,8 -1040,8 +1040,8 @@@ out_finish /* * Screen Target CRTC dispatch table */ - static struct drm_crtc_funcs vmw_stdu_crtc_funcs = { + static const struct drm_crtc_funcs vmw_stdu_crtc_funcs = { - .cursor_set = vmw_du_crtc_cursor_set, + .cursor_set2 = vmw_du_crtc_cursor_set2, .cursor_move = vmw_du_crtc_cursor_move, .gamma_set = vmw_du_crtc_gamma_set, .destroy = vmw_stdu_crtc_destroy,
next reply other threads:[~2015-12-16 0:38 UTC|newest] Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-16 0:38 Stephen Rothwell [this message] 2015-12-16 0:38 ` linux-next: manual merge of the drm-misc tree with Linus' tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2024-03-25 23:29 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:42 ` Stephen Rothwell 2023-11-14 0:36 Stephen Rothwell 2023-11-14 0:36 ` Stephen Rothwell 2023-11-14 0:31 Stephen Rothwell 2023-11-14 0:31 ` Stephen Rothwell 2023-11-14 0:25 Stephen Rothwell 2023-11-14 0:25 ` Stephen Rothwell 2023-09-25 1:41 Stephen Rothwell 2023-09-25 1:41 ` Stephen Rothwell 2023-09-20 1:12 Stephen Rothwell 2023-09-20 1:12 ` Stephen Rothwell 2023-09-13 1:09 Stephen Rothwell 2023-09-13 1:09 ` Stephen Rothwell 2023-09-13 9:04 ` Uwe Kleine-König 2023-09-13 9:04 ` Uwe Kleine-König 2023-07-12 23:58 Stephen Rothwell 2023-07-12 23:58 ` Stephen Rothwell 2023-05-23 0:43 Stephen Rothwell 2023-05-23 0:43 ` Stephen Rothwell 2023-05-15 1:14 Stephen Rothwell 2023-05-15 1:14 ` Stephen Rothwell 2023-03-14 0:19 Stephen Rothwell 2023-03-14 0:19 ` Stephen Rothwell 2023-01-19 1:13 Stephen Rothwell 2023-01-19 1:13 ` Stephen Rothwell 2023-01-05 23:50 Stephen Rothwell 2023-01-05 23:50 ` Stephen Rothwell 2022-11-03 23:15 Stephen Rothwell 2022-11-03 23:15 ` Stephen Rothwell 2022-10-05 0:43 Stephen Rothwell 2022-10-05 0:43 ` Stephen Rothwell 2022-06-29 1:06 Stephen Rothwell 2022-06-29 1:06 ` Stephen Rothwell 2022-06-10 0:44 Stephen Rothwell 2022-06-10 0:44 ` Stephen Rothwell 2021-11-16 22:29 Stephen Rothwell 2021-11-16 22:29 ` Stephen Rothwell 2021-10-28 2:48 Stephen Rothwell 2021-01-21 1:24 Stephen Rothwell 2021-01-21 1:24 ` Stephen Rothwell 2020-10-27 1:26 Stephen Rothwell 2020-10-27 1:26 ` Stephen Rothwell 2020-10-27 1:20 Stephen Rothwell 2020-10-27 1:20 ` Stephen Rothwell 2020-10-27 1:16 Stephen Rothwell 2020-10-27 1:16 ` Stephen Rothwell 2020-08-26 0:01 Stephen Rothwell 2020-08-26 0:01 ` Stephen Rothwell 2020-09-02 3:11 ` Stephen Rothwell 2020-09-02 3:11 ` Stephen Rothwell 2020-06-29 1:14 Stephen Rothwell 2020-06-29 1:14 ` Stephen Rothwell 2020-06-26 1:43 Stephen Rothwell 2020-06-26 1:43 ` Stephen Rothwell 2020-06-17 0:46 Stephen Rothwell 2020-06-17 0:46 ` Stephen Rothwell 2020-04-16 1:25 Stephen Rothwell 2020-04-16 1:25 ` Stephen Rothwell 2020-04-15 1:46 Stephen Rothwell 2020-04-15 1:46 ` Stephen Rothwell 2019-12-16 0:51 Stephen Rothwell 2019-12-16 0:51 ` Stephen Rothwell 2019-12-16 0:46 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 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 14:16 ` Stephen Rothwell 2019-05-23 16:10 ` Rob Herring 2019-05-23 16:10 ` Rob Herring 2019-05-24 7:12 ` Maxime Ripard 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-23 0:43 ` Stephen Rothwell 2018-03-15 3:14 Stephen Rothwell 2018-03-15 3:14 ` Stephen Rothwell 2018-03-23 0:45 ` 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-02 2:23 ` Stephen Rothwell 2017-08-10 2:06 ` 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-06-07 1:32 ` Stephen Rothwell 2016-03-31 0:15 Stephen Rothwell 2016-03-31 0:15 ` Stephen Rothwell 2016-03-29 23:49 Stephen Rothwell 2016-03-29 23:49 ` Stephen Rothwell 2015-12-14 1:12 Stephen Rothwell 2015-12-14 1:12 ` Stephen Rothwell 2015-12-14 7:09 ` Thomas Hellstrom 2015-12-14 7:09 ` Thomas Hellstrom 2015-09-12 3:15 Stephen Rothwell 2015-09-12 3:15 ` Stephen Rothwell 2015-08-14 2:06 Stephen Rothwell 2015-08-14 2:06 ` Stephen Rothwell 2015-08-03 2:11 Stephen Rothwell 2015-08-03 2:11 ` Stephen Rothwell 2015-07-30 3:04 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=20151216113807.71dda644@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=boris.brezillon@free-electrons.com \ --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=thellstrom@vmware.com \ --cc=treding@nvidia.com \ --cc=ville.syrjala@linux.intel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.