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

Commit eff259ab authored by Bharath's avatar Bharath
Browse files

Merge branch 'int/11/fp3' into v1-r 

* 'int/11/fp3': (6149 commits)
  Linux 4.9.327
  kprobes: don't call disarm_kprobe() for disabled kprobes
  mm/rmap: Fix anon_vma->degree ambiguity leading to double-reuse
  netfilter: conntrack: NF_CONNTRACK_PROCFS should no longer default to y
  s390/hypfs: avoid error message under KVM
  arm64: map FDT as RW for early_init_dt_scan()
  ftrace: Fix NULL pointer dereference in is_ftrace_trampoline when ftrace is dead
  fbdev: fb_pm2fb: Avoid potential divide by zero error
  HID: hidraw: fix memory leak in hidraw_release()
  media: pvrusb2: fix memory leak in pvr_probe
  Bluetooth: L2CAP: Fix build errors in some archs
  kbuild: Fix include path in scripts/Makefile.modpost
  x86/bugs: Add "unknown" reporting for MMIO Stale Data
  x86/cpu: Add Tiger Lake to Intel family
  s390/mm: do not trigger write fault when vma does not allow VM_WRITE
  mm: Force TLB flush for PFNMAP mappings before unlink_file_vma()
  mm/hugetlb: fix hugetlb not supporting softdirty tracking
  asm-generic: sections: refactor memory_intersects
  loop: Check for overflow while configuring loop
  btrfs: check if root is readonly while setting security xattr
  ...

Change-Id: I90bc881b22983d3c97219674ca2f0093944fba17
parents 76ac3256 9415be53

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>