Commit 1b74ac08 authored May 16, 2019 by Ivaylo Georgiev

Merge android-4.19.36 (10f41ccf) into msm-4.19



* refs/heads/tmp-10f41ccf:
  Linux 4.19.36
  appletalk: Fix compile regression
  mm: hide incomplete nr_indirectly_reclaimable in sysfs
  mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo
  IB/hfi1: Failed to drain send queue when QP is put into error state
  bpf: fix use after free in bpf_evict_inode
  include/linux/swap.h: use offsetof() instead of custom __swapoffset macro
  f2fs: fix to dirty inode for i_mode recovery
  rxrpc: Fix client call connect/disconnect race
  lib/div64.c: off by one in shift
  appletalk: Fix use-after-free in atalk_proc_exit
  drm/amdkfd: use init_mqd function to allocate object for hid_mqd (CI)
  ARM: 8839/1: kprobe: make patch_lock a raw_spinlock_t
  drm/nouveau/volt/gf117: fix speedo readout register
  PCI: Blacklist power management of Gigabyte X299 DESIGNARE EX PCIe ports
  coresight: cpu-debug: Support for CA73 CPUs
  Revert "ACPI / EC: Remove old CLEAR_ON_RESUME quirk"
  crypto: axis - fix for recursive locking from bottom half
  drm/panel: panel-innolux: set display off in innolux_panel_unprepare
  lkdtm: Add tests for NULL pointer dereference
  lkdtm: Print real addresses
  soc/tegra: pmc: Drop locking from tegra_powergate_is_powered()
  scsi: core: Avoid that system resume triggers a kernel warning
  iommu/dmar: Fix buffer overflow during PCI bus notification
  net: ip6_gre: fix possible NULL pointer dereference in ip6erspan_set_version
  crypto: sha512/arm - fix crash bug in Thumb2 build
  crypto: sha256/arm - fix crash bug in Thumb2 build
  xfrm: destroy xfrm_state synchronously on net exit path
  net/rds: fix warn in rds_message_alloc_sgs
  ACPI: EC / PM: Disable non-wakeup GPEs for suspend-to-idle
  ALSA: hda: fix front speakers on Huawei MBXP
  drm/ttm: Fix bo_global and mem_global kfree error
  platform/x86: Add Intel AtomISP2 dummy / power-management driver
  kernel: hung_task.c: disable on suspend
  cifs: fallback to older infolevels on findfirst queryinfo retry
  net: stmmac: Set OWN bit for jumbo frames
  f2fs: cleanup dirty pages if recover failed
  netfilter: nf_flow_table: remove flowtable hook flush routine in netns exit routine
  compiler.h: update definition of unreachable()
  KVM: nVMX: restore host state in nested_vmx_vmexit for VMFail
  HID: usbhid: Add quirk for Redragon/Dragonrise Seymur 2
  ACPI / SBS: Fix GPE storm on recent MacBookPro's
  usbip: fix vhci_hcd controller counting
  ARM: samsung: Limit SAMSUNG_PM_CHECK config option to non-Exynos platforms
  pinctrl: core: make sure strcmp() doesn't get a null parameter
  HID: i2c-hid: override HID descriptors for certain devices
  Bluetooth: Fix debugfs NULL pointer dereference
  media: au0828: cannot kfree dev before usb disconnect
  powerpc/pseries: Remove prrn_work workqueue
  serial: uartps: console_setup() can't be placed to init section
  netfilter: xt_cgroup: shrink size of v2 path
  f2fs: fix to do sanity check with current segment number
  ASoC: Fix UBSAN warning at snd_soc_get/put_volsw_sx()
  9p locks: add mount option for lock retry interval
  9p: do not trust pdu content for stat item size
  f2fs: fix to avoid NULL pointer dereference on se->discard_map
  rsi: improve kernel thread handling to fix kernel panic
  gpio: pxa: handle corner case of unprobed device
  drm/cirrus: Use drm_framebuffer_put to avoid kernel oops in clean-up
  ext4: prohibit fstrim in norecovery mode
  x86/gart: Exclude GART aperture from kcore
  fix incorrect error code mapping for OBJECTID_NOT_FOUND
  x86/hw_breakpoints: Make default case in hw_breakpoint_arch_parse() return an error
  iommu/vt-d: Check capability before disabling protected memory
  drm/nouveau/debugfs: Fix check of pm_runtime_get_sync failure
  x86/cpu/cyrix: Use correct macros for Cyrix calls on Geode processors
  x86/hyperv: Prevent potential NULL pointer dereference
  x86/hpet: Prevent potential NULL pointer dereference
  irqchip/mbigen: Don't clear eventid when freeing an MSI
  irqchip/stm32: Don't clear rising/falling config registers at init
  drm/exynos/mixer: fix MIXER shadow registry synchronisation code
  blk-iolatency: #include "blk.h"
  PM / Domains: Avoid a potential deadlock
  ACPI / utils: Drop reference in test for device presence
  perf tests: Fix a memory leak in test__perf_evsel__tp_sched_test()
  perf tests: Fix memory leak by expr__find_other() in test__expr()
  perf tests: Fix a memory leak of cpu_map object in the openat_syscall_event_on_all_cpus test
  perf evsel: Free evsel->counts in perf_evsel__exit()
  perf hist: Add missing map__put() in error case
  perf top: Fix error handling in cmd_top()
  perf build-id: Fix memory leak in print_sdt_events()
  perf config: Fix a memory leak in collect_config()
  perf config: Fix an error in the config template documentation
  perf list: Don't forget to drop the reference to the allocated thread_map
  tools/power turbostat: return the exit status of a command
  x86/mm: Don't leak kernel addresses
  sched/core: Fix buffer overflow in cgroup2 property cpu.max
  sched/cpufreq: Fix 32-bit math overflow
  scsi: iscsi: flush running unbind operations when removing a session
  thermal/intel_powerclamp: fix truncated kthread name
  thermal/int340x_thermal: fix mode setting
  thermal/int340x_thermal: Add additional UUIDs
  thermal: bcm2835: Fix crash in bcm2835_thermal_debugfs
  thermal: samsung: Fix incorrect check after code merge
  thermal/intel_powerclamp: fix __percpu declaration of worker_data
  ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration
  mmc: davinci: remove extraneous __init annotation
  i40iw: Avoid panic when handling the inetdev event
  IB/mlx4: Fix race condition between catas error reset and aliasguid flows
  drm/udl: use drm_gem_object_put_unlocked.
  auxdisplay: hd44780: Fix memory leak on ->remove()
  ALSA: sb8: add a check for request_region
  ALSA: echoaudio: add a check for ioremap_nocache
  ext4: report real fs size after failed resize
  ext4: add missing brelse() in add_new_gdb_meta_bg()
  ext4: avoid panic during forced reboot
  perf/core: Restore mmap record type correctly
  inotify: Fix fsnotify_mark refcount leak in inotify_update_existing_watch()
  arc: hsdk_defconfig: Enable CONFIG_BLK_DEV_RAM
  ARC: u-boot args: check that magic number is correct
  ANDROID: cuttlefish_defconfig: Enable L2TP/PPTP
  ANDROID: Makefile: Properly resolve 4.19.35 merge
  Make arm64 serial port config compatible with crosvm

