Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 398b7a1b authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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 b98b6016
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 3cce574f
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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 57df2ae9 979570e0

Documentation/ABI/testing/sysfs-bus-pci

+12 −0
Original line number Diff line number Diff line
@@ -210,3 +210,15 @@ Users: 
		firmware assigned instance number of the PCI

		device that can help in understanding the firmware

		intended order of the PCI device.



What:		/sys/bus/pci/devices/.../d3cold_allowed

Date:		July 2012

Contact:	Huang Ying <ying.huang@intel.com>

Description:

		d3cold_allowed is bit to control whether the corresponding PCI

		device can be put into D3Cold state.  If it is cleared, the

		device will never be put into D3Cold state.  If it is set, the

		device may be put into D3Cold state if other requirements are

		satisfied too.  Reading this attribute will show the current

		value of d3cold_allowed bit.  Writing this attribute will set

		the value of d3cold_allowed bit.

Documentation/feature-removal-schedule.txt

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ Why: KVM tracepoints provide mostly equivalent information in a much more 
----------------------------



What:	at91-mci driver ("CONFIG_MMC_AT91")

When:	3.7

When:	3.8

Why:	There are two mci drivers: at91-mci and atmel-mci. The PDC support

	was added to atmel-mci as a first step to support more chips.

	Then at91-mci was kept only for old IP versions (on at91rm9200 and

Documentation/i2c/busses/i2c-i801

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Supported adapters: 
  * Intel DH89xxCC (PCH)

  * Intel Panther Point (PCH)

  * Intel Lynx Point (PCH)

  * Intel Lynx Point-LP (PCH)

   Datasheets: Publicly available at the Intel website



On Intel Patsburg and later chipsets, both the normal host SMBus controller

Documentation/watchdog/src/watchdog-test.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static void keep_alive(void) 
 * or "-e" to enable the card.

 */



void term(int sig)

static void term(int sig)

{

    close(fd);

    fprintf(stderr, "Stopping watchdog ticks...\n");

MAINTAINERS

+4 −3
Original line number Diff line number Diff line
@@ -3388,7 +3388,7 @@ M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de> 
L:	linux-i2c@vger.kernel.org

W:	http://i2c.wiki.kernel.org/

T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/

T:	git git://git.fluff.org/bjdooks/linux.git

T:	git git://git.pengutronix.de/git/wsa/linux.git

S:	Maintained

F:	Documentation/i2c/

F:	drivers/i2c/
@@ -3666,11 +3666,12 @@ F: Documentation/networking/README.ipw2200 
F:	drivers/net/wireless/ipw2x00/



INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)

M:	Joseph Cihula <joseph.cihula@intel.com>

M:	Richard L Maliszewski <richard.l.maliszewski@intel.com>

M:	Gang Wei <gang.wei@intel.com>

M:	Shane Wang <shane.wang@intel.com>

L:	tboot-devel@lists.sourceforge.net

W:	http://tboot.sourceforge.net

T:	Mercurial http://www.bughost.org/repos.hg/tboot.hg

T:	hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot

S:	Supported

F:	Documentation/intel_txt.txt

F:	include/linux/tboot.h