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,
Dave Airlie <airlied@linux.ie>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the drm-misc tree with the drm tree
Date: Wed, 10 Dec 2014 12:49:25 +1100 [thread overview]
Message-ID: <20141210124925.2cba833c@canb.auug.org.au> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1093 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in
Documentation/DocBook/drm.tmpl between commit 6f134d7bb434 ("drm/tile:
expose the tile property to userspace (v3)") from the drm tree and
commit e2beb6cd5d0f ("drm/Documentation: Fix rowspan value in
drm-kms-properties") 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 Documentation/DocBook/drm.tmpl
index 60c1063d4178,b344bc3b0d77..000000000000
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@@ -2550,8 -2546,8 +2550,8 @@@ void intel_crt_init(struct drm_device *
<td valign="top" >Description/Restrictions</td>
</tr>
<tr>
- <td rowspan="23" valign="top" >DRM</td>
+ <td rowspan="24" valign="top" >DRM</td>
- <td rowspan="3" valign="top" >Generic</td>
+ <td rowspan="4" valign="top" >Generic</td>
<td valign="top" >“EDID”</td>
<td valign="top" >BLOB | IMMUTABLE</td>
<td valign="top" >0</td>
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
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>, Dave Airlie <airlied@linux.ie>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sean Paul <seanpaul@chromium.org>
Subject: linux-next: manual merge of the drm-misc tree with the drm tree
Date: Wed, 10 Dec 2014 12:49:25 +1100 [thread overview]
Message-ID: <20141210124925.2cba833c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in
Documentation/DocBook/drm.tmpl between commit 6f134d7bb434 ("drm/tile:
expose the tile property to userspace (v3)") from the drm tree and
commit e2beb6cd5d0f ("drm/Documentation: Fix rowspan value in
drm-kms-properties") 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 Documentation/DocBook/drm.tmpl
index 60c1063d4178,b344bc3b0d77..000000000000
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@@ -2550,8 -2546,8 +2550,8 @@@ void intel_crt_init(struct drm_device *
<td valign="top" >Description/Restrictions</td>
</tr>
<tr>
- <td rowspan="23" valign="top" >DRM</td>
+ <td rowspan="24" valign="top" >DRM</td>
- <td rowspan="3" valign="top" >Generic</td>
+ <td rowspan="4" valign="top" >Generic</td>
<td valign="top" >“EDID”</td>
<td valign="top" >BLOB | IMMUTABLE</td>
<td valign="top" >0</td>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-12-10 1:49 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-10 1:49 Stephen Rothwell [this message]
2014-12-10 1:49 ` linux-next: manual merge of the drm-misc tree with the drm tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2026-04-03 13:34 Mark Brown
2026-03-30 16:02 Mark Brown
2026-03-30 16:02 Mark Brown
2025-07-01 3:07 Stephen Rothwell
2025-07-01 3:21 ` Stephen Rothwell
2022-11-09 23:54 Stephen Rothwell
2022-11-09 23:54 ` Stephen Rothwell
2019-10-09 0:12 Stephen Rothwell
2019-10-09 0:10 Stephen Rothwell
2019-10-09 0:10 ` Stephen Rothwell
2019-10-08 23:46 Stephen Rothwell
2019-10-08 23:46 ` Stephen Rothwell
2019-10-08 23:38 Stephen Rothwell
2019-10-08 23:38 ` Stephen Rothwell
2019-10-08 23:33 Stephen Rothwell
2019-08-19 3:18 Stephen Rothwell
2019-06-11 3:52 Stephen Rothwell
2019-06-11 3:52 ` Stephen Rothwell
2019-06-11 3:38 Stephen Rothwell
2019-06-11 3:38 ` Stephen Rothwell
2019-04-09 1:34 Stephen Rothwell
2019-04-09 1:34 ` Stephen Rothwell
2019-04-09 7:23 ` Gerd Hoffmann
2019-02-08 1:27 Stephen Rothwell
2019-02-08 8:53 ` Daniel Vetter
2019-02-08 8:53 ` Daniel Vetter
2019-02-08 9:25 ` Stephen Rothwell
2019-02-08 9:34 ` Daniel Vetter
2018-11-23 0:13 Stephen Rothwell
2018-11-23 0:13 ` Stephen Rothwell
2018-09-18 1:31 Stephen Rothwell
2018-09-12 0:39 Stephen Rothwell
2018-03-19 1:29 Stephen Rothwell
2018-03-19 1:29 ` Stephen Rothwell
2018-03-19 14:14 ` Ville Syrjälä
2017-11-01 3:36 Stephen Rothwell
2017-04-03 3:18 Stephen Rothwell
2017-04-03 3:18 ` Stephen Rothwell
2016-09-28 2:11 Stephen Rothwell
2014-12-03 2:43 Stephen Rothwell
2014-12-03 2:43 ` 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=20141210124925.2cba833c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--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 \
/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.