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

Commit 27eb4a1e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v3.0-rc1' into perf/core 



Merge reason: merge in the latest fixes.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 64ce3126 55922c9d

Documentation/00-INDEX

+2 −4
Original line number Diff line number Diff line
@@ -192,10 +192,6 @@ kernel-docs.txt 
	- listing of various WWW + books that document kernel internals.

kernel-parameters.txt

	- summary listing of command line / boot prompt args for the kernel.

keys-request-key.txt

	- description of the kernel key request service.

keys.txt

	- description of the kernel key retention service.

kobject.txt

	- info of the kobject infrastructure of the Linux kernel.

kprobes.txt
@@ -294,6 +290,8 @@ scheduler/ 
	- directory with info on the scheduler.

scsi/

	- directory with info on Linux scsi support.

security/

	- directory that contains security-related info

serial/

	- directory with info on the low level serial API.

serial-console.txt

Documentation/ABI/obsolete/o2cb→Documentation/ABI/removed/o2cb

+4 −5
Original line number Diff line number Diff line 
What:		/sys/o2cb symlink

Date:		Dec 2005

KernelVersion:	2.6.16

Date:		May 2011

KernelVersion:	2.6.40

Contact:	ocfs2-devel@oss.oracle.com

Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink will

		be removed when new versions of ocfs2-tools which know to look

Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is

		removed when new versions of ocfs2-tools which know to look

		in /sys/fs/o2cb are sufficiently prevalent. Don't code new

		software to look here, it should try /sys/fs/o2cb instead.

		See Documentation/ABI/stable/o2cb for more information on usage.

Users:		ocfs2-tools. It's sufficient to mail proposed changes to

		ocfs2-devel@oss.oracle.com.

Documentation/ABI/testing/sysfs-kernel-mm-cleancache

0 → 100644
+11 −0
Original line number Diff line number Diff line 
What:		/sys/kernel/mm/cleancache/

Date:		April 2011

Contact:	Dan Magenheimer <dan.magenheimer@oracle.com>

Description:

		/sys/kernel/mm/cleancache/ contains a number of files which

		record a count of various cleancache operations

		(sum across all filesystems):

			succ_gets

			failed_gets

			puts

			flushes

Documentation/DocBook/dvb/dvbproperty.xml

+4 −1
Original line number Diff line number Diff line
@@ -141,13 +141,15 @@ struct dtv_properties { 
 </row></tbody></tgroup></informaltable>

</section>



<section>

	<title>Property types</title>

<para>

On <link linkend="FE_GET_PROPERTY">FE_GET_PROPERTY</link>/<link linkend="FE_SET_PROPERTY">FE_SET_PROPERTY</link>,

the actual action is determined by the dtv_property cmd/data pairs. With one single ioctl, is possible to

get/set up to 64 properties. The actual meaning of each property is described on the next sections.

</para>



<para>The Available frontend property types are:</para>

<para>The available frontend property types are:</para>

<programlisting>

#define DTV_UNDEFINED		0

#define DTV_TUNE		1
@@ -193,6 +195,7 @@ get/set up to 64 properties. The actual meaning of each property is described on 
#define DTV_ISDBT_LAYER_ENABLED	41

#define DTV_ISDBS_TS_ID		42

</programlisting>

</section>



<section id="fe_property_common">

	<title>Parameters that are common to all Digital TV standards</title>

Documentation/DocBook/media-entities.tmpl

+4 −3
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ 
<!ENTITY sub-yuyv SYSTEM "v4l/pixfmt-yuyv.xml">

<!ENTITY sub-yvyu SYSTEM "v4l/pixfmt-yvyu.xml">

<!ENTITY sub-srggb10 SYSTEM "v4l/pixfmt-srggb10.xml">

<!ENTITY sub-srggb12 SYSTEM "v4l/pixfmt-srggb12.xml">

<!ENTITY sub-srggb8 SYSTEM "v4l/pixfmt-srggb8.xml">

<!ENTITY sub-y10 SYSTEM "v4l/pixfmt-y10.xml">

<!ENTITY sub-y12 SYSTEM "v4l/pixfmt-y12.xml">
@@ -373,9 +374,9 @@ 
<!ENTITY sub-media-indices SYSTEM "media-indices.tmpl">



<!ENTITY sub-media-controller SYSTEM "v4l/media-controller.xml">

<!ENTITY sub-media-open SYSTEM "v4l/media-func-open.xml">

<!ENTITY sub-media-close SYSTEM "v4l/media-func-close.xml">

<!ENTITY sub-media-ioctl SYSTEM "v4l/media-func-ioctl.xml">

<!ENTITY sub-media-func-open SYSTEM "v4l/media-func-open.xml">

<!ENTITY sub-media-func-close SYSTEM "v4l/media-func-close.xml">

<!ENTITY sub-media-func-ioctl SYSTEM "v4l/media-func-ioctl.xml">

<!ENTITY sub-media-ioc-device-info SYSTEM "v4l/media-ioc-device-info.xml">

<!ENTITY sub-media-ioc-enum-entities SYSTEM "v4l/media-ioc-enum-entities.xml">

<!ENTITY sub-media-ioc-enum-links SYSTEM "v4l/media-ioc-enum-links.xml">