From: Geert Uytterhoeven <geert@linux-m68k.org>
To: "Dave Airlie" <airlied@redhat.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Stanley.Yang" <Stanley.Yang@amd.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>
Subject: Re: linux-next: manual merge of the drm tree with Linus' tree
Date: Tue, 29 Nov 2022 10:07:26 +0100 [thread overview]
Message-ID: <CAMuHMdXkDOn+J-Tjd_nDpkAKYXBhHVtNWSrLrkiGjpvYYXJkEg@mail.gmail.com> (raw)
In-Reply-To: <20221128105844.315bb58a@canb.auug.org.au>
Hi DRm people,
On Mon, Nov 28, 2022 at 1:02 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
>
> between commits:
>
> 3cb93f390453 ("drm/amdgpu: fix use-after-free during gpu recovery")
> b09d6acba1d9 ("drm/amdgpu: handle gang submit before VMID")
>
> from Linus' tree and commits:
>
> 1b2d5eda5ad7 ("drm/amdgpu: move explicit sync check into the CS")
> 1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS")
> c5093cddf56b ("drm/amdgpu: drop the fence argument from amdgpu_vmid_grab")
> 940ca22b7ea9 ("drm/amdgpu: drop amdgpu_sync from amdgpu_vmid_grab v2")
> 1b2d5eda5ad7 ("drm/amdgpu: move explicit sync check into the CS")
> 1728baa7e4e6 ("drm/amdgpu: use scheduler dependencies for CS")
>
> 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.
Have you considered merging drm-fixes into drm-next, so not everyone
who consumes your trees needs to resolve the same merge conflicts?
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next prev parent reply other threads:[~2022-11-29 9:07 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-27 23:58 linux-next: manual merge of the drm tree with Linus' tree Stephen Rothwell
2022-11-29 9:07 ` Geert Uytterhoeven [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-04 1:08 Stephen Rothwell
2024-03-04 0:47 Stephen Rothwell
2024-01-08 0:14 Stephen Rothwell
2023-06-19 1:17 Stephen Rothwell
2022-11-30 22:57 Stephen Rothwell
2022-11-17 2:13 Stephen Rothwell
2022-09-19 0:58 Stephen Rothwell
2022-09-19 7:58 ` Geert Uytterhoeven
2022-09-19 14:23 ` Nathan Chancellor
2022-02-28 3:17 Stephen Rothwell
2021-10-29 0:48 Stephen Rothwell
2021-10-29 6:52 ` Joonas Lahtinen
2021-10-11 0:37 Stephen Rothwell
2021-08-23 2:41 Stephen Rothwell
2021-08-24 0:12 ` Stephen Rothwell
2021-08-12 1:20 Stephen Rothwell
2021-07-01 0:52 Stephen Rothwell
2021-03-29 2:14 Stephen Rothwell
2021-03-30 7:36 ` Geert Uytterhoeven
2021-03-30 23:41 ` Stephen Rothwell
2021-02-01 1:30 Stephen Rothwell
2021-02-14 22:07 ` Stephen Rothwell
2021-01-18 0:56 Stephen Rothwell
2020-10-02 3:42 Stephen Rothwell
2020-05-25 3:51 Stephen Rothwell
2020-03-23 0:50 Stephen Rothwell
2019-11-13 1:38 Stephen Rothwell
2019-11-13 1:38 ` Stephen Rothwell
2019-11-13 1:13 Stephen Rothwell
2019-11-13 1:13 ` Stephen Rothwell
2019-11-13 0:58 Stephen Rothwell
2019-11-13 0:58 ` Stephen Rothwell
2019-11-13 0:50 Stephen Rothwell
2019-11-13 0:50 ` Stephen Rothwell
2019-11-13 0:46 Stephen Rothwell
2019-11-13 0:46 ` Stephen Rothwell
2019-11-13 0:40 Stephen Rothwell
2019-11-13 0:40 ` Stephen Rothwell
2019-08-26 3:12 Stephen Rothwell
2019-06-11 2:19 Stephen Rothwell
2018-06-04 3:09 Stephen Rothwell
2018-03-26 3:38 Stephen Rothwell
2018-03-22 6:37 Stephen Rothwell
2018-03-26 3:45 ` Stephen Rothwell
2018-03-13 1:15 Stephen Rothwell
2018-02-18 23:10 Stephen Rothwell
2018-02-20 20:15 ` Rodrigo Vivi
2018-02-18 23:02 Stephen Rothwell
2018-01-15 1:08 Stephen Rothwell
2017-11-23 23:37 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=CAMuHMdXkDOn+J-Tjd_nDpkAKYXBhHVtNWSrLrkiGjpvYYXJkEg@mail.gmail.com \
--to=geert@linux-m68k.org \
--cc=Stanley.Yang@amd.com \
--cc=airlied@redhat.com \
--cc=alexander.deucher@amd.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@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).