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

Commit 26af4cd1 authored by Bharath's avatar Bharath
Browse files

Merge branch '294devices-r-FP3-MR3' into 'v1-r' 

FP3: Update to MR3

See merge request !13
parents 76ac3256 eff259ab

Documentation/ABI/testing/sysfs-ata

+3 −2
Original line number Diff line number Diff line
@@ -59,17 +59,18 @@ class 


dma_mode



	Transfer modes supported by the device when in DMA mode.

	DMA transfer mode used by the device.

	Mostly used by PATA device.



pio_mode



	Transfer modes supported by the device when in PIO mode.

	PIO transfer mode used by the device.

	Mostly used by PATA device.



xfer_mode



	Current transfer mode.

	Mostly used by PATA device.



id

Documentation/ABI/testing/sysfs-bus-iio

+2 −1
Original line number Diff line number Diff line
@@ -1491,7 +1491,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw 
KernelVersion:	4.3

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled no offset etc.) percentage reading of a substance.

		Raw (unscaled no offset etc.) reading of a substance. Units

		after application of scale and offset are percents.



What:		/sys/bus/iio/devices/iio:deviceX/in_resistance_raw

What:		/sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw

Documentation/ABI/testing/sysfs-bus-iio-vf610

+1 −1
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/conversion_mode

What:		/sys/bus/iio/devices/iio:deviceX/in_conversion_mode

KernelVersion:	4.2

Contact:	linux-iio@vger.kernel.org

Description:

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −0
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ What: /sys/devices/system/cpu/vulnerabilities 
		/sys/devices/system/cpu/vulnerabilities/srbds

		/sys/devices/system/cpu/vulnerabilities/tsx_async_abort

		/sys/devices/system/cpu/vulnerabilities/itlb_multihit

		/sys/devices/system/cpu/vulnerabilities/mmio_stale_data

Date:		January 2018

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Information about CPU vulnerabilities

Documentation/DocBook/libata.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ Many legacy IDE drivers use ata_bmdma_status() as the bmdma_status() hook. 


	<sect2><title>High-level taskfile hooks</title>

	<programlisting>

void (*qc_prep) (struct ata_queued_cmd *qc);

enum ata_completion_errors (*qc_prep) (struct ata_queued_cmd *qc);

int (*qc_issue) (struct ata_queued_cmd *qc);

	</programlisting>