Conflicts:
	kernel/sched/cpufreq_schedutil.c

Change-Id: I8f049eb34344f72bf2d202c5e360f448771c78f4
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>

parents 853ed1ac 10f41ccf

MAINTAINERS

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7328,6 +7328,12 @@ L: alsa-devel@alsa-project.org (moderated for non-subscribers)
	S: Supported		S: Supported
	F: sound/soc/intel/		F: sound/soc/intel/

			INTEL ATOMISP2 DUMMY / POWER-MANAGEMENT DRIVER
			M: Hans de Goede <hdegoede@redhat.com>
			L: platform-driver-x86@vger.kernel.org
			S: Maintained
			F: drivers/platform/x86/intel_atomisp2_pm.c

	INTEL C600 SERIES SAS CONTROLLER DRIVER		INTEL C600 SERIES SAS CONTROLLER DRIVER
	M: Intel SCU Linux support <intel-linux-scu@intel.com>		M: Intel SCU Linux support <intel-linux-scu@intel.com>
	M: Artur Paszkiewicz <artur.paszkiewicz@intel.com>		M: Artur Paszkiewicz <artur.paszkiewicz@intel.com>

Makefile

+6 −2

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0		# SPDX-License-Identifier: GPL-2.0
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 19		PATCHLEVEL = 19
	SUBLEVEL = 35		SUBLEVEL = 36
	EXTRAVERSION =		EXTRAVERSION =
	NAME = "People's Front"		NAME = "People's Front"

	@@ -486,7 +486,11 @@ endif

	ifeq ($(cc-name),clang)		ifeq ($(cc-name),clang)
	ifneq ($(CROSS_COMPILE),)		ifneq ($(CROSS_COMPILE),)
	CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%))		CLANG_TRIPLE ?= $(CROSS_COMPILE)
			CLANG_FLAGS := --target=$(notdir $(CLANG_TRIPLE:%-=%))
			ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)
			$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")
			endif
	GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))		GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
	CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)		CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
	GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)		GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)

