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

Commit d4dcd34c authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14.116 (85dc1a50) into msm-4.14 



* refs/heads/tmp-85dc1a50:
  Linux 4.14.116
  leds: pca9532: fix a potential NULL pointer dereference
  ptrace: take into account saved_sigmask in PTRACE{GET,SET}SIGMASK
  iommu/amd: Reserve exclusion range in iova-domain
  kconfig/[mn]conf: handle backspace (^H) key
  gpio: of: Fix of_gpiochip_add() error path
  libata: fix using DMA buffers on stack
  scsi: zfcp: reduce flood of fcrscn1 trace records on multi-element RSCN
  ceph: fix use-after-free on symlink traversal
  usb: u132-hcd: fix resource leak
  usb: usb251xb: fix to avoid potential NULL pointer dereference
  scsi: qla4xxx: fix a potential NULL pointer dereference
  drm/meson: Uninstall IRQ handler
  drm/meson: Fix invalid pointer in meson_drv_unbind()
  gpio: aspeed: fix a potential NULL pointer dereference
  net: ethernet: ti: fix possible object reference leak
  net: ibm: fix possible object reference leak
  net: xilinx: fix possible object reference leak
  NFS: Fix a typo in nfs_init_timeout_values()
  ARM: dts: imx6qdl: Fix typo in imx6qdl-icore-rqs.dtsi
  net/sched: don't dereference a->goto_chain to read the chain index
  net: macb: Add null check for PCLK and HCLK
  staging: rtlwifi: Fix potential NULL pointer dereference of kzalloc
  staging: rtl8712: uninitialized memory in read_bbreg_hdl()
  staging: rtlwifi: rtl8822b: fix to avoid potential NULL pointer dereference
  staging: rtl8188eu: Fix potential NULL pointer dereference of kcalloc
  net: ks8851: Set initial carrier state to down
  net: ks8851: Delay requesting IRQ until opened
  net: ks8851: Reassert reset pin if chip ID check fails
  net: ks8851: Dequeue RX packets explicitly
  ARM: dts: pfla02: increase phy reset duration
  usb: gadget: net2272: Fix net2272_dequeue()
  usb: gadget: net2280: Fix net2280_dequeue()
  usb: gadget: net2280: Fix overrun of OUT messages
  KVM: arm/arm64: vgic-its: Take the srcu lock when parsing the memslots
  serial: ar933x_uart: Fix build failure with disabled console
  sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init()
  s390/qeth: fix race when initializing the IP address table
  netfilter: bridge: set skb transport_header before entering NF_INET_PRE_ROUTING
  netfilter: nft_set_rbtree: check for inactive element after flag mismatch
  qlcnic: Avoid potential NULL pointer dereference
  s390: limit brk randomization to 32MB
  ARM: dts: bcm283x: Fix hdmi hpd gpio pull
  fs: prevent page refcount overflow in pipe_buf_get
  mm: prevent get_user_pages() from overflowing page refcount
  mm: add 'try_get_page()' helper function
  mm: make page ref count overflow check tighter and more explicit
  usbnet: ipheth: fix potential null pointer dereference in ipheth_carrier_set
  usbnet: ipheth: prevent TX queue timeouts when device not ready
  selinux: use kernel linux/socket.h for genheaders and mdp

Change-Id: I4c096d869f0c685cf3a107748bba0ffe3b20c029
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents c1042002 85dc1a50

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 115

SUBLEVEL = 116

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
};



&hdmi {

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;

	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;

};



&uart0 {

arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ 
	pinctrl-2 = <&pinctrl_usdhc3_200mhz>;

	vmcc-supply = <&reg_sd3_vmmc>;

	cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;

	bus-witdh = <4>;

	bus-width = <4>;

	no-1-8-v;

	status = "okay";

};
@@ -233,7 +233,7 @@ 
	pinctrl-1 = <&pinctrl_usdhc4_100mhz>;

	pinctrl-2 = <&pinctrl_usdhc4_200mhz>;

	vmcc-supply = <&reg_sd4_vmmc>;

	bus-witdh = <8>;

	bus-width = <8>;

	no-1-8-v;

	non-removable;

	status = "okay";

arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet>;

	phy-mode = "rgmii";

	phy-reset-duration = <10>; /* in msecs */

	phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;

	phy-supply = <&vdd_eth_io_reg>;

	status = "disabled";

arch/s390/include/asm/elf.h

+7 −4
Original line number Diff line number Diff line
@@ -252,11 +252,14 @@ do { \ 


/*

 * Cache aliasing on the latest machines calls for a mapping granularity

 * of 512KB. For 64-bit processes use a 512KB alignment and a randomization

 * of up to 1GB. For 31-bit processes the virtual address space is limited,

 * use no alignment and limit the randomization to 8MB.

 * of 512KB for the anonymous mapping base. For 64-bit processes use a

 * 512KB alignment and a randomization of up to 1GB. For 31-bit processes

 * the virtual address space is limited, use no alignment and limit the

 * randomization to 8MB.

 * For the additional randomization of the program break use 32MB for

 * 64-bit and 8MB for 31-bit.

 */

#define BRK_RND_MASK	(is_compat_task() ? 0x7ffUL : 0x3ffffUL)

#define BRK_RND_MASK	(is_compat_task() ? 0x7ffUL : 0x1fffUL)

#define MMAP_RND_MASK	(is_compat_task() ? 0x7ffUL : 0x3ff80UL)

#define MMAP_ALIGN_MASK	(is_compat_task() ? 0 : 0x7fUL)

#define STACK_RND_MASK	MMAP_RND_MASK