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

Commit d2c77da2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.127 into android11-5.4-lts 



Changes in 5.4.127
	net: ieee802154: fix null deref in parse dev addr
	HID: quirks: Set INCREMENT_USAGE_ON_DUPLICATE for Saitek X65
	HID: hid-input: add mapping for emoji picker key
	HID: hid-sensor-hub: Return error for hid_set_field() failure
	HID: quirks: Add quirk for Lenovo optical mouse
	HID: multitouch: set Stylus suffix for Stylus-application devices, too
	HID: Add BUS_VIRTUAL to hid_connect logging
	HID: usbhid: fix info leak in hid_submit_ctrl
	drm/tegra: sor: Do not leak runtime PM reference
	ARM: OMAP2+: Fix build warning when mmc_omap is not built
	gfs2: Prevent direct-I/O write fallback errors from getting lost
	HID: gt683r: add missing MODULE_DEVICE_TABLE
	riscv: Use -mno-relax when using lld linker
	gfs2: Fix use-after-free in gfs2_glock_shrink_scan
	scsi: target: core: Fix warning on realtime kernels
	ethernet: myri10ge: Fix missing error code in myri10ge_probe()
	scsi: qedf: Do not put host in qedf_vport_create() unconditionally
	scsi: scsi_devinfo: Add blacklist entry for HPE OPEN-V
	nvme-loop: reset queue count to 1 in nvme_loop_destroy_io_queues()
	nvme-loop: clear NVME_LOOP_Q_LIVE when nvme_loop_configure_admin_queue() fails
	nvme-loop: check for NVME_LOOP_Q_LIVE in nvme_loop_destroy_admin_queue()
	net: ipconfig: Don't override command-line hostnames or domains
	drm/amd/display: Allow bandwidth validation for 0 streams.
	rtnetlink: Fix missing error code in rtnl_bridge_notify()
	net/x25: Return the correct errno code
	net: Return the correct errno code
	fib: Return the correct errno code
	Linux 5.4.127

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I08d6dae7732f57d5b5b9b15a3d6db8cdc75d865b
parents e3542e74 a82d4d5e

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 126

SUBLEVEL = 127

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/mach-omap2/board-n8x0.c

+1 −1
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ static int n8x0_mmc_get_cover_state(struct device *dev, int slot) 


static void n8x0_mmc_callback(void *data, u8 card_mask)

{

#ifdef CONFIG_MMC_OMAP

	int bit, *openp, index;



	if (board_is_n800()) {
@@ -339,7 +340,6 @@ static void n8x0_mmc_callback(void *data, u8 card_mask) 
	else

		*openp = 0;



#ifdef CONFIG_MMC_OMAP

	omap_mmc_notify_cover_event(mmc_device, index, *openp);

#else

	pr_warn("MMC: notify cover event not available\n");

arch/riscv/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -34,6 +34,15 @@ else 
	KBUILD_LDFLAGS += -melf32lriscv

endif



ifeq ($(CONFIG_LD_IS_LLD),y)

	KBUILD_CFLAGS += -mno-relax

	KBUILD_AFLAGS += -mno-relax

ifneq ($(LLVM_IAS),1)

	KBUILD_CFLAGS += -Wa,-mno-relax

	KBUILD_AFLAGS += -Wa,-mno-relax

endif

endif



# ISA string setting

riscv-march-$(CONFIG_ARCH_RV32I)	:= rv32ima

riscv-march-$(CONFIG_ARCH_RV64I)	:= rv64ima

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c

+1 −1
Original line number Diff line number Diff line
@@ -2917,7 +2917,7 @@ bool dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context, 
	voltage_supported = dcn20_validate_bandwidth_internal(dc, context, false);

	dummy_pstate_supported = context->bw_ctx.bw.dcn.clk.p_state_change_support;



	if (voltage_supported && dummy_pstate_supported) {

	if (voltage_supported && (dummy_pstate_supported || !(context->stream_count))) {

		context->bw_ctx.bw.dcn.clk.p_state_change_support = false;

		goto restore_dml_state;

	}

drivers/gpu/drm/tegra/sor.c

+10 −4
Original line number Diff line number Diff line
@@ -2875,21 +2875,21 @@ static int tegra_sor_init(struct host1x_client *client) 
		if (err < 0) {

			dev_err(sor->dev, "failed to acquire SOR reset: %d\n",

				err);

			return err;

			goto rpm_put;

		}



		err = reset_control_assert(sor->rst);

		if (err < 0) {

			dev_err(sor->dev, "failed to assert SOR reset: %d\n",

				err);

			return err;

			goto rpm_put;

		}

	}



	err = clk_prepare_enable(sor->clk);

	if (err < 0) {

		dev_err(sor->dev, "failed to enable clock: %d\n", err);

		return err;

		goto rpm_put;

	}



	usleep_range(1000, 3000);
@@ -2900,7 +2900,7 @@ static int tegra_sor_init(struct host1x_client *client) 
			dev_err(sor->dev, "failed to deassert SOR reset: %d\n",

				err);

			clk_disable_unprepare(sor->clk);

			return err;

			goto rpm_put;

		}



		reset_control_release(sor->rst);
@@ -2929,6 +2929,12 @@ static int tegra_sor_init(struct host1x_client *client) 
	tegra_sor_writel(sor, value, SOR_INT_MASK);



	return 0;



rpm_put:

	if (sor->rst)

		pm_runtime_put(sor->dev);



	return err;

}



static int tegra_sor_exit(struct host1x_client *client)