drm/i915: HDMI audio gets the TMDS clock by crtc_clock

Submitted by libin.yang@linux.intel.com on Aug. 2, 2016, 6:17 a.m.

Details

Reviewer None
Submitted Aug. 2, 2016, 6:17 a.m.
Last Updated Aug. 2, 2016, 6:30 a.m.
Revision 1

Revisions

Patches download mbox

Tests

Applying: drm/i915: HDMI audio gets the TMDS clock by crtc_clock
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_audio.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_audio.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_audio.c
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915: HDMI audio gets the TMDS clock by crtc_clock
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".