From: Alex Deucher <alexdeucher@gmail.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Dave Airlie <airlied@linux.ie>,
DRI <dri-devel@lists.freedesktop.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the amdgpu tree with Linus' tree
Date: Thu, 23 Jul 2020 09:34:40 -0400 [thread overview]
Message-ID: <CADnq5_PFfVONDAQLYLpkOzL5yxdA-0zisN7xdEt6pJmP6ZfQaA@mail.gmail.com> (raw)
In-Reply-To: <CAKMK7uGZ4qdtkD6r_RzRUiEXrumkdAwENuKfKmfsuscQZtkWqA@mail.gmail.com>
On Thu, Jul 23, 2020 at 4:01 AM Daniel Vetter <daniel@ffwll.ch> wrote:
>
> On Wed, Jul 22, 2020 at 6:34 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > [I can't find a previous email about this, sorry ...]
> >
> > There is a semantic conflict between Linus' tree and the amdgpu tree
> > between commit
> >
> > d7a6634a4cfb ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir")
> >
> > from Linus' tree and commts
> >
> > fe098a5d6443 ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir")
> > 836dab851903 ("drm/amdgpu/atomfirmware: update vram info handling for renoir")
> >
> > The automted git merge leaves two "case 12" labels. I have been
> > reverting commit d7a6634a4cfb since July 3 ... This will need to be
> > fixed up when the amdgpu tree is next merged into the drm tree, or a back
> > merge of d7a6634a4cfb could be done into the amdgpu tree and the older
> > "case 12" label removed in that merge.
>
> Yeah this is a bit nasty, I just crashed over it too (btw moved to
> drm-next now). Alex is this the right conflict resolution for -next? I
> think we should bake this in with a backmerge ...
Yes, you can drop either d7a6634a4cfb or fe098a5d6443. I just
cherry-picked the commit from -next back to 5.8 and stable since it
was a bug fix.
Alex
> -Daniel
>
> >
> > --
> > Cheers,
> > Stephen Rothwell
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
WARNING: multiple messages have this Message-ID (diff)
From: Alex Deucher <alexdeucher@gmail.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@linux.ie>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>
Subject: Re: linux-next: manual merge of the amdgpu tree with Linus' tree
Date: Thu, 23 Jul 2020 09:34:40 -0400 [thread overview]
Message-ID: <CADnq5_PFfVONDAQLYLpkOzL5yxdA-0zisN7xdEt6pJmP6ZfQaA@mail.gmail.com> (raw)
In-Reply-To: <CAKMK7uGZ4qdtkD6r_RzRUiEXrumkdAwENuKfKmfsuscQZtkWqA@mail.gmail.com>
On Thu, Jul 23, 2020 at 4:01 AM Daniel Vetter <daniel@ffwll.ch> wrote:
>
> On Wed, Jul 22, 2020 at 6:34 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > [I can't find a previous email about this, sorry ...]
> >
> > There is a semantic conflict between Linus' tree and the amdgpu tree
> > between commit
> >
> > d7a6634a4cfb ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir")
> >
> > from Linus' tree and commts
> >
> > fe098a5d6443 ("drm/amdgpu/atomfirmware: fix vram_info fetching for renoir")
> > 836dab851903 ("drm/amdgpu/atomfirmware: update vram info handling for renoir")
> >
> > The automted git merge leaves two "case 12" labels. I have been
> > reverting commit d7a6634a4cfb since July 3 ... This will need to be
> > fixed up when the amdgpu tree is next merged into the drm tree, or a back
> > merge of d7a6634a4cfb could be done into the amdgpu tree and the older
> > "case 12" label removed in that merge.
>
> Yeah this is a bit nasty, I just crashed over it too (btw moved to
> drm-next now). Alex is this the right conflict resolution for -next? I
> think we should bake this in with a backmerge ...
Yes, you can drop either d7a6634a4cfb or fe098a5d6443. I just
cherry-picked the commit from -next back to 5.8 and stable since it
was a bug fix.
Alex
> -Daniel
>
> >
> > --
> > Cheers,
> > Stephen Rothwell
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-07-23 13:34 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-22 4:34 linux-next: manual merge of the amdgpu tree with Linus' tree Stephen Rothwell
2020-07-22 4:34 ` Stephen Rothwell
2020-07-23 8:01 ` Daniel Vetter
2020-07-23 8:01 ` Daniel Vetter
2020-07-23 13:34 ` Alex Deucher [this message]
2020-07-23 13:34 ` Alex Deucher
-- strict thread matches above, loose matches on Subject: below --
2023-11-05 22:48 Stephen Rothwell
2023-11-06 23:49 ` Stephen Rothwell
2023-11-06 23:49 ` Stephen Rothwell
2023-07-24 1:14 Stephen Rothwell
2023-05-12 0:38 Stephen Rothwell
2023-05-12 0:38 ` Stephen Rothwell
2022-07-19 2:00 Stephen Rothwell
2022-01-26 23:32 Stephen Rothwell
2022-01-26 23:29 Stephen Rothwell
2022-01-11 23:09 Stephen Rothwell
2021-09-02 1:22 Stephen Rothwell
2021-09-10 1:16 ` Stephen Rothwell
2021-08-02 15:10 Mark Brown
2021-08-02 15:48 ` Mark Brown
2021-07-06 0:52 Stephen Rothwell
2021-01-15 0:53 Stephen Rothwell
2021-01-08 1:04 Stephen Rothwell
2020-11-03 3:10 Stephen Rothwell
2020-10-27 0:48 Stephen Rothwell
2020-10-27 0:48 ` Stephen Rothwell
2020-10-16 1:48 Stephen Rothwell
2020-08-25 1:35 Stephen Rothwell
2019-12-12 0:03 Stephen Rothwell
2019-12-12 0:11 ` Stephen Rothwell
2019-12-12 0:16 ` Timothy Pearson
2019-12-11 23:37 Stephen Rothwell
2019-12-12 0:10 ` Stephen Rothwell
2019-10-28 1:11 Stephen Rothwell
2019-10-28 1:03 Stephen Rothwell
2019-10-28 0:57 Stephen Rothwell
2019-10-28 1:13 ` Masahiro Yamada
2019-10-03 0:19 Stephen Rothwell
2019-06-17 3:12 Stephen Rothwell
2019-03-18 23:55 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=CADnq5_PFfVONDAQLYLpkOzL5yxdA-0zisN7xdEt6pJmP6ZfQaA@mail.gmail.com \
--to=alexdeucher@gmail.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--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 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.