Merge 4.14.31 into android-4.14

Changes in 4.14.31
	MIPS: ralink: Remove ralink_halt()
	MIPS: ralink: Fix booting on MT7621
	MIPS: lantiq: Fix Danube USB clock
	MIPS: lantiq: Enable AHB Bus for USB
	MIPS: lantiq: ase: Enable MFD_SYSCON
	iio: chemical: ccs811: Corrected firmware boot/application mode transition
	iio: st_pressure: st_accel: pass correct platform data to init
	iio: adc: meson-saradc: unlock on error in meson_sar_adc_lock()
	ALSA: usb-audio: Fix parsing descriptor of UAC2 processing unit
	ALSA: aloop: Sync stale timer before release
	ALSA: aloop: Fix access to not-yet-ready substream via cable
	ALSA: hda - Force polling mode on CFL for fixing codec communication
	ALSA: hda/realtek - Fix speaker no sound after system resume
	ALSA: hda/realtek - Fix Dell headset Mic can't record
	ALSA: hda/realtek - Always immediately update mute LED with pin VREF
	mmc: core: Fix tracepoint print of blk_addr and blksz
	mmc: core: Disable HPI for certain Micron (Numonyx) eMMC cards
	mmc: block: fix updating ext_csd caches on ioctl call
	mmc: dw_mmc: Fix the DTO/CTO timeout overflow calculation for 32-bit systems
	mmc: dw_mmc: exynos: fix the suspend/resume issue for exynos5433
	mmc: dw_mmc: fix falling from idmac to PIO mode when dw_mci_reset occurs
	PCI: Add function 1 DMA alias quirk for Highpoint RocketRAID 644L
	ahci: Add PCI-id for the Highpoint Rocketraid 644L card
	lockdep: fix fs_reclaim warning
	clk: bcm2835: Fix ana->maskX definitions
	clk: bcm2835: Protect sections updating shared registers
	clk: sunxi-ng: a31: Fix CLK_OUT_* clock ops
	RDMA/mlx5: Fix crash while accessing garbage pointer and freed memory
	Drivers: hv: vmbus: Fix ring buffer signaling
	pinctrl: samsung: Validate alias coming from DT
	Bluetooth: btusb: Remove Yoga 920 from the btusb_needs_reset_resume_table
	Bluetooth: btusb: Add Dell OptiPlex 3060 to btusb_needs_reset_resume_table
	Bluetooth: btusb: Fix quirk for Atheros 1525/QCA6174
	libata: fix length validation of ATAPI-relayed SCSI commands
	libata: remove WARN() for DMA or PIO command without data
	libata: don't try to pass through NCQ commands to non-NCQ devices
	libata: Apply NOLPM quirk to Crucial MX100 512GB SSDs
	libata: disable LPM for Crucial BX100 SSD 500GB drive
	libata: Enable queued TRIM for Samsung SSD 860
	libata: Apply NOLPM quirk to Crucial M500 480 and 960GB SSDs
	libata: Make Crucial BX100 500GB LPM quirk apply to all firmware versions
	libata: Modify quirks for MX100 to limit NCQ_TRIM quirk to MU01 version
	cgroup: fix rule checking for threaded mode switching
	nfsd: remove blocked locks on client teardown
	hugetlbfs: check for pgoff value overflow
	h8300: remove extraneous __BIG_ENDIAN definition
	mm/vmalloc: add interfaces to free unmapped page table
	x86/mm: implement free pmd/pte page interfaces
	mm/khugepaged.c: convert VM_BUG_ON() to collapse fail
	mm/thp: do not wait for lock_page() in deferred_split_scan()
	mm/shmem: do not wait for lock_page() in shmem_unused_huge_shrink()
	Revert "mm: page_alloc: skip over regions of invalid pfns where possible"
	drm/vmwgfx: Fix black screen and device errors when running without fbdev
	drm/vmwgfx: Fix a destoy-while-held mutex problem.
	drm/radeon: Don't turn off DP sink when disconnected
	drm: Reject getfb for multi-plane framebuffers
	drm: udl: Properly check framebuffer mmap offsets
	mm/vmscan: wake up flushers for legacy cgroups too
	acpi, numa: fix pxm to online numa node associations
	ACPI / watchdog: Fix off-by-one error at resource assignment
	libnvdimm, {btt, blk}: do integrity setup before add_disk()
	brcmfmac: fix P2P_DEVICE ethernet address generation
	rtlwifi: rtl8723be: Fix loss of signal
	tracing: probeevent: Fix to support minus offset from symbol
	mtdchar: fix usage of mtd_ooblayout_ecc()
	mtd: nand: fsl_ifc: Fix nand waitfunc return value
	mtd: nand: fsl_ifc: Fix eccstat array overflow for IFC ver >= 2.0.0
	mtd: nand: fsl_ifc: Read ECCSTAT0 and ECCSTAT1 registers for IFC 2.0
	staging: ncpfs: memory corruption in ncp_read_kernel()
	can: peak/pcie_fd: fix echo_skb is occupied! bug
	can: peak/pcie_fd: remove useless code when interface starts
	can: ifi: Repair the error handling
	can: ifi: Check core revision upon probe
	can: cc770: Fix stalls on rt-linux, remove redundant IRQ ack
	can: cc770: Fix queue stall & dropped RTR reply
	can: cc770: Fix use after free in cc770_tx_interrupt()
	tty: vt: fix up tabstops properly
	x86/entry/64: Don't use IST entry for #BP stack
	selftests/x86/ptrace_syscall: Fix for yet more glibc interference
	x86/vsyscall/64: Use proper accessor to update P4D entry
	x86/efi: Free efi_pgd with free_pages()
	posix-timers: Protect posix clock array access against speculation
	kvm/x86: fix icebp instruction handling
	x86/build/64: Force the linker to use 2MB page size
	x86/boot/64: Verify alignment of the LOAD segment
	drm/syncobj: Stop reusing the same struct file for all syncobj -> fd
	perf/x86/intel/uncore: Fix Skylake UPI event format
	perf stat: Fix CVS output format for non-supported counters
	perf/core: Fix ctx_event_type in ctx_resched()
	perf/x86/intel: Don't accidentally clear high bits in bdw_limit_period()
	perf/x86/intel/uncore: Fix multi-domain PCI CHA enumeration bug on Skylake servers
	iio: ABI: Fix name of timestamp sysfs file
	iio: imu: st_lsm6dsx: fix endianness in st_lsm6dsx_read_oneshot()
	staging: android: ion: Zero CMA allocated memory
	staging: lustre: ptlrpc: kfree used instead of kvfree
	usb: xhci: Disable slot even when virt-dev is null
	usb: xhci: Fix potential memory leak in xhci_disable_slot()
	x86/pkeys/selftests: Rename 'si_pkey' to 'siginfo_pkey'
	kbuild: disable clang's default use of -fmerge-all-constants
	bpf: skip unnecessary capability check
	bpf, x64: increase number of passes
	Linux 4.14.31

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index 7eead5f97e02..64e65450f483 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -32,7 +32,7 @@ Description:
 		Description of the physical chip / device for device X.
 		Typically a part number.
 
-What:		/sys/bus/iio/devices/iio:deviceX/timestamp_clock
+What:		/sys/bus/iio/devices/iio:deviceX/current_timestamp_clock
 KernelVersion:	4.5
 Contact:	linux-iio@vger.kernel.org
 Description: