Commit d6bbe8be authored Apr 08, 2018 by Greg Kroah-Hartman

Merge 4.4.127 into android-4.4



Changes in 4.4.127
	mtd: jedec_probe: Fix crash in jedec_read_mfr()
	ALSA: pcm: Use dma_bytes as size parameter in dma_mmap_coherent()
	ALSA: pcm: potential uninitialized return values
	perf/hwbp: Simplify the perf-hwbp code, fix documentation
	partitions/msdos: Unable to mount UFS 44bsd partitions
	usb: gadget: define free_ep_req as universal function
	usb: gadget: change len to size_t on alloc_ep_req()
	usb: gadget: fix usb_ep_align_maybe endianness and new usb_ep_align
	usb: gadget: align buffer size when allocating for OUT endpoint
	usb: gadget: f_hid: fix: Prevent accessing released memory
	kprobes/x86: Fix to set RWX bits correctly before releasing trampoline
	ACPI, PCI, irq: remove redundant check for null string pointer
	writeback: fix the wrong congested state variable definition
	PCI: Make PCI_ROM_ADDRESS_MASK a 32-bit constant
	dm ioctl: remove double parentheses
	Input: mousedev - fix implicit conversion warning
	netfilter: nf_nat_h323: fix logical-not-parentheses warning
	genirq: Use cpumask_available() for check of cpumask variable
	cpumask: Add helper cpumask_available()
	selinux: Remove unnecessary check of array base in selinux_set_mapping()
	fs: compat: Remove warning from COMPATIBLE_IOCTL
	jiffies.h: declare jiffies and jiffies_64 with ____cacheline_aligned_in_smp
	frv: declare jiffies to be located in the .data section
	audit: add tty field to LOGIN event
	tty: provide tty_name() even without CONFIG_TTY
	netfilter: ctnetlink: Make some parameters integer to avoid enum mismatch
	selinux: Remove redundant check for unknown labeling behavior
	arm64: avoid overflow in VA_START and PAGE_OFFSET
	xfrm_user: uncoditionally validate esn replay attribute struct
	RDMA/ucma: Check AF family prior resolving address
	RDMA/ucma: Fix use-after-free access in ucma_close
	RDMA/ucma: Ensure that CM_ID exists prior to access it
	RDMA/ucma: Check that device is connected prior to access it
	RDMA/ucma: Check that device exists prior to accessing it
	RDMA/ucma: Don't allow join attempts for unsupported AF family
	RDMA/ucma: Introduce safer rdma_addr_size() variants
	net: xfrm: use preempt-safe this_cpu_read() in ipcomp_alloc_tfms()
	xfrm: Refuse to insert 32 bit userspace socket policies on 64 bit systems
	netfilter: bridge: ebt_among: add more missing match size checks
	netfilter: x_tables: add and use xt_check_proc_name
	Bluetooth: Fix missing encryption refresh on Security Request
	llist: clang: introduce member_address_is_nonnull()
	scsi: virtio_scsi: always read VPD pages for multiqueue too
	usb: dwc2: Improve gadget state disconnection handling
	USB: serial: ftdi_sio: add RT Systems VX-8 cable
	USB: serial: ftdi_sio: add support for Harman FirmwareHubEmulator
	USB: serial: cp210x: add ELDAT Easywave RX09 id
	mei: remove dev_err message on an unsupported ioctl
	media: usbtv: prevent double free in error case
	parport_pc: Add support for WCH CH382L PCI-E single parallel port card.
	crypto: ahash - Fix early termination in hash walk
	crypto: x86/cast5-avx - fix ECB encryption when long sg follows short one
	fs/proc: Stop trying to report thread stacks
	staging: comedi: ni_mio_common: ack ai fifo error interrupts.
	Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list
	Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad
	vt: change SGR 21 to follow the standards
	Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition
	ARM: dts: dra7: Add power hold and power controller properties to palmas
	ARM: dts: am57xx-beagle-x15-common: Add overide powerhold property
	md/raid10: reset the 'first' at the end of loop
	net: hns: Fix ethtool private flags
	nospec: Move array_index_nospec() parameter checking into separate macro
	nospec: Kill array_index_nospec_mask_check()
	Revert "PCI/MSI: Stop disabling MSI/MSI-X in pci_device_shutdown()"
	Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin"
	Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin"
	Revert "cpufreq: Fix governor module removal race"
	Revert "mtip32xx: use runtime tag to initialize command header"
	spi: davinci: fix up dma_mapping_error() incorrect patch
	net: cavium: liquidio: fix up "Avoid dma_unmap_single on uninitialized ndata"
	Revert "ip6_vti: adjust vti mtu according to mtu of lower device"
	Linux 4.4.127

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

