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

Commit 5bc69bf9 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2012-04-23' of... 

Merge tag 'drm-intel-next-2012-04-23' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next

Daniel Vetter writes:

A new drm-intel-next pull. Highlights:
- More gmbus patches from Daniel Kurtz, I think gmbus is now ready, all
 known issues fixed.
- Fencing cleanup and pipelined fencing removal from Chris.
- rc6 residency interface from Ben, useful for powertop.
- Cleanups and code reorg around the ringbuffer code (Ben&me).
- Use hw semaphores in the pageflip code from Ben.
- More vlv stuff from Jesse, unfortunately his vlv cpu is doa, so less
 merged than I've hoped for - we still have the unused function warning :(
- More hsw patches from Eugeni, again, not yet enabled fully.
- intel_pm.c refactoring from Eugeni.
- Ironlake sprite support from Chris.
- And various smaller improvements/fixes all over the place.

Note that this pull request also contains a backmerge of -rc3 to sort out
a few things in -next. I've also had to frob the shortlog a bit to exclude
anything that -rc3 brings in with this pull.

Regression wise we have a few strange bugs going on, but for all of them
closer inspection revealed that they've been pre-existing, just now
slightly more likely to be hit. And for most of them we have a patch
already. Otherwise QA has not reported any regressions, and I'm also not
aware of anything bad happening in 3.4.

* tag 'drm-intel-next-2012-04-23' of git://people.freedesktop.org/~danvet/drm-intel: (420 commits)
  drm/i915: rc6 residency (fix the fix)
  drm/i915/tv: fix open-coded ARRAY_SIZE.
  drm/i915: invalidate render cache on gen2
  drm/i915: Silence the change of LVDS sync polarity
  drm/i915: add generic power management initialization
  drm/i915: move clock gating functionality into intel_pm module
  drm/i915: move emon functionality into intel_pm module
  drm/i915: move drps, rps and rc6-related functions to intel_pm
  drm/i915: fix line breaks in intel_pm
  drm/i915: move watermarks settings into intel_pm module
  drm/i915: move fbc-related functionality into intel_pm module
  drm/i915: Refactor get_fence() to use the common fence writing routine
  drm/i915: Refactor fence clearing to use the common fence writing routine
  drm/i915: Refactor put_fence() to use the common fence writing routine
  drm/i915: Prepare to consolidate fence writing
  drm/i915: Remove the unsightly "optimisation" from flush_fence()
  drm/i915: Simplify fence finding
  drm/i915: Discard the unused obj->last_fenced_ring
  drm/i915: Remove unused ring->setup_seqno
  drm/i915: Remove fence pipelining
  ...
parents c6543a6e a85d4bcb

Documentation/ABI/stable/sysfs-driver-usb-usbtmc

+7 −7
Original line number Diff line number Diff line 
What:		/sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/device_capabilities

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:
@@ -12,8 +12,8 @@ Description: 
		The files are read only.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/usb488_device_capabilities

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:
@@ -27,7 +27,7 @@ Description: 
		The files are read only.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermChar

What:		/sys/bus/usb/drivers/usbtmc/*/TermChar

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:
@@ -40,7 +40,7 @@ Description: 
		sent to the device or not.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled

What:		/sys/bus/usb/drivers/usbtmc/*/TermCharEnabled

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:
@@ -51,7 +51,7 @@ Description: 
		published by the USB-IF.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/auto_abort

What:		/sys/bus/usb/drivers/usbtmc/*/auto_abort

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

Documentation/ABI/testing/sysfs-block-rssd

0 → 100644
+18 −0
Original line number Diff line number Diff line 
What:           /sys/block/rssd*/registers

Date:           March 2012

KernelVersion:  3.3

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:    This is a read-only file. Dumps below driver information and

                hardware registers.

                    - S ACTive

                    - Command Issue

                    - Allocated

                    - Completed

                    - PORT IRQ STAT

                    - HOST IRQ STAT



What:           /sys/block/rssd*/status

Date:           April 2012

KernelVersion:  3.4

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:   This is a read-only file. Indicates the status of the device.

Documentation/ABI/testing/sysfs-cfq-target-latency

0 → 100644
+8 −0
Original line number Diff line number Diff line 
What:		/sys/block/<device>/iosched/target_latency

Date:		March 2012

contact:	Tao Ma <boyu.mt@taobao.com>

Description:

		The /sys/block/<device>/iosched/target_latency only exists

		when the user sets cfq to /sys/block/<device>/scheduler.

		It contains an estimated latency time for the cfq. cfq will

		use it to calculate the time slice used for every task.

Documentation/cgroups/memory.txt

+2 −3
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ Current Status: linux-2.6.34-mmotm(development version of 2010/April) 


Features:

 - accounting anonymous pages, file caches, swap caches usage and limiting them.

 - private LRU and reclaim routine. (system's global LRU and private LRU

   work independently from each other)

 - pages are linked to per-memcg LRU exclusively, and there is no global LRU.

 - optionally, memory+swap usage can be accounted and limited.

 - hierarchical accounting

 - soft limit
@@ -154,7 +153,7 @@ updated. page_cgroup has its own LRU on cgroup. 
2.2.1 Accounting details



All mapped anon pages (RSS) and cache pages (Page Cache) are accounted.

Some pages which are never reclaimable and will not be on the global LRU

Some pages which are never reclaimable and will not be on the LRU

are not accounted. We just account pages under usual VM management.



RSS pages are accounted at page_fault unless they've already been accounted

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Diff line number Diff line
@@ -531,3 +531,11 @@ Why: There appear to be no production users of the get_robust_list syscall, 
	of ASLR. It was only ever intended for debugging, so it should be

	removed.

Who:	Kees Cook <keescook@chromium.org>



----------------------------



What:	setitimer accepts user NULL pointer (value)

When:	3.6

Why:	setitimer is not returning -EFAULT if user pointer is NULL. This

	violates the spec.

Who:	Sasikantha Babu <sasikanth.v19@gmail.com>