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

Commit 0d41da2e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-fixes' into pm-domains 

Merge commit e8b364b8
(PM / Clocks: Do not acquire a mutex under a spinlock) fixing
a regression in drivers/base/power/clock_ops.c.

Conflicts:
	drivers/base/power/clock_ops.c
parents a0089bd6 e8b364b8

Documentation/ABI/testing/sysfs-class-scsi_host

0 → 100644
+13 −0
Original line number Diff line number Diff line 
What:		/sys/class/scsi_host/hostX/isci_id

Date:		June 2011

Contact:	Dave Jiang <dave.jiang@intel.com>

Description:

		This file contains the enumerated host ID for the Intel

		SCU controller. The Intel(R) C600 Series Chipset SATA/SAS

		Storage Control Unit embeds up to two 4-port controllers in

		a single PCI device.  The controllers are enumerated in order

		which usually means the lowest number scsi_host corresponds

		with the first controller, but this association is not

		guaranteed.  The 'isci_id' attribute unambiguously identifies

		the controller index: '0' for the first controller,

		'1' for the second.

Documentation/DocBook/media/v4l/controls.xml

+19 −19
Original line number Diff line number Diff line
@@ -1455,7 +1455,7 @@ Applicable to the H264 encoder.</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-vui-sar-idc">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_vui_sar_idc</entry>

	      </row>
@@ -1561,7 +1561,7 @@ Applicable to the H264 encoder.</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-level">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LEVEL</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_level</entry>

	      </row>
@@ -1641,7 +1641,7 @@ Possible values are:</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-mpeg4-level">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_mpeg4_level</entry>

	      </row>
@@ -1689,9 +1689,9 @@ Possible values are:</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-profile">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_PROFILE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_h264_profile</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_profile</entry>

	      </row>

	      <row><entry spanname="descr">The profile information for H264.

Applicable to the H264 encoder.
@@ -1774,9 +1774,9 @@ Possible values are:</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-mpeg4-profile">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_mpeg4_profile</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_mpeg4_profile</entry>

	      </row>

	      <row><entry spanname="descr">The profile information for MPEG4.

Applicable to the MPEG4 encoder.
@@ -1820,9 +1820,9 @@ Applicable to the encoder. 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-multi-slice-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_multi_slice_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_multi_slice_mode</entry>

	      </row>

	      <row><entry spanname="descr">Determines how the encoder should handle division of frame into slices.

Applicable to the encoder.
@@ -1868,9 +1868,9 @@ Applicable to the encoder.</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-loop-filter-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_h264_loop_filter_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_loop_filter_mode</entry>

	      </row>

	      <row><entry spanname="descr">Loop filter mode for H264 encoder.

Possible values are:</entry>
@@ -1913,9 +1913,9 @@ Applicable to the H264 encoder.</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-h264-entropy-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_h264_symbol_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_h264_entropy_mode</entry>

	      </row>

	      <row><entry spanname="descr">Entropy coding mode for H264 - CABAC/CAVALC.

Applicable to the H264 encoder.
@@ -2140,9 +2140,9 @@ previous frames. Applicable to the H264 encoder.</entry> 
	      </row>



	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-video-header-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_HEADER_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_header_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_video_header_mode</entry>

	      </row>

	      <row><entry spanname="descr">Determines whether the header is returned as the first buffer or is

it returned together with the first frame. Applicable to encoders.
@@ -2320,9 +2320,9 @@ Valid only when H.264 and macroblock level RC is enabled (<constant>V4L2_CID_MPE 
Applicable to the H264 encoder.</entry>

	      </row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-mfc51-video-frame-skip-mode">

		<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_mfc51_frame_skip_mode</entry>

		<entry>enum&nbsp;v4l2_mpeg_mfc51_video_frame_skip_mode</entry>

	      </row>

	      <row><entry spanname="descr">

Indicates in what conditions the encoder should skip frames. If encoding a frame would cause the encoded stream to be larger then
@@ -2361,9 +2361,9 @@ the stream will meet tight bandwidth contraints. Applicable to encoders. 
</entry>

	      </row>

	      <row><entry></entry></row>

	      <row>

	      <row id="v4l2-mpeg-mfc51-video-force-frame-type">

		<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE</constant>&nbsp;</entry>

		<entry>enum&nbsp;v4l2_mpeg_mfc51_force_frame_type</entry>

		<entry>enum&nbsp;v4l2_mpeg_mfc51_video_force_frame_type</entry>

	      </row>

	      <row><entry spanname="descr">Force a frame type for the next queued buffer. Applicable to encoders.

Possible values are:</entry>

Documentation/cgroups/memory.txt

+1 −84
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ will be charged as a new owner of it. 


5.2 stat file



5.2.1 memory.stat file includes following statistics

memory.stat file includes following statistics



# per-memory cgroup local status

cache		- # of bytes of page cache memory.
@@ -438,89 +438,6 @@ Note: 
	 file_mapped is accounted only when the memory cgroup is owner of page

	 cache.)



