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

Commit 7870b283 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.136 into android-4.14-q 



Changes in 4.14.136
	VSOCK: use TCP state constants for sk_state
	vsock: correct removal of socket from the list
	NFS: Fix dentry revalidation on NFSv4 lookup
	NFS: Refactor nfs_lookup_revalidate()
	NFSv4: Fix lookup revalidate of regular files
	arm64: dts: marvell: Fix A37xx UART0 register size
	i2c: qup: fixed releasing dma without flush operation completion
	arm64: compat: Provide definition for COMPAT_SIGMINSTKSZ
	binder: fix possible UAF when freeing buffer
	ISDN: hfcsusb: checking idx of ep configuration
	media: au0828: fix null dereference in error path
	ath10k: Change the warning message string
	media: cpia2_usb: first wake up, then free in disconnect
	media: pvrusb2: use a different format for warnings
	NFS: Cleanup if nfs_match_client is interrupted
	media: radio-raremono: change devm_k*alloc to k*alloc
	iommu/vt-d: Don't queue_iova() if there is no flush queue
	iommu/iova: Fix compilation error with !CONFIG_IOMMU_IOVA
	hv_sock: Add support for delayed close
	Bluetooth: hci_uart: check for missing tty operations
	sched/fair: Don't free p->numa_faults with concurrent readers
	drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl
	Fix allyesconfig output.
	ceph: hold i_ceph_lock when removing caps for freeing inode
	ip_tunnel: allow not to count pkts on tstats by setting skb's dev to NULL
	Linux 4.14.136

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 935e2aee 7d80e121

Documentation/devicetree/bindings/serial/mvebu-uart.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ Required properties: 
Example:

	serial@12000 {

		compatible = "marvell,armada-3700-uart";

		reg = <0x12000 0x400>;

		reg = <0x12000 0x200>;

		interrupts = <43>;

	};

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 135

SUBLEVEL = 136

EXTRAVERSION =

NAME = Petit Gorille

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ 


			uart0: serial@12000 {

				compatible = "marvell,armada-3700-uart";

				reg = <0x12000 0x400>;

				reg = <0x12000 0x200>;

				interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

			};

arch/arm64/include/asm/compat.h

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr) 
}



#define compat_user_stack_pointer() (user_stack_pointer(task_pt_regs(current)))

#define COMPAT_MINSIGSTKSZ	2048



static inline void __user *arch_compat_alloc_user_space(long len)

{

arch/sh/boards/Kconfig

+3 −11
Original line number Diff line number Diff line
@@ -8,27 +8,19 @@ config SH_ALPHA_BOARD 
	bool



config SH_DEVICE_TREE

	bool "Board Described by Device Tree"

	bool

	select OF

	select OF_EARLY_FLATTREE

	select TIMER_OF

	select COMMON_CLK

	select GENERIC_CALIBRATE_DELAY

	help

	  Select Board Described by Device Tree to build a kernel that

	  does not hard-code any board-specific knowledge but instead uses

	  a device tree blob provided by the boot-loader. You must enable

	  drivers for any hardware you want to use separately. At this

	  time, only boards based on the open-hardware J-Core processors

	  have sufficient driver coverage to use this option; do not

	  select it if you are using original SuperH hardware.



config SH_JCORE_SOC

	bool "J-Core SoC"

	depends on SH_DEVICE_TREE && (CPU_SH2 || CPU_J2)

	select SH_DEVICE_TREE

	select CLKSRC_JCORE_PIT

	select JCORE_AIC

	default y if CPU_J2

	depends on CPU_J2

	help

	  Select this option to include drivers core components of the

	  J-Core SoC, including interrupt controllers and timers.