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

Commit 8d4ad9d4 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge commit '9e9a928e' into drm-next 

Merge drm-fixes into drm-next.

Both i915 and radeon need this done for later patches.

Conflicts:
	drivers/gpu/drm/drm_crtc_helper.c
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/i915_gem_execbuffer.c
	drivers/gpu/drm/i915/i915_gem_gtt.c
parents 5ea1f752 9e9a928e

Documentation/ABI/testing/sysfs-bus-pci

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ Description: 


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

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>

Contact:	Ben Hutchings <bwh@kernel.org>

Description:

		A file named vpd in a device directory will be a

		binary file containing the Vital Product Data for the

Documentation/DocBook/media/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ DVB_DOCUMENTED = \ 
#



install_media_images = \

	$(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api

	$(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api



$(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64

	$(Q)base64 -d $< >$@

Documentation/debugging-via-ohci1394.txt

+8 −5
Original line number Diff line number Diff line
@@ -25,9 +25,11 @@ using data transfer rates in the order of 10MB/s or more. 
With most FireWire controllers, memory access is limited to the low 4 GB

of physical address space.  This can be a problem on IA64 machines where

memory is located mostly above that limit, but it is rarely a problem on

more common hardware such as x86, x86-64 and PowerPC.  However, at least

Agere/LSI FW643e and FW643e2 controllers are known to support access to

physical addresses above 4 GB.

more common hardware such as x86, x86-64 and PowerPC.



At least LSI FW643e and FW643e2 controllers are known to support access to

physical addresses above 4 GB, but this feature is currently not enabled by

Linux.



Together with a early initialization of the OHCI-1394 controller for debugging,

this facility proved most useful for examining long debugs logs in the printk
@@ -101,8 +103,9 @@ Step-by-step instructions for using firescope with early OHCI initialization: 
   compliant, they are based on TI PCILynx chips and require drivers for Win-

   dows operating systems.



   The mentioned kernel log message contains ">4 GB phys DMA" in case of

   OHCI-1394 controllers which support accesses above this limit.

   The mentioned kernel log message contains the string "physUB" if the

   controller implements a writable Physical Upper Bound register.  This is

   required for physical DMA above 4 GB (but not utilized by Linux yet).



2) Establish a working FireWire cable connection:

Documentation/device-mapper/thin-provisioning.txt

+4 −1
Original line number Diff line number Diff line
@@ -309,7 +309,10 @@ ii) Status 
    error_if_no_space|queue_if_no_space

	If the pool runs out of data or metadata space, the pool will

	either queue or error the IO destined to the data device.  The

	default is to queue the IO until more space is added.

	default is to queue the IO until more space is added or the

	'no_space_timeout' expires.  The 'no_space_timeout' dm-thin-pool

	module parameter can be used to change this timeout -- it

	defaults to 60 seconds but may be disabled using a value of 0.



iii) Messages

Documentation/devicetree/bindings/arm/arch_timer.txt

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ to deliver its interrupts via SPIs. 


- clock-frequency : The frequency of the main counter, in Hz. Optional.



- always-on : a boolean property. If present, the timer is powered through an

  always-on power domain, therefore it never loses context.



Example:



	timer {