On Wed, Sep 1, 2021 at 2:33 PM Linus Torvalds
wrote:
>
> On Wed, Sep 1, 2021 at 10:57 AM Linus Torvalds
> wrote:
> >
> > No worries. I enjoyed seeing the AMD code-names in the conflicts, they
> > are using positively kernel-level naming.
>
> Oh, I spoke too soon.
>
> The conflict in amdgpu_ras_ee
The pull request you sent on Tue, 31 Aug 2021 15:53:10 +1000:
> git://anongit.freedesktop.org/drm/drm tags/drm-next-2021-08-31-1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/477f70cd2a67904e04c2c2b9bd0fa2e95222f2f6
Thank you!
--
Deet-doot-dot, I am a bot.
https://
On Wed, Sep 1, 2021 at 10:57 AM Linus Torvalds
wrote:
>
> No worries. I enjoyed seeing the AMD code-names in the conflicts, they
> are using positively kernel-level naming.
Oh, I spoke too soon.
The conflict in amdgpu_ras_eeprom.c is trivial to fix up, but the
*code* is garbage.
It does this (f
On Mon, Aug 30, 2021 at 10:53 PM Dave Airlie wrote:
>
> There are a bunch of conflicts with your tree, but none of them seem
> too serious, but I might have missed something.
No worries. I enjoyed seeing the AMD code-names in the conflicts, they
are using positively kernel-level naming.
That sai
