Commit 54499b2a authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued 



So with all the code movement and extraction in intel_pm.c in -next
git is hopelessly confused with

commit 2208d655
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Fri Nov 14 09:25:29 2014 +0100

    drm/i915: drop WaSetupGtModeTdRowDispatch:snb

from -fixes. Worse even small changes in -next move around the
conflict context so rerere is equally useless. Let's just backmerge
and be done with it.

Conflicts:
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c

Except for git getting lost no tricky conflicts really.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 2eb5252e 0485c9dc

Documentation/ABI/testing/sysfs-ibft

+1 −1
Original line number Diff line number Diff line
@@ -20,4 +20,4 @@ Date: November 2007 
Contact:	Konrad Rzeszutek <ketuzsezr@darnok.org>

Description:	The /sys/firmware/ibft/ethernetX directory will contain

		files that expose the iSCSI Boot Firmware Table NIC data.

		This can this can the IP address, MAC, and gateway of the NIC.
 
		Usually this contains the IP address, MAC, and gateway of the NIC.

Documentation/DocBook/media/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ GENFILES := $(addprefix $(MEDIA_OBJ_DIR)/, $(MEDIA_TEMP)) 
PHONY += cleanmediadocs



cleanmediadocs:

	-@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null

	-@rm -f `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null



$(obj)/media_api.xml: $(GENFILES) FORCE

Documentation/DocBook/media/v4l/compat.xml

+4 −0
Original line number Diff line number Diff line
@@ -2566,6 +2566,10 @@ fields changed from _s32 to _u32. 
	  <para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;.

	  </para>

        </listitem>

      </orderedlist>

    </section>



    <section>

      <title>V4L2 in Linux 3.18</title>

      <orderedlist>

	<listitem>

Documentation/HOWTO

+0 −1
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ tree, they need to be integration-tested. For this purpose, a special 
testing repository exists into which virtually all subsystem trees are

pulled on an almost daily basis:

	http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git

	http://linux.f-seidel.de/linux-next/pmwiki/



This way, the -next kernel gives a summary outlook onto what will be

expected to go into the mainline kernel at the next merge period.

Documentation/SubmittingPatches

+4 −6
Original line number Diff line number Diff line
@@ -483,12 +483,10 @@ have been included in the discussion 


14) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:



If this patch fixes a problem reported by somebody else, consider adding a

Reported-by: tag to credit the reporter for their contribution.  Please

note that this tag should not be added without the reporter's permission,

especially if the problem was not reported in a public forum.  That said,

if we diligently credit our bug reporters, they will, hopefully, be

inspired to help us again in the future.

The Reported-by tag gives credit to people who find bugs and report them and it

hopefully inspires them to help us again in the future.  Please note that if

the bug was reported in private, then ask for permission first before using the

Reported-by tag.



A Tested-by: tag indicates that the patch has been successfully tested (in

some environment) by the person named.  This tag informs maintainers that

CRA Git | Maintained and supported by SUSTech CRA and CCSE