5.2.2 memory.vmscan_stat



memory.vmscan_stat includes statistics information for memory scanning and

freeing, reclaiming. The statistics shows memory scanning information since

memory cgroup creation and can be reset to 0 by writing 0 as



 #echo 0 > ../memory.vmscan_stat



This file contains following statistics.



[param]_[file_or_anon]_pages_by_[reason]_[under_heararchy]

[param]_elapsed_ns_by_[reason]_[under_hierarchy]



For example,



  scanned_file_pages_by_limit indicates the number of scanned

  file pages at vmscan.



Now, 3 parameters are supported



  scanned - the number of pages scanned by vmscan

  rotated - the number of pages activated at vmscan

  freed   - the number of pages freed by vmscan



If "rotated" is high against scanned/freed, the memcg seems busy.



Now, 2 reason are supported



  limit - the memory cgroup's limit

  system - global memory pressure + softlimit

           (global memory pressure not under softlimit is not handled now)



When under_hierarchy is added in the tail, the number indicates the

total memcg scan of its children and itself.



elapsed_ns is a elapsed time in nanosecond. This may include sleep time

and not indicates CPU usage. So, please take this as just showing

latency.



Here is an example.



# cat /cgroup/memory/A/memory.vmscan_stat

scanned_pages_by_limit 9471864

scanned_anon_pages_by_limit 6640629

scanned_file_pages_by_limit 2831235

rotated_pages_by_limit 4243974

rotated_anon_pages_by_limit 3971968

rotated_file_pages_by_limit 272006

freed_pages_by_limit 2318492

freed_anon_pages_by_limit 962052

freed_file_pages_by_limit 1356440

elapsed_ns_by_limit 351386416101

scanned_pages_by_system 0

scanned_anon_pages_by_system 0

scanned_file_pages_by_system 0

rotated_pages_by_system 0

rotated_anon_pages_by_system 0

rotated_file_pages_by_system 0

freed_pages_by_system 0

freed_anon_pages_by_system 0

freed_file_pages_by_system 0

elapsed_ns_by_system 0

scanned_pages_by_limit_under_hierarchy 9471864

scanned_anon_pages_by_limit_under_hierarchy 6640629

scanned_file_pages_by_limit_under_hierarchy 2831235

rotated_pages_by_limit_under_hierarchy 4243974

rotated_anon_pages_by_limit_under_hierarchy 3971968

rotated_file_pages_by_limit_under_hierarchy 272006

freed_pages_by_limit_under_hierarchy 2318492

freed_anon_pages_by_limit_under_hierarchy 962052

freed_file_pages_by_limit_under_hierarchy 1356440

elapsed_ns_by_limit_under_hierarchy 351386416101

scanned_pages_by_system_under_hierarchy 0

scanned_anon_pages_by_system_under_hierarchy 0

scanned_file_pages_by_system_under_hierarchy 0

rotated_pages_by_system_under_hierarchy 0

rotated_anon_pages_by_system_under_hierarchy 0

rotated_file_pages_by_system_under_hierarchy 0

freed_pages_by_system_under_hierarchy 0

freed_anon_pages_by_system_under_hierarchy 0

freed_file_pages_by_system_under_hierarchy 0

elapsed_ns_by_system_under_hierarchy 0



5.3 swappiness



Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.

Documentation/feature-removal-schedule.txt

+8 −0
Original line number Diff line number Diff line
@@ -592,3 +592,11 @@ Why: In 3.0, we can now autodetect internal 3G device and already have 
	interface that was used by acer-wmi driver. It will replaced by

	information log when acer-wmi initial.

Who:    Lee, Chun-Yi <jlee@novell.com>



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

What:	The XFS nodelaylog mount option

When:	3.3

Why:	The delaylog mode that has been the default since 2.6.39 has proven

	stable, and the old code is in the way of additional improvements in

	the log code.

Who:	Christoph Hellwig <hch@lst.de>

Documentation/hwmon/max16065

+7 −0
Original line number Diff line number Diff line
@@ -62,6 +62,13 @@ can be safely used to identify the chip. You will have to instantiate 
the devices explicitly. Please see Documentation/i2c/instantiating-devices for

details.



WARNING: Do not access chip registers using the i2cdump command, and do not use

any of the i2ctools commands on a command register (0xa5 to 0xac). The chips

supported by this driver interpret any access to a command register (including

read commands) as request to execute the command in question. This may result in

power loss, board resets, and/or Flash corruption. Worst case, your board may

turn into a brick.





Sysfs entries

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