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

Commit b4b59322 authored May 16, 2022 by Greg Kroah-Hartman

Merge 4.19.243 into android-4.19-stable



Changes in 4.19.243
	MIPS: Use address-of operator on section symbols
	block: drbd: drbd_nl: Make conversion to 'enum drbd_ret_code' explicit
	drm/amd/display/dc/gpio/gpio_service: Pass around correct dce_{version, environment} types
	nfp: bpf: silence bitwise vs. logical OR warning
	can: grcan: grcan_probe(): fix broken system id check for errata workaround needs
	can: grcan: only use the NAPI poll budget for RX
	Bluetooth: Fix the creation of hdev->name
	ALSA: pcm: Fix races among concurrent hw_params and hw_free calls
	ALSA: pcm: Fix races among concurrent read/write and buffer changes
	ALSA: pcm: Fix races among concurrent prepare and hw_params/hw_free calls
	ALSA: pcm: Fix races among concurrent prealloc proc writes
	ALSA: pcm: Fix potential AB/BA lock with buffer_mutex and mmap_lock
	mm: hugetlb: fix missing cache flush in copy_huge_page_from_user()
	mm: userfaultfd: fix missing cache flush in mcopy_atomic_pte() and __mcopy_atomic()
	VFS: Fix memory leak caused by concurrently mounting fs with subtype
	Linux 4.19.243

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I44b9e3ce71b3902ba330f785918ab2d8f0f2b7c6

parents 2a00428d 84bac3a0

Makefile

+1 −1

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

arch/mips/bmips/setup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ void __init plat_mem_setup(void)
		dtb = phys_to_virt(fw_arg2);
		else if (fw_passed_dtb) /* UHI interface */
		dtb = (void *)fw_passed_dtb;
		else if (__dtb_start != __dtb_end)
		else if (&__dtb_start != &__dtb_end)
		dtb = (void *)__dtb_start;
		else
		panic("no dtb found");

arch/mips/lantiq/prom.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ void __init plat_mem_setup(void)

		if (fw_passed_dtb) /* UHI interface */
		dtb = (void *)fw_passed_dtb;
		else if (__dtb_start != __dtb_end)
		else if (&__dtb_start != &__dtb_end)
		dtb = (void *)__dtb_start;
		else
		panic("no dtb found");

arch/mips/pic32/pic32mzda/init.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ static ulong get_fdtaddr(void)
		if (fw_passed_dtb && !fw_arg2 && !fw_arg3)
		return (ulong)fw_passed_dtb;

		if (__dtb_start < __dtb_end)
		if (&__dtb_start < &__dtb_end)
		ftaddr = (ulong)__dtb_start;

		return ftaddr;

arch/mips/ralink/of.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ void __init plat_mem_setup(void)
		*/
		if (fw_passed_dtb)
		dtb = (void *)fw_passed_dtb;
		else if (__dtb_start != __dtb_end)
		else if (&__dtb_start != &__dtb_end)
		dtb = (void *)__dtb_start;

		__dt_setup_arch(dtb);