From: Thomas Hellstrom <thellstrom@vmware.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
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>
Subject: Re: linux-next: manual merge of the drm-misc tree with Linus' tree
Date: Mon, 14 Dec 2015 08:09:23 +0100 [thread overview]
Message-ID: <566E6B23.8090306@vmware.com> (raw)
In-Reply-To: <20151214121205.7323fbd7@canb.auug.org.au>
On 12/14/2015 02:12 AM, Stephen Rothwell wrote:
> 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:
>
> f80de66eca65 ("drm/vmwgfx: Drop dummy save/restore hooks")
>
> from the drm-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
FWIW, the fix looks correct to me.
/Thomas
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Hellstrom <thellstrom@vmware.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
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
Subject: Re: linux-next: manual merge of the drm-misc tree with Linus' tree
Date: Mon, 14 Dec 2015 08:09:23 +0100 [thread overview]
Message-ID: <566E6B23.8090306@vmware.com> (raw)
In-Reply-To: <20151214121205.7323fbd7@canb.auug.org.au>
On 12/14/2015 02:12 AM, Stephen Rothwell wrote:
> 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:
>
> f80de66eca65 ("drm/vmwgfx: Drop dummy save/restore hooks")
>
> from the drm-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
FWIW, the fix looks correct to me.
/Thomas
next prev parent reply other threads:[~2015-12-14 7:09 UTC|newest]
Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-14 1:12 linux-next: manual merge of the drm-misc tree with Linus' tree Stephen Rothwell
2015-12-14 1:12 ` Stephen Rothwell
2015-12-14 7:09 ` Thomas Hellstrom [this message]
2015-12-14 7:09 ` Thomas Hellstrom
-- 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-16 0:38 Stephen Rothwell
2015-12-16 0:38 ` Stephen Rothwell
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=566E6B23.8090306@vmware.com \
--to=thellstrom@vmware.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=sfr@canb.auug.org.au \
/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 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.