Merge 4.19.169 into android-4.19-stable (ea0aa597) · Commits · e / devices / android_kernel_oneplus_sm7250

Changes in 4.19.169 ASoC: dapm: remove widget from dirty list on free x86/hyperv: check cpu mask after interrupt has been disabled tracing/kprobes: Do the notrace functions check without kprobes on ftrace MIPS: boot: Fix unaligned access with CONFIG_MIPS_RAW_APPENDED_DTB MIPS: relocatable: fix possible boot hangup with KASLR enabled ACPI: scan: Harden acpi_device_add() against device ID overflows mm/hugetlb: fix potential missing huge page size info dm snapshot: flush merged data before committing metadata dm integrity: fix the maximum number of arguments r8152: Add Lenovo Powered USB-C Travel Hub ext4: fix bug for rename with RENAME_WHITEOUT ARC: build: remove non-existing bootpImage from KBUILD_IMAGE ARC: build: add uImage.lzma to the top-level target ARC: build: add boot_targets to PHONY btrfs: fix transaction leak and crash after RO remount caused by qgroup rescan ethernet: ucc_geth: fix definition and size of ucc_geth_tx_global_pram bfq: Fix computation of shallow depth arch/arc: add copy_user_page() to <asm/page.h> to fix build error on ARC misdn: dsp: select CONFIG_BITREVERSE net: ethernet: fs_enet: Add missing MODULE_LICENSE ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI drm/msm: Call msm_init_vram before binding the gpu ARM: picoxcell: fix missing interrupt-parent properties ima: Remove __init annotation from ima_pcrread() dump_common_audit_data(): fix racy accesses to ->d_name ASoC: meson: axg-tdm-interface: fix loopback ASoC: Intel: fix error code cnl_set_dsp_D0() NFS4: Fix use-after-free in trace_event_raw_event_nfs4_set_lock pNFS: Mark layout for return if return-on-close was not sent NFS/pNFS: Fix a leak of the layout 'plh_outstanding' counter NFS: nfs_igrab_and_active must first reference the superblock ext4: fix superblock checksum failure when setting password salt RDMA/usnic: Fix memleak in find_free_vf_and_create_qp_grp RDMA/mlx5: Fix wrong free of blue flame register on error mm, slub: consider rest of partial list if acquire_slab() fails net: sunrpc: interpret the return value of kstrtou32 correctly dm: eliminate potential source of excessive kernel log noise ALSA: firewire-tascam: Fix integer overflow in midi_port_work() ALSA: fireface: Fix integer overflow in transmit_midi_msg() netfilter: conntrack: fix reading nf_conntrack_buckets netfilter: nf_nat: Fix memleak in nf_nat_init kbuild: enforce -Werror=return-type Linux 4.19.169 Signed-off-by:

Greg Kroah-Hartman <gregkh@google.com> Change-Id: I74309249e2b6a77421acd7f8d19f60cc48c328db

Makefile

+2 −2

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

		@@ -438,7 +438,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__
		KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
		-fno-strict-aliasing -fno-common -fshort-wchar \
		-Werror-implicit-function-declaration \
		-Wno-format-security \
		-Werror=return-type -Wno-format-security \
		-std=gnu89
		KBUILD_CPPFLAGS := -D__KERNEL__
		KBUILD_AFLAGS_KERNEL :=

arch/arc/Makefile

+2 −7

Original line number	Diff line number	Diff line
		@@ -91,14 +91,9 @@ libs-y += arch/arc/lib/ $(LIBGCC)

		boot := arch/arc/boot

		#default target for make without any arguments.
		KBUILD_IMAGE := $(boot)/bootpImage

		all: bootpImage
		bootpImage: vmlinux

		boot_targets += uImage uImage.bin uImage.gz
		boot_targets := uImage uImage.bin uImage.gz uImage.lzma

		PHONY += $(boot_targets)
		$(boot_targets): vmlinux
		$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

arch/arc/include/asm/page.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		#ifndef __ASSEMBLY__

		#define clear_page(paddr) memset((paddr), 0, PAGE_SIZE)
		#define copy_user_page(to, from, vaddr, pg) copy_page(to, from)
		#define copy_page(to, from) memcpy((to), (from), PAGE_SIZE)

		struct vm_area_struct;

arch/arm/boot/dts/picoxcell-pc3x2.dtsi

+4 −0

Original line number	Diff line number	Diff line
		@@ -54,18 +54,21 @@
		emac: gem@30000 {
		compatible = "cadence,gem";
		reg = <0x30000 0x10000>;
		interrupt-parent = <&vic0>;
		interrupts = <31>;
		};

		dmac1: dmac@40000 {
		compatible = "snps,dw-dmac";
		reg = <0x40000 0x10000>;
		interrupt-parent = <&vic0>;
		interrupts = <25>;
		};

		dmac2: dmac@50000 {
		compatible = "snps,dw-dmac";
		reg = <0x50000 0x10000>;
		interrupt-parent = <&vic0>;
		interrupts = <26>;
		};

		@@ -243,6 +246,7 @@
		axi2pico@c0000000 {
		compatible = "picochip,axi2pico-pc3x2";
		reg = <0xc0000000 0x10000>;
		interrupt-parent = <&vic0>;
		interrupts = <13 14 15 16 17 18 19 20 21>;
		};
		};

arch/mips/boot/compressed/decompress.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#include <linux/libfdt.h>

		#include <asm/addrspace.h>
		#include <asm/unaligned.h>

		/*
		* These two variables specify the free mem region
		@@ -117,7 +118,7 @@ void decompress_kernel(unsigned long boot_heap_start)
		dtb_size = fdt_totalsize((void *)&__appended_dtb);

		/* last four bytes is always image size in little endian */
		image_size = le32_to_cpup((void *)&__image_end - 4);
		image_size = get_unaligned_le32((void *)&__image_end - 4);

		/* copy dtb to where the booted kernel will expect it */
		memcpy((void *)VMLINUX_LOAD_ADDRESS_ULL + image_size,