From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
Alex Deucher <alexander.deucher@amd.com>,
Iswara Nagulendran <Iswara.Nagulendran@amd.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Subject: linux-next: manual merge of the amdgpu tree with the drm-misc tree
Date: Mon, 15 May 2023 11:18:51 +1000 [thread overview]
Message-ID: <20230515111851.73e4eda3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 839 bytes --]
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
include/drm/display/drm_dp.h
between commit:
55b24786b748 ("drm/display: Add missing OLED Vesa brightnesses definitions")
from the drm-misc tree and commit:
4d5f872dbc75 ("drm/amd/display: Adding support for VESA SCR")
from the amdgpu tree.
I fixed it up (the changes in the latter included the changes in the
former (apart from whitespace differences)) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Iswara Nagulendran <Iswara.Nagulendran@amd.com>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Alex Deucher <alexander.deucher@amd.com>
Subject: linux-next: manual merge of the amdgpu tree with the drm-misc tree
Date: Mon, 15 May 2023 11:18:51 +1000 [thread overview]
Message-ID: <20230515111851.73e4eda3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 839 bytes --]
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
include/drm/display/drm_dp.h
between commit:
55b24786b748 ("drm/display: Add missing OLED Vesa brightnesses definitions")
from the drm-misc tree and commit:
4d5f872dbc75 ("drm/amd/display: Adding support for VESA SCR")
from the amdgpu tree.
I fixed it up (the changes in the latter included the changes in the
former (apart from whitespace differences)) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Iswara Nagulendran <Iswara.Nagulendran@amd.com>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Alex Deucher <alexander.deucher@amd.com>
Subject: [Intel-gfx] linux-next: manual merge of the amdgpu tree with the drm-misc tree
Date: Mon, 15 May 2023 11:18:51 +1000 [thread overview]
Message-ID: <20230515111851.73e4eda3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 839 bytes --]
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
include/drm/display/drm_dp.h
between commit:
55b24786b748 ("drm/display: Add missing OLED Vesa brightnesses definitions")
from the drm-misc tree and commit:
4d5f872dbc75 ("drm/amd/display: Adding support for VESA SCR")
from the amdgpu tree.
I fixed it up (the changes in the latter included the changes in the
former (apart from whitespace differences)) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-05-15 1:19 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-15 1:18 Stephen Rothwell [this message]
2023-05-15 1:18 ` [Intel-gfx] linux-next: manual merge of the amdgpu tree with the drm-misc tree Stephen Rothwell
2023-05-15 1:18 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-01-16 0:48 Stephen Rothwell
2023-01-16 0:48 ` Stephen Rothwell
2022-11-16 0:09 Stephen Rothwell
2022-11-16 0:09 ` Stephen Rothwell
2022-04-06 0:34 Stephen Rothwell
2022-04-06 0:34 ` Stephen Rothwell
2022-04-13 0:10 ` Stephen Rothwell
2022-04-13 0:10 ` Stephen Rothwell
2022-04-29 1:13 ` Stephen Rothwell
2022-04-29 1:13 ` Stephen Rothwell
2022-04-29 10:38 ` Christian König
2022-04-29 10:38 ` Christian König
2021-12-13 15:08 broonie
2021-06-03 2:48 Stephen Rothwell
2021-06-03 2:48 ` Stephen Rothwell
2021-06-03 2:55 ` Stephen Rothwell
2021-06-03 2:55 ` Stephen Rothwell
2021-06-04 2:33 ` Stephen Rothwell
2021-06-04 2:33 ` Stephen Rothwell
2021-05-21 1:42 Stephen Rothwell
2021-05-21 1:42 ` Stephen Rothwell
2021-05-21 1:38 Stephen Rothwell
2021-05-21 1:38 ` Stephen Rothwell
2021-05-21 1:20 Stephen Rothwell
2021-05-21 1:20 ` Stephen Rothwell
2021-05-21 1:16 Stephen Rothwell
2021-05-21 1:16 ` Stephen Rothwell
2021-05-12 0:20 Stephen Rothwell
2021-05-12 0:20 ` 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=20230515111851.73e4eda3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Iswara.Nagulendran@amd.com \
--cc=Rodrigo.Siqueira@amd.com \
--cc=alexander.deucher@amd.com \
--cc=alexdeucher@gmail.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 \
/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.