Merge 5.4.27 into android-5.4 (16ada3b3) · Commits · e / devices / android_kernel_fairphone_FP5

Changes in 5.4.27 netfilter: hashlimit: do not use indirect calls during gc netfilter: xt_hashlimit: unregister proc file before releasing mutex drm/amdgpu: Fix TLB invalidation request when using semaphore ACPI: watchdog: Allow disabling WDAT at boot HID: apple: Add support for recent firmware on Magic Keyboards ACPI: watchdog: Set default timeout in probe HID: i2c-hid: add Trekstor Surfbook E11B to descriptor override HID: hid-bigbenff: fix general protection fault caused by double kfree HID: hid-bigbenff: call hid_hw_stop() in case of error HID: hid-bigbenff: fix race condition for scheduled work during removal selftests/rseq: Fix out-of-tree compilation tracing: Fix number printing bug in print_synth_event() cfg80211: check reg_rule for NULL in handle_channel_custom() scsi: libfc: free response frame from GPN_ID net: usb: qmi_wwan: restore mtu min/max values after raw_ip switch net: ks8851-ml: Fix IRQ handling and locking mac80211: rx: avoid RCU list traversal under mutex net: ll_temac: Fix race condition causing TX hang net: ll_temac: Add more error handling of dma_map_single() calls net: ll_temac: Fix RX buffer descriptor handling on GFP_ATOMIC pressure net: ll_temac: Handle DMA halt condition caused by buffer underrun blk-mq: insert passthrough request into hctx->dispatch directly drm/amdgpu: fix memory leak during TDR test(v2) kbuild: add dtbs_check to PHONY kbuild: add dt_binding_check to PHONY in a correct place signal: avoid double atomic counter increments for user accounting slip: not call free_netdev before rtnl_unlock in slip_open net: phy: mscc: fix firmware paths hinic: fix a irq affinity bug hinic: fix a bug of setting hw_ioctxt hinic: fix a bug of rss configuration net: rmnet: fix NULL pointer dereference in rmnet_newlink() net: rmnet: fix NULL pointer dereference in rmnet_changelink() net: rmnet: fix suspicious RCU usage net: rmnet: remove rcu_read_lock in rmnet_force_unassociate_device() net: rmnet: do not allow to change mux id if mux id is duplicated net: rmnet: use upper/lower device infrastructure net: rmnet: fix bridge mode bugs net: rmnet: fix packet forwarding in rmnet bridge mode sfc: fix timestamp reconstruction at 16-bit rollover points jbd2: fix data races at struct journal_head blk-mq: insert flush request to the front of dispatch queue net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional() ARM: 8958/1: rename missed uaccess .fixup section mm: slub: add missing TID bump in kmem_cache_alloc_bulk() HID: google: add moonball USB id HID: add ALWAYS_POLL quirk to lenovo pixart mouse ARM: 8961/2: Fix Kbuild issue caused by per-task stack protector GCC plugin ipv4: ensure rcu_read_lock() in cipso_v4_error() Linux 5.4.27 Signed-off-by:

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

Documentation/admin-guide/kernel-parameters.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -136,6 +136,10 @@
		dynamic table installation which will install SSDT
		tables to /sys/firmware/acpi/tables/dynamic.

		acpi_no_watchdog [HW,ACPI,WDT]
		Ignore the ACPI-based watchdog interface (WDAT) and let
		a native driver control the watchdog device instead.

		acpi_rsdp= [ACPI,EFI,KEXEC]
		Pass the RSDP address to the kernel, mostly used
		on machines running EFI runtime service to boot the

Makefile

+3 −2

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 5
		PATCHLEVEL = 4
		SUBLEVEL = 26
		SUBLEVEL = 27
		EXTRAVERSION =
		NAME = Kleptomaniac Octopus

		@@ -1304,7 +1304,7 @@ ifneq ($(dtstree),)
		%.dtb: include/config/kernel.release scripts_dtc
		$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@

		PHONY += dtbs dtbs_install dt_binding_check
		PHONY += dtbs dtbs_install dtbs_check
		dtbs dtbs_check: include/config/kernel.release scripts_dtc
		$(Q)$(MAKE) $(build)=$(dtstree)

		@@ -1324,6 +1324,7 @@ PHONY += scripts_dtc
		scripts_dtc: scripts_basic
		$(Q)$(MAKE) $(build)=scripts/dtc

		PHONY += dt_binding_check
		dt_binding_check: scripts_dtc
		$(Q)$(MAKE) $(build)=Documentation/devicetree/bindings

arch/arm/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -307,13 +307,15 @@ endif
		ifeq ($(CONFIG_STACKPROTECTOR_PER_TASK),y)
		prepare: stack_protector_prepare
		stack_protector_prepare: prepare0
		$(eval KBUILD_CFLAGS += \
		$(eval SSP_PLUGIN_CFLAGS := \
		-fplugin-arg-arm_ssp_per_task_plugin-tso=$(shell \
		awk '{if ($$2 == "THREAD_SZ_ORDER") print $$3;}'\
		include/generated/asm-offsets.h) \
		-fplugin-arg-arm_ssp_per_task_plugin-offset=$(shell \
		awk '{if ($$2 == "TI_STACK_CANARY") print $$3;}'\
		include/generated/asm-offsets.h))
		$(eval KBUILD_CFLAGS += $(SSP_PLUGIN_CFLAGS))
		$(eval GCC_PLUGINS_CFLAGS += $(SSP_PLUGIN_CFLAGS))
		endif

		all: $(notdir $(KBUILD_IMAGE))

arch/arm/boot/compressed/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -101,7 +101,6 @@ clean-files += piggy_data lib1funcs.S ashldi3.S bswapsdi2.S \
		$(libfdt) $(libfdt_hdrs) hyp-stub.S

		KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
		KBUILD_CFLAGS += $(DISABLE_ARM_SSP_PER_TASK_PLUGIN)

		ifeq ($(CONFIG_FUNCTION_TRACER),y)
		ORIG_CFLAGS := $(KBUILD_CFLAGS)
		@@ -117,7 +116,8 @@ CFLAGS_fdt_ro.o := $(nossp_flags)
		CFLAGS_fdt_rw.o := $(nossp_flags)
		CFLAGS_fdt_wip.o := $(nossp_flags)

		ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin -I$(obj)
		ccflags-y := -fpic $(call cc-option,-mno-single-pic-base,) -fno-builtin \
		-I$(obj) $(DISABLE_ARM_SSP_PER_TASK_PLUGIN)
		asflags-y := -DZIMAGE

		# Supply kernel BSS size to the decompressor via a linker symbol.

arch/arm/kernel/vdso.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,8 @@ static bool __init cntvct_functional(void)
		* this.
		*/
		np = of_find_compatible_node(NULL, NULL, "arm,armv7-timer");
		if (!np)
		np = of_find_compatible_node(NULL, NULL, "arm,armv8-timer");
		if (!np)
		goto out_put;