Commit 124f6fb7 authored Jan 25, 2019 by Blagovest Kolenichev

Merge android-4.14-p.87 (11d6531a) into msm-4.14



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

Change-Id: I8b6e611925fe710d944256d011f76e29869f7508
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>

parents 63690ffd 11d6531a

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

		@@ -897,6 +897,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