arch/arc/configs/hsdk_defconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,7 @@ CONFIG_NAMESPACES=y
	# CONFIG_UTS_NS is not set		# CONFIG_UTS_NS is not set
	# CONFIG_PID_NS is not set		# CONFIG_PID_NS is not set
	CONFIG_BLK_DEV_INITRD=y		CONFIG_BLK_DEV_INITRD=y
			CONFIG_BLK_DEV_RAM=y
	CONFIG_EMBEDDED=y		CONFIG_EMBEDDED=y
	CONFIG_PERF_EVENTS=y		CONFIG_PERF_EVENTS=y
	# CONFIG_VM_EVENT_COUNTERS is not set		# CONFIG_VM_EVENT_COUNTERS is not set

arch/arc/kernel/head.S

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -107,6 +107,7 @@ ENTRY(stext)
	; r2 = pointer to uboot provided cmdline or external DTB in mem		; r2 = pointer to uboot provided cmdline or external DTB in mem
	; These are handled later in handle_uboot_args()		; These are handled later in handle_uboot_args()
	st r0, [@uboot_tag]		st r0, [@uboot_tag]
			st r1, [@uboot_magic]
	st r2, [@uboot_arg]		st r2, [@uboot_arg]
	#endif		#endif

arch/arc/kernel/setup.c

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ unsigned int intr_to_DE_cnt;

	/* Part of U-boot ABI: see head.S */		/* Part of U-boot ABI: see head.S */
	int __initdata uboot_tag;		int __initdata uboot_tag;
			int __initdata uboot_magic;
	char __initdata *uboot_arg;		char __initdata *uboot_arg;

	const struct machine_desc *machine_desc;		const struct machine_desc *machine_desc;
	@@ -484,6 +485,8 @@ static inline bool uboot_arg_invalid(unsigned long addr)
	#define UBOOT_TAG_NONE 0		#define UBOOT_TAG_NONE 0
	#define UBOOT_TAG_CMDLINE 1		#define UBOOT_TAG_CMDLINE 1
	#define UBOOT_TAG_DTB 2		#define UBOOT_TAG_DTB 2
			/* We always pass 0 as magic from U-boot */
			#define UBOOT_MAGIC_VALUE 0

	void __init handle_uboot_args(void)		void __init handle_uboot_args(void)
	{		{
	@@ -499,6 +502,11 @@ void __init handle_uboot_args(void)
	goto ignore_uboot_args;		goto ignore_uboot_args;
	}		}

			if (uboot_magic != UBOOT_MAGIC_VALUE) {
			pr_warn(IGNORE_ARGS "non zero uboot magic\n");
			goto ignore_uboot_args;
			}

	if (uboot_tag != UBOOT_TAG_NONE &&		if (uboot_tag != UBOOT_TAG_NONE &&
	uboot_arg_invalid((unsigned long)uboot_arg)) {		uboot_arg_invalid((unsigned long)uboot_arg)) {
	pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);		pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);