== Series Details == Series: drm/ttm: make ttm bo a gem bo subclass (rev3) URL : https://patchwork.freedesktop.org/series/64701/ State : failure == Summary == Applying: drm/ttm: add gem base object Using index info to reconstruct a base tree... M include/drm/ttm/ttm_bo_api.h Falling back to patching base and 3-way merge... Auto-merging include/drm/ttm/ttm_bo_api.h No changes -- Patch already applied. Applying: drm/vram: use embedded gem object Using index info to reconstruct a base tree... M drivers/gpu/drm/ast/ast_main.c M drivers/gpu/drm/drm_gem_vram_helper.c M drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c M drivers/gpu/drm/vboxvideo/vbox_main.c M include/drm/drm_gem_vram_helper.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/drm_gem_vram_helper.c No changes -- Patch already applied. Applying: drm/qxl: use embedded gem object Using index info to reconstruct a base tree... M drivers/gpu/drm/qxl/qxl_cmd.c M drivers/gpu/drm/qxl/qxl_debugfs.c M drivers/gpu/drm/qxl/qxl_display.c M drivers/gpu/drm/qxl/qxl_drv.h M drivers/gpu/drm/qxl/qxl_gem.c M drivers/gpu/drm/qxl/qxl_object.c M drivers/gpu/drm/qxl/qxl_object.h M drivers/gpu/drm/qxl/qxl_release.c M drivers/gpu/drm/qxl/qxl_ttm.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/qxl/qxl_release.c Auto-merging drivers/gpu/drm/qxl/qxl_object.h Auto-merging drivers/gpu/drm/qxl/qxl_debugfs.c No changes -- Patch already applied. Applying: drm/radeon: use embedded gem object Using index info to reconstruct a base tree... M drivers/gpu/drm/radeon/radeon.h M drivers/gpu/drm/radeon/radeon_cs.c M drivers/gpu/drm/radeon/radeon_display.c M drivers/gpu/drm/radeon/radeon_gem.c M drivers/gpu/drm/radeon/radeon_object.c M drivers/gpu/drm/radeon/radeon_prime.c M drivers/gpu/drm/radeon/radeon_ttm.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/radeon/radeon_ttm.c Auto-merging drivers/gpu/drm/radeon/radeon_prime.c Auto-merging drivers/gpu/drm/radeon/radeon_object.c CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_object.c Auto-merging drivers/gpu/drm/radeon/radeon_gem.c Auto-merging drivers/gpu/drm/radeon/radeon_display.c Auto-merging drivers/gpu/drm/radeon/radeon_cs.c Auto-merging drivers/gpu/drm/radeon/radeon.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0004 drm/radeon: use embedded gem object 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
