From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dave Airlie <airlied@linux•ie>, 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>,
David Francis <David.Francis@amd•com>,
Alex Deucher <alexander.deucher@amd•com>,
Nicholas Kazlauskas <nicholas.kazlauskas@amd•com>
Subject: linux-next: manual merge of the drm tree with the drm-fixes tree
Date: Fri, 7 Dec 2018 13:31:41 +1100 [thread overview]
Message-ID: <20181207133141.523b8417@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1450 bytes --]
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
between commit:
49f1c44b581b ("rm/amd/display: Fix unintialized max_bpc state values")
from the drm-fixes tree and commits:
c1ee92f94ce3 ("drm/amd: Add abm level drm property")
bb47de736661 ("drm/amdgpu: Set FreeSync state using drm VRR properties")
from the drm 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 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 5a6edf65c9ea,32e791d9b9a8..000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -3063,8 -3234,7 +3235,8 @@@ amdgpu_dm_connector_atomic_duplicate_st
__drm_atomic_helper_connector_duplicate_state(connector, &new_state->base);
new_state->freesync_capable = state->freesync_capable;
- new_state->freesync_enable = state->freesync_enable;
+ new_state->max_bpc = state->max_bpc;
+ new_state->abm_level = state->abm_level;
return &new_state->base;
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-12-07 2:31 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-07 2:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-12-07 2:38 linux-next: manual merge of the drm tree with the drm-fixes tree Stephen Rothwell
2018-12-14 1:51 Stephen Rothwell
2019-03-01 2:23 Stephen Rothwell
2019-03-01 23:29 ` Alex Deucher
2019-03-04 0:54 ` Stephen Rothwell
2019-03-11 12:36 ` Daniel Vetter
2019-07-05 2:50 Stephen Rothwell
2019-08-23 3:20 Stephen Rothwell
2020-07-10 2:28 Stephen Rothwell
2021-08-06 12:04 Mark Brown
2021-08-10 11:56 ` Geert Uytterhoeven
2021-08-10 12:53 ` Stephen Rothwell
2022-02-24 16:33 broonie
2022-02-25 16:37 broonie
2022-09-26 17:49 broonie
2023-02-13 0:23 Stephen Rothwell
2023-08-18 1:53 Stephen Rothwell
2024-06-21 13:21 Mark Brown
2024-06-27 15:00 Mark Brown
2024-06-27 15:08 Mark Brown
2024-10-18 1:56 Stephen Rothwell
2025-06-27 2:58 Stephen Rothwell
2026-01-23 17:45 Mark Brown
2026-01-30 15:28 Mark Brown
2026-01-30 15:37 Mark Brown
2026-03-06 13:47 Mark Brown
2026-03-06 13:47 Mark Brown
2026-03-09 14:35 Mark Brown
2026-03-27 20:46 Mark Brown
2026-03-27 20:52 Mark Brown
2026-04-03 13:33 Mark Brown
2026-05-29 22:00 Mark Brown
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=20181207133141.523b8417@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=David.Francis@amd$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=alexander.deucher@amd$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nicholas.kazlauskas@amd$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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