Hi all,
On Mon, 6 Nov 2023 09:48:55 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the amdgpu tree got a conflict in:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
>
> between commit:
>
> 18bf400530ca ("drm/amdgpu: Use pci_get_base_class() to reduce duplicated
> code")
>
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/display/Kconfig
between commits:
78f0929884d4 ("powerpc/64: Always build with 128-bit long double")
70cc1b5307e8 ("Merge tag 'powerpc-6.4-1' of
Hi all,
On Thu, 2 Sep 2021 11:22:08 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the amdgpu tree got a conflict in:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
>
> between commit:
>
> 477f70cd2a67 ("Merge tag 'drm-next-2021-08-31-1' of
>
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
between commits:
0fe438cec9e1 ("drm/ttm: remove default caching")
9c3006a4cc1b ("drm/ttm: remove available_caching")
from Linus' tree and commit:
d836917da7e5 ("drm/amdgpu:
On Thu, Jul 23, 2020 at 4:01 AM Daniel Vetter wrote:
>
> On Wed, Jul 22, 2020 at 6:34 AM Stephen Rothwell
> 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
> >
>
On Wed, Jul 22, 2020 at 6:34 AM Stephen Rothwell 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")
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:
