== Series Details == Series: Make I2C terminology more inclusive for I2C Algobit and consumers (rev2) URL : https://patchwork.freedesktop.org/series/131867/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/131867/revisions/2/mbox/ not applied Applying: drm/amdgpu, drm/radeon: Make I2C terminology more inclusive Using index info to reconstruct a base tree... M drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c M drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c M drivers/gpu/drm/amd/display/dc/bios/bios_parser.c M drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c M drivers/gpu/drm/amd/display/dc/dc.h M drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c M drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c Auto-merging drivers/gpu/drm/amd/display/dc/dc.h Auto-merging drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c Auto-merging drivers/gpu/drm/amd/display/dc/bios/bios_parser.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/amdgpu, drm/radeon: Make I2C terminology more inclusive When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Build failed, no error log produced
