From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: "Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Ramalingam C" <ramalingam.c@intel.com>,
"Uma Shankar" <uma.shankar@intel.com>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>
Subject: linux-next: manual merge of the drm-misc tree with the drm-intel tree
Date: Thu, 23 May 2019 09:58:16 +1000 [thread overview]
Message-ID: <20190523095816.2fd950f6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1569 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
include/drm/drm_mode_config.h
between commit:
585b000de23b ("drm: move content protection property to mode_config")
from the drm-intel tree and commit:
fbb5d0353c62 ("drm: Add HDR source metadata property")
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 include/drm/drm_mode_config.h
index 5764ee3c7453,c031b5a9d8d1..000000000000
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@@ -836,12 -836,13 +836,19 @@@ struct drm_mode_config
*/
struct drm_property *writeback_out_fence_ptr_property;
+ /**
+ * @content_protection_property: DRM ENUM property for content
+ * protection. See drm_connector_attach_content_protection_property().
+ */
+ struct drm_property *content_protection_property;
+
+ /**
+ * hdr_output_metadata_property: Connector property containing hdr
+ * metatda. This will be provided by userspace compositors based
+ * on HDR content
+ */
+ struct drm_property *hdr_output_metadata_property;
+
/* dumb ioctl parameters */
uint32_t preferred_depth, prefer_shadow;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-05-22 23:58 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 23:58 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-22 3:34 linux-next: manual merge of the drm-misc tree with the drm-intel tree Stephen Rothwell
2020-09-22 3:34 ` Stephen Rothwell
2020-04-15 1:52 Stephen Rothwell
2020-04-15 1:52 ` Stephen Rothwell
2019-08-20 2:19 Stephen Rothwell
2019-05-22 23:53 Stephen Rothwell
2019-03-19 0:51 Stephen Rothwell
2019-01-16 1:27 Stephen Rothwell
2019-01-16 1:27 ` Stephen Rothwell
2017-07-20 1:23 Stephen Rothwell
2017-07-21 0:11 ` Stephen Rothwell
2017-07-21 0:11 ` Stephen Rothwell
2017-05-23 2:00 Stephen Rothwell
2017-05-25 1:53 ` Stephen Rothwell
2017-05-25 1:53 ` Stephen Rothwell
2017-03-06 23:48 Stephen Rothwell
2017-03-06 23:48 ` Stephen Rothwell
2017-01-03 2:14 Stephen Rothwell
2017-01-03 2:08 Stephen Rothwell
2017-01-03 1:59 Stephen Rothwell
2017-01-03 1:50 Stephen Rothwell
2016-10-23 23:59 Stephen Rothwell
2016-05-03 3:24 Stephen Rothwell
2016-05-03 3:24 ` Stephen Rothwell
2016-05-03 7:54 ` Daniel Vetter
2016-05-03 7:54 ` Daniel Vetter
2016-04-27 2:32 Stephen Rothwell
2016-04-27 2:32 ` Stephen Rothwell
2015-12-14 1:06 Stephen Rothwell
2015-12-14 1:06 ` Stephen Rothwell
2015-10-15 2:04 Stephen Rothwell
2015-10-15 2:04 ` Stephen Rothwell
2015-09-29 1:26 Stephen Rothwell
2015-09-29 1:26 ` 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=20190523095816.2fd950f6@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=ramalingam.c@intel.com \
--cc=uma.shankar@intel.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: 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.