From: "Christian König" <christian.koenig@amd.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree
Date: Thu, 14 Apr 2022 08:33:04 +0200 [thread overview]
Message-ID: <5520db7e-ea29-b610-17e3-de596911d26c@amd.com> (raw)
In-Reply-To: <20220414094715.4c2e0127@canb.auug.org.au>
Am 14.04.22 um 01:47 schrieb Stephen Rothwell:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/radeon/radeon_sync.c
>
> between commit:
>
> 022074918042 ("drm/radeon: fix logic inversion in radeon_sync_resv")
>
> from the drm-misc-fixes tree and commit:
>
> 7bc80a5462c3 ("dma-buf: add enum dma_resv_usage v4")
>
> from the drm-misc tree.
>
> I fixed it up (I just used the latter version) and can carry the fix as
> necessary.
I still need to double check the result in linux-next, but that doesn't
sounds right.
The missing "!" needs to be carried into the new function call.
drm-tip should have the right solution to this merge conflict.
Thanks,
Christian.
> 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.
>
next prev parent reply other threads:[~2022-04-14 6:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-13 23:47 linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree Stephen Rothwell
2022-04-14 6:33 ` Christian König [this message]
2022-04-26 1:48 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-01-27 2:28 Stephen Rothwell
2022-11-15 23:47 Stephen Rothwell
2022-11-16 0:25 ` Stephen Rothwell
2022-11-16 12:13 ` Christian König
2020-10-29 1:18 Stephen Rothwell
2020-04-21 1:52 Stephen Rothwell
2020-04-21 6:10 ` Tomi Valkeinen
2020-04-23 3:17 ` Stephen Rothwell
2020-05-15 11:32 ` Tomi Valkeinen
2017-07-18 1:39 Stephen Rothwell
2017-07-21 0:03 ` 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=5520db7e-ea29-b610-17e3-de596911d26c@amd.com \
--to=christian.koenig@amd.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).