drm/i915: Fix Kconfig indentation
Subsystems (2)
PATCH v3 1/1 drm/i915: Fix Kconfig indentation
Adjust indentation from spaces to tab (+optional two spaces) as in coding style with command like:
$ sed -e 's/^ /\t/' -i */Kconfig
---
Changes since v2:
1. Split AMD and i915 to separate patches.
--- drivers/gpu/drm/i915/Kconfig | 12 +-- drivers/gpu/drm/i915/Kconfig.debug | 144 ++++++++++++++--------------- 2 files changed, 78 insertions(+), 78 deletions(-)
drivers/gpu/drm/i915/Kconfig +6 -6
@@ -76,7 +76,7 @@ config DRM_I915_CAPTURE_ERROR This option enables capturing the GPU state when a hang is detected. This information is vital for triaging hangs and assists in debugging. Please report any hang to - https://bugs.freedesktop.org/enter_bug.cgi?product=DRI + https://bugs.freedesktop.org/enter_bug.cgi?product=DRI for triaging. If in doubt, say "Y".
@@ -105,11 +105,11 @@ config DRM_I915_USERPTR If in doubt, say "Y". config DRM_I915_GVT - bool "Enable Intel GVT-g graphics virtualization host support" - depends on DRM_I915 - depends on 64BIT - default n - help + bool "Enable Intel GVT-g graphics virtualization host support" + depends on DRM_I915 + depends on 64BIT + default n + help Choose this option if you want to enable Intel GVT-g graphics virtualization technology host support with integrated graphics. With GVT-g, it's possible to have one integrated graphics
drivers/gpu/drm/i915/Kconfig.debug +72 -72
192 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✗ Fi.CI.BUILD: failure for drm/i915: Fix Kconfig indentation
== Series Details ==
== Series Details ==
Series: drm/i915: Fix Kconfig indentation
URL : https://patchwork.freedesktop.org/series/67707/
State : failure
== Summary ==
Applying: drm/i915: Fix Kconfig indentation
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/Kconfig.debug
Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/Kconfig.debug
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig.debug
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 drm/i915: Fix Kconfig indentation
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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: ✗ Fi.CI.BUILD: failure for drm/i915: Fix Kconfig indentation
Quoted 8 lines · Patchwork
== Series Details ==
Series: drm/i915: Fix
Kconfigindentation
URL : https://patchwork.freedesktop.org/series/67707/
State : failure== Summary ==
Quoted 12 lines
Applying: drm/i915: Fix
Kconfigindentation
Using index info to reconstruct a base tree...
Mdrivers/gpu/drm/i915/Kconfig.debug
Falling back to patching base and 3-way merge... Auto-mergingdrivers/gpu/drm/i915/Kconfig.debug
CONFLICT (content): Merge conflict indrivers/gpu/drm/i915/Kconfig.debug
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 drm/i915: FixKconfigindentation
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".
This conflict is due to a CI-only commit in drm-tip that's not headed for upstream. Eyeballed the patch, git show -w indicates no changes, so applied to drm-intel-next-queued. Thanks for the patch.
BR,
Jani.
Quoted 5 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx