From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Sep 2021 01:20:50 +0000 (+1000)
Subject: Merge remote-tracking branch 'amdgpu/drm-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=50f6ffd3fd63c05818117b6730ded665401d0235;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'amdgpu/drm-next'

# Conflicts:
#	drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
---

50f6ffd3fd63c05818117b6730ded665401d0235