UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/gpu/drm/ast
History
Daniel Vetter 398b7a1b88 Linux 3.6-rc7 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJQX7MuAAoJEHm+PkMAQRiG0h0IAJURkrMCAQUxA+Ik66ReH89s
 LQcVd0U9uL4UUOi7f5WR64Vf9Cfu6VVGX9ZKSvjpNskvlQaUQPMIt4pMe6g4X4dI
 u0bApEy4XZz3nGabUAghIU8jJ8cDmhCG6kPpSiS7pi7KHc0yIa4WFtJRrIpGaIWT
 xuK38YOiOHcSDRlLyWZzainMncQp/ixJdxnqVMTonkVLk0q0b84XzOr4/qlLE5lU
 i+TsK3PRKdQXgvZ4CebL+srPBwWX1dmgP3VkeBloQbSSenSeELICbFWavn2ml+sF
 GXi4dO93oNquL/Oy5SwI666T4uNcrRPaS+5X+xSZgBW/y2aQVJVJuNZg6ZP/uWk=
 =0v2l
 -----END PGP SIGNATURE-----

Merge tag 'v3.6-rc7' into drm-intel-next-queued

Manual backmerge of -rc7 to resolve a silent conflict leading to
compile failure in drivers/gpu/drm/i915/intel_hdmi.c.

This is due to the bugfix in -rc7:

commit b98b601672
Author: Wang Xingchao <xingchao.wang@intel.com>
Date:   Thu Sep 13 07:43:22 2012 +0800

    drm/i915: HDMI - Clear Audio Enable bit for Hot Plug

Since this code moved around a lot in -next git put that snippet at
the wrong spot. I've tried to fix this by making the conflict explicit
by merging a version for next with:

commit 3cce574f01
Author: Wang Xingchao <xingchao.wang@intel.com>
Date:   Thu Sep 13 11:19:00 2012 +0800

    drm/i915: HDMI - Clear Audio Enable bit for Hot Plug unconditionally

But that failed to solve the entire problem. To avoid pushing out
further -nightly branch to our QA where this is broken, do the
backmerge and manually add the stuff git adds to -next from the patch
in -fixes.

Note that this doesn't show up in git's merge diff (and hence is also
not handled by git rerere), which adds to the reasons why I'd like to
fix this with a verbose backmerge. The git merge diff only shows a
bunch of trivial conflicts of the "code changed in lines next to each
another" kind.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
 		2012-09-24 18:17:12 +02:00
..
Kconfig drm/kms: fix Kconfig for new drivers. 2012-05-20 10:10:53 +01:00
Makefile drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2) 2012-05-17 10:53:37 +01:00
ast_dram_tables.h drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2) 2012-05-17 10:53:37 +01:00
ast_drv.c drm: use drm_compat_ioctl for 32-bit apps 2012-09-06 06:55:02 +10:00
ast_drv.h drm/ast: remove unused validate_sequence 2012-08-24 09:34:41 +10:00
ast_fb.c drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2) 2012-05-17 10:53:37 +01:00
ast_main.c drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2) 2012-05-17 10:53:37 +01:00
ast_mode.c Linux 3.6-rc7 2012-09-24 18:17:12 +02:00
ast_post.c drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2) 2012-05-17 10:53:37 +01:00
ast_tables.h drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2) 2012-05-17 10:53:37 +01:00
ast_ttm.c drm: update ast/cirrus/mgag200 for change in TTM api 2012-05-23 14:08:41 +01:00