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

Commit b24d6f49 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v3.11-rc2' into sched/core 



Merge in Linux 3.11-rc2, to provide a post-merge-window development base.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents cedce3e7 3b2f64d0

Documentation/ABI/stable/sysfs-driver-ib_srp

+7 −0
Original line number Diff line number Diff line
@@ -54,6 +54,13 @@ Description: Interface for making ib_srp connect to a new target. 
		  ib_srp. Specifying a value that exceeds cmd_sg_entries is

		  only safe with partial memory descriptor list support enabled

		  (allow_ext_sg=1).

		* comp_vector, a number in the range 0..n-1 specifying the

		  MSI-X completion vector. Some HCA's allocate multiple (n)

		  MSI-X vectors per HCA port. If the IRQ affinity masks of

		  these interrupts have been configured such that each MSI-X

		  interrupt is handled by a different CPU then the comp_vector

		  parameter can be used to spread the SRP completion workload

		  over multiple CPU's.



What:		/sys/class/infiniband_srp/srp-<hca>-<port_number>/ibdev

Date:		January 2, 2006

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ Description: Generic performance monitoring events 


What: 		/sys/devices/cpu/events/PM_1PLUS_PPC_CMPL

		/sys/devices/cpu/events/PM_BRU_FIN

		/sys/devices/cpu/events/PM_BRU_MPRED

		/sys/devices/cpu/events/PM_BR_MPRED

		/sys/devices/cpu/events/PM_CMPLU_STALL

		/sys/devices/cpu/events/PM_CMPLU_STALL_BRU

		/sys/devices/cpu/events/PM_CMPLU_STALL_DCACHE_MISS

Documentation/ABI/testing/sysfs-devices-edac

+7 −7
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ Description: Read/Write attribute file that controls memory scrubbing. 


What:		/sys/devices/system/edac/mc/mc*/max_location

Date:		April 2012

Contact:	Mauro Carvalho Chehab <mchehab@redhat.com>

Contact:	Mauro Carvalho Chehab <m.chehab@samsung.com>

		linux-edac@vger.kernel.org

Description:	This attribute file displays the information about the last

		available memory slot in this memory controller. It is used by
@@ -85,7 +85,7 @@ Description: This attribute file displays the information about the last 


What:		/sys/devices/system/edac/mc/mc*/(dimm|rank)*/size

Date:		April 2012

Contact:	Mauro Carvalho Chehab <mchehab@redhat.com>

Contact:	Mauro Carvalho Chehab <m.chehab@samsung.com>

		linux-edac@vger.kernel.org

Description:	This attribute file will display the size of dimm or rank.

		For dimm*/size, this is the size, in MB of the DIMM memory
@@ -96,14 +96,14 @@ Description: This attribute file will display the size of dimm or rank. 


What:		/sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_dev_type

Date:		April 2012

Contact:	Mauro Carvalho Chehab <mchehab@redhat.com>

Contact:	Mauro Carvalho Chehab <m.chehab@samsung.com>

		linux-edac@vger.kernel.org

Description:	This attribute file will display what type of DRAM device is

		being utilized on this DIMM (x1, x2, x4, x8, ...).



What:		/sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_edac_mode

Date:		April 2012

Contact:	Mauro Carvalho Chehab <mchehab@redhat.com>

Contact:	Mauro Carvalho Chehab <m.chehab@samsung.com>

		linux-edac@vger.kernel.org

Description:	This attribute file will display what type of Error detection

		and correction is being utilized. For example: S4ECD4ED would
@@ -111,7 +111,7 @@ Description: This attribute file will display what type of Error detection 


What:		/sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_label

Date:		April 2012

Contact:	Mauro Carvalho Chehab <mchehab@redhat.com>

Contact:	Mauro Carvalho Chehab <m.chehab@samsung.com>

		linux-edac@vger.kernel.org

Description:	This control file allows this DIMM to have a label assigned

		to it. With this label in the module, when errors occur
@@ -126,14 +126,14 @@ Description: This control file allows this DIMM to have a label assigned 


What:		/sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_location

Date:		April 2012

Contact:	Mauro Carvalho Chehab <mchehab@redhat.com>

Contact:	Mauro Carvalho Chehab <m.chehab@samsung.com>

		linux-edac@vger.kernel.org

Description:	This attribute file will display the location (csrow/channel,

		branch/channel/slot or channel/slot) of the dimm or rank.



What:		/sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_mem_type

Date:		April 2012

Contact:	Mauro Carvalho Chehab <mchehab@redhat.com>

Contact:	Mauro Carvalho Chehab <m.chehab@samsung.com>

		linux-edac@vger.kernel.org

Description:	This attribute file will display what type of memory is

		currently on this csrow. Normally, either buffered or

Documentation/ABI/testing/sysfs-driver-intel-rapid-start

0 → 100644
+21 −0
Original line number Diff line number Diff line 
What:		/sys/bus/acpi/intel-rapid-start/wakeup_events

Date:		July 2, 2013

KernelVersion:	3.11

Contact:	Matthew Garrett <mjg59@srcf.ucam.org>

Description:	An integer representing a set of wakeup events as follows:

		1: Wake to enter hibernation when the wakeup timer expires

		2: Wake to enter hibernation when the battery reaches a

		critical level



		These values are ORed together. For example, a value of 3

		indicates that the system will wake to enter hibernation when

		either the wakeup timer expires or the battery reaches a

		critical level.



What:		/sys/bus/acpi/intel-rapid-start/wakeup_time

Date:		July 2, 2013

KernelVersion:	3.11

Contact:	Matthew Garrett <mjg59@srcf.ucam.org>

Description:	An integer representing the length of time the system will

		remain asleep before waking up to enter hibernation.

		This value is in minutes.

Documentation/DocBook/media/v4l/compat.xml

+12 −2
Original line number Diff line number Diff line
@@ -2254,7 +2254,7 @@ video encoding.</para> 
      <orderedlist>

	<listitem>

	  <para>The <constant>VIDIOC_G_CHIP_IDENT</constant> ioctl was renamed

to <constant>VIDIOC_G_CHIP_IDENT_OLD</constant> and &VIDIOC-DBG-G-CHIP-IDENT;

to <constant>VIDIOC_G_CHIP_IDENT_OLD</constant> and <constant>VIDIOC_DBG_G_CHIP_IDENT</constant>

was introduced in its place. The old struct <structname>v4l2_chip_ident</structname>

was renamed to <structname id="v4l2-chip-ident-old">v4l2_chip_ident_old</structname>.</para>

	</listitem>
@@ -2513,6 +2513,16 @@ that used it. It was originally scheduled for removal in 2.6.35. 
      </orderedlist>

    </section>



    <section>

      <title>V4L2 in Linux 3.11</title>

      <orderedlist>

        <listitem>

	  <para>Remove obsolete <constant>VIDIOC_DBG_G_CHIP_IDENT</constant> ioctl.

	  </para>

        </listitem>

      </orderedlist>

    </section>



    <section id="other">

      <title>Relation of V4L2 to other Linux multimedia APIs</title>
@@ -2596,7 +2606,7 @@ and may change in the future.</para> 
ioctls.</para>

        </listitem>

        <listitem>

	  <para>&VIDIOC-DBG-G-CHIP-IDENT; ioctl.</para>

	  <para>&VIDIOC-DBG-G-CHIP-INFO; ioctl.</para>

        </listitem>

        <listitem>

	  <para>&VIDIOC-ENUM-DV-TIMINGS;, &VIDIOC-QUERY-DV-TIMINGS; and