parents 64bc01b0 2cad7a1d

Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,15 @@ Optional properties:
		- ti,palmas-enable-dvfs2: Enable DVFS2. Configure pins for DVFS2 mode.
		Selection primary or secondary function associated to GPADC_START
		and SYSEN2 pin/pad for DVFS2 interface
		- ti,palmas-override-powerhold: This is applicable for PMICs for which
		GPIO7 is configured in POWERHOLD mode which has higher priority
		over DEV_ON bit and keeps the PMIC supplies on even after the DEV_ON
		bit is turned off. This property enables driver to over ride the
		POWERHOLD value to GPIO7 so as to turn off the PMIC in power off
		scenarios. So for GPIO7 if ti,palmas-override-powerhold is set
		then the GPIO_7 field should never be muxed to anything else.
		It should be set to POWERHOLD by default and only in case of
		power off scenarios the driver will over ride the mux value.

		This binding uses the following generic properties as defined in
		pinctrl-bindings.txt:

Documentation/filesystems/proc.txt

+0 −26

Original line number	Diff line number	Diff line
		@@ -386,32 +386,6 @@ is not associated with a file:

		or if empty, the mapping is anonymous.

		The /proc/PID/task/TID/maps is a view of the virtual memory from the viewpoint
		of the individual tasks of a process. In this file you will see a mapping marked
		as [stack] if that task sees it as a stack. Hence, for the example above, the
		task-level map, i.e. /proc/PID/task/TID/maps for thread 1001 will look like this:

		08048000-08049000 r-xp 00000000 03:00 8312 /opt/test
		08049000-0804a000 rw-p 00001000 03:00 8312 /opt/test
		0804a000-0806b000 rw-p 00000000 00:00 0 [heap]
		a7cb1000-a7cb2000 ---p 00000000 00:00 0
		a7cb2000-a7eb2000 rw-p 00000000 00:00 0
		a7eb2000-a7eb3000 ---p 00000000 00:00 0
		a7eb3000-a7ed5000 rw-p 00000000 00:00 0 [stack]
		a7ed5000-a8008000 r-xp 00000000 03:00 4222 /lib/libc.so.6
		a8008000-a800a000 r--p 00133000 03:00 4222 /lib/libc.so.6
		a800a000-a800b000 rw-p 00135000 03:00 4222 /lib/libc.so.6
		a800b000-a800e000 rw-p 00000000 00:00 0
		a800e000-a8022000 r-xp 00000000 03:00 14462 /lib/libpthread.so.0
		a8022000-a8023000 r--p 00013000 03:00 14462 /lib/libpthread.so.0
		a8023000-a8024000 rw-p 00014000 03:00 14462 /lib/libpthread.so.0
		a8024000-a8027000 rw-p 00000000 00:00 0
		a8027000-a8043000 r-xp 00000000 03:00 8317 /lib/ld-linux.so.2
		a8043000-a8044000 r--p 0001b000 03:00 8317 /lib/ld-linux.so.2
		a8044000-a8045000 rw-p 0001c000 03:00 8317 /lib/ld-linux.so.2
		aff35000-aff4a000 rw-p 00000000 00:00 0
		ffffe000-fffff000 r-xp 00000000 00:00 0 [vdso]

		The /proc/PID/smaps is an extension based on maps, showing the memory
		consumption for each of the process's mappings. For each of mappings there
		is a series of lines such as the following:

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 126
		SUBLEVEL = 127
		EXTRAVERSION =
		NAME = Blurry Fish Butt

arch/arm/boot/dts/am335x-pepper.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@
		&audio_codec {
		status = "okay";

		reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
		gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>;
		AVDD-supply = <&ldo3_reg>;
		IOVDD-supply = <&ldo3_reg>;
		DRVDD-supply = <&ldo3_reg>;

arch/arm/boot/dts/am57xx-beagle-x15.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -411,6 +411,7 @@
		interrupt-controller;

		ti,system-power-controller;
		ti,palmas-override-powerhold;

		tps659038_pmic {
		compatible = "ti,tps659038-pmic";