Commit db65bcfd authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge tag 'v3.18-rc1' into x86/urgent 



Reason:
Need to apply audit patch on top of v3.18-rc1.

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parents b47dcbdc f114040e

Documentation/ABI/testing/sysfs-block

+8 −0
Original line number Diff line number Diff line
@@ -53,6 +53,14 @@ Description: 
		512 bytes of data.





What:		/sys/block/<disk>/integrity/device_is_integrity_capable

Date:		July 2014

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Indicates whether a storage device is capable of storing

		integrity metadata. Set if the device is T10 PI-capable.





What:		/sys/block/<disk>/integrity/write_generate

Date:		June 2008

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

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

+49 −562

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/ABI/testing/sysfs-class-power

+14 −0
Original line number Diff line number Diff line
@@ -18,3 +18,17 @@ Description: 
		This file is writeable and can be used to set the assumed

		battery 'full level'. As batteries age, this value has to be

		amended over time.



What:		/sys/class/power_supply/max14577-charger/device/fast_charge_timer

Date:		October 2014

KernelVersion:	3.18.0

Contact:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

Description:

		This entry shows and sets the maximum time the max14577

		charger operates in fast-charge mode. When the timer expires

		the device will terminate fast-charge mode (charging current

		will drop to 0 A) and will trigger interrupt.



		Valid values:

		- 5, 6 or 7 (hours),

		- 0: disabled.

Documentation/DocBook/drm.tmpl

+14 −2
Original line number Diff line number Diff line
@@ -291,10 +291,9 @@ char *date;</synopsis> 
      <title>Device Registration</title>

      <para>

        A number of functions are provided to help with device registration.

        The functions deal with PCI, USB and platform devices, respectively.

        The functions deal with PCI and platform devices, respectively.

      </para>

!Edrivers/gpu/drm/drm_pci.c

!Edrivers/gpu/drm/drm_usb.c

!Edrivers/gpu/drm/drm_platform.c

      <para>

        New drivers that no longer rely on the services provided by the
@@ -3386,6 +3385,13 @@ void (*disable_vblank) (struct drm_device *dev, int crtc);</synopsis> 
      by scheduling a timer. The delay is accessible through the vblankoffdelay

      module parameter or the <varname>drm_vblank_offdelay</varname> global

      variable and expressed in milliseconds. Its default value is 5000 ms.

      Zero means never disable, and a negative value means disable immediately.

      Drivers may override the behaviour by setting the

      <structname>drm_device</structname>

      <structfield>vblank_disable_immediate</structfield> flag, which when set

      causes vblank interrupts to be disabled immediately regardless of the

      drm_vblank_offdelay value. The flag should only be set if there's a

      properly working hardware vblank counter present.

    </para>

    <para>

      When a vertical blanking interrupt occurs drivers only need to call the
@@ -3400,6 +3406,7 @@ void (*disable_vblank) (struct drm_device *dev, int crtc);</synopsis> 
    <sect2>

      <title>Vertical Blanking and Interrupt Handling Functions Reference</title>

!Edrivers/gpu/drm/drm_irq.c

!Finclude/drm/drmP.h drm_crtc_vblank_waitqueue

    </sect2>

  </sect1>
@@ -3918,6 +3925,11 @@ int num_ioctls;</synopsis> 
!Pdrivers/gpu/drm/i915/i915_cmd_parser.c batch buffer command parser

!Idrivers/gpu/drm/i915/i915_cmd_parser.c

      </sect2>

      <sect2>

        <title>Logical Rings, Logical Ring Contexts and Execlists</title>

!Pdrivers/gpu/drm/i915/intel_lrc.c Logical Rings, Logical Ring Contexts and Execlists

!Idrivers/gpu/drm/i915/intel_lrc.c

      </sect2>

    </sect1>

  </chapter>

</part>

Documentation/acpi/enumeration.txt

+27 −0
Original line number Diff line number Diff line
@@ -312,3 +312,30 @@ a code like this: 


There are also devm_* versions of these functions which release the

descriptors once the device is released.



MFD devices

~~~~~~~~~~~

The MFD devices register their children as platform devices. For the child

devices there needs to be an ACPI handle that they can use to reference

parts of the ACPI namespace that relate to them. In the Linux MFD subsystem

we provide two ways:



	o The children share the parent ACPI handle.

	o The MFD cell can specify the ACPI id of the device.



For the first case, the MFD drivers do not need to do anything. The

resulting child platform device will have its ACPI_COMPANION() set to point

to the parent device.



If the ACPI namespace has a device that we can match using an ACPI id,

the id should be set like:



	static struct mfd_cell my_subdevice_cell = {

		.name = "my_subdevice",

		/* set the resources relative to the parent */

		.acpi_pnpid = "XYZ0001",

	};



The ACPI id "XYZ0001" is then used to lookup an ACPI device directly under

the MFD device and if found, that ACPI companion device is bound to the

resulting child platform device.