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

Commit 11d6531a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.87 into android-4.14-p 



Changes in 4.14.87
	Kbuild: suppress packed-not-aligned warning for default setting only
	disable stringop truncation warnings for now
	test_hexdump: use memcpy instead of strncpy
	kobject: Replace strncpy with memcpy
	ALSA: intel_hdmi: Use strlcpy() instead of strncpy()
	unifdef: use memcpy instead of strncpy
	kernfs: Replace strncpy with memcpy
	ip_tunnel: Fix name string concatenate in __ip_tunnel_create()
	drm: gma500: fix logic error
	scsi: bfa: convert to strlcpy/strlcat
	staging: rts5208: fix gcc-8 logic error warning
	kdb: use memmove instead of overlapping memcpy
	iser: set sector for ambiguous mr status errors
	uprobes: Fix handle_swbp() vs. unregister() + register() race once more
	MIPS: ralink: Fix mt7620 nd_sd pinmux
	mips: fix mips_get_syscall_arg o32 check
	IB/mlx5: Avoid load failure due to unknown link width
	drm/ast: Fix incorrect free on ioregs
	drm: set is_master to 0 upon drm_new_set_master() failure
	drm/meson: Enable fast_io in meson_dw_hdmi_regmap_config
	drm/meson: Fix OOB memory accesses in meson_viu_set_osd_lut()
	userfaultfd: use ENOENT instead of EFAULT if the atomic copy user fails
	userfaultfd: shmem: allocate anonymous memory for MAP_PRIVATE shmem
	userfaultfd: shmem: add i_size checks
	userfaultfd: shmem: UFFDIO_COPY: set the page dirty if VM_WRITE is not set
	scsi: scsi_devinfo: cleanly zero-pad devinfo strings
	userfaultfd: shmem/hugetlbfs: only allow to register VM_MAYWRITE vmas
	ALSA: trident: Suppress gcc string warning
	kgdboc: Fix restrict error
	kgdboc: Fix warning with module build
	svm: Add mutex_lock to protect apic_access_page_done on AMD systems
	drm/msm: fix OF child-node lookup
	Input: xpad - quirk all PDP Xbox One gamepads
	Input: synaptics - add PNP ID for ThinkPad P50 to SMBus
	Input: matrix_keypad - check for errors from of_get_named_gpio()
	Input: cros_ec_keyb - fix button/switch capability reports
	Input: elan_i2c - add ELAN0620 to the ACPI table
	Input: elan_i2c - add ACPI ID for Lenovo IdeaPad 330-15ARR
	Input: elan_i2c - add support for ELAN0621 touchpad
	btrfs: tree-checker: Don't check max block group size as current max chunk size limit is unreliable
	btrfs: Always try all copies when reading extent buffers
	ARC: change defconfig defaults to ARCv2
	arc: [devboards] Add support of NFSv3 ACL
	udf: Allow mounting volumes with incorrect identification strings
	reset: make device_reset_optional() really optional
	reset: remove remaining WARN_ON() in <linux/reset.h>
	mm: cleancache: fix corruption on missed inode invalidation
	thermal/drivers/hisi: Remove the multiple sensors support
	thermal/drivers/hisi: Remove pointless lock
	thermal/drivers/hisi: Encapsulate register writes into helpers
	thermal/drivers/hisi: Fix configuration register setting
	thermal/drivers/hisi: Remove costly sensor inspection
	mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo
	net: qed: use correct strncpy() size
	tipc: use destination length for copy string
	Linux 4.14.87

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 8629d9bd ca48e5e3

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 86

SUBLEVEL = 87

EXTRAVERSION =

NAME = Petit Gorille
@@ -865,6 +865,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,) 
# disable pointer signed / unsigned warnings in gcc 4.0

KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)



# disable stringop warnings in gcc 8+

KBUILD_CFLAGS += $(call cc-disable-warning, stringop-truncation)



# disable invalid "can't wrap" optimizations for signed / pointers

KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)

arch/arc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ endmenu 


choice

	prompt "ARC Instruction Set"

	default ISA_ARCOMPACT

	default ISA_ARCV2



config ISA_ARCOMPACT

	bool "ARCompact ISA"

arch/arc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
# published by the Free Software Foundation.

#



KBUILD_DEFCONFIG := nsim_700_defconfig

KBUILD_DEFCONFIG := nsim_hs_defconfig



cflags-y	+= -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__

cflags-$(CONFIG_ISA_ARCOMPACT)	+= -mA7

arch/arc/configs/axs101_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ CONFIG_PERF_EVENTS=y 
# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_ISA_ARCOMPACT=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y
@@ -98,6 +99,7 @@ CONFIG_VFAT_FS=y 
CONFIG_NTFS_FS=y

CONFIG_TMPFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

arch/arc/configs/axs103_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ CONFIG_VFAT_FS=y 
CONFIG_NTFS_FS=y

CONFIG_TMPFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set