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

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

Merge 5.4.277 into android11-5.4-lts 



Changes in 5.4.277
	pinctrl: core: handle radix_tree_insert() errors in pinctrl_register_one_pin()
	ext4: fix bug_on in __es_tree_search
	Revert "selftests: mm: fix map_hugetlb failure on 64K page size systems"
	Revert "net: bcmgenet: use RGMII loopback for MAC reset"
	net: bcmgenet: keep MAC in reset until PHY is up
	net: bcmgenet: synchronize EXT_RGMII_OOB_CTRL access
	net: bcmgenet: synchronize use of bcmgenet_set_rx_mode()
	net: bcmgenet: synchronize UMAC_CMD access
	smb: client: fix potential OOBs in smb2_parse_contexts()
	firmware: arm_scmi: Harden accesses to the reset domains
	arm64: dts: qcom: Fix 'interrupt-map' parent address cells
	btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()
	drm/amdgpu: Fix possible NULL dereference in amdgpu_ras_query_error_status_helper()
	usb: typec: ucsi: displayport: Fix potential deadlock
	serial: kgdboc: Fix NMI-safety problems from keyboard reset code
	docs: kernel_include.py: Cope with docutils 0.21
	Linux 5.4.277

Change-Id: I7c64905bd76358d7f6f86f33522fb03811684946
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 18ae7bde 4a548b29

Documentation/sphinx/kernel_include.py

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ class KernelInclude(Include): 
        # HINT: this is the only line I had to change / commented out:

        #path = utils.relative_path(None, path)



        path = nodes.reprunicode(path)

        encoding = self.options.get(

            'encoding', self.state.document.settings.input_encoding)

        e_handler=self.state.document.settings.input_encoding_error_handler

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 276

SUBLEVEL = 277

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm64/boot/dts/qcom/msm8998.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -872,10 +872,10 @@ 
			interrupts = <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "msi";

			interrupt-map-mask = <0 0 0 0x7>;

			interrupt-map =	<0 0 0 1 &intc 0 135 IRQ_TYPE_LEVEL_HIGH>,

					<0 0 0 2 &intc 0 136 IRQ_TYPE_LEVEL_HIGH>,

					<0 0 0 3 &intc 0 138 IRQ_TYPE_LEVEL_HIGH>,

					<0 0 0 4 &intc 0 139 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-map =	<0 0 0 1 &intc 0 0 135 IRQ_TYPE_LEVEL_HIGH>,

					<0 0 0 2 &intc 0 0 136 IRQ_TYPE_LEVEL_HIGH>,

					<0 0 0 3 &intc 0 0 138 IRQ_TYPE_LEVEL_HIGH>,

					<0 0 0 4 &intc 0 0 139 IRQ_TYPE_LEVEL_HIGH>;



			clocks = <&gcc GCC_PCIE_0_PIPE_CLK>,

				 <&gcc GCC_PCIE_0_MSTR_AXI_CLK>,

drivers/firmware/arm_scmi/reset.c

+5 −1
Original line number Diff line number Diff line
@@ -135,8 +135,12 @@ static int scmi_domain_reset(const struct scmi_handle *handle, u32 domain, 
	struct scmi_xfer *t;

	struct scmi_msg_reset_domain_reset *dom;

	struct scmi_reset_info *pi = handle->reset_priv;

	struct reset_dom_info *rdom = pi->dom_info + domain;

	struct reset_dom_info *rdom;



	if (domain >= pi->num_domains)

		return -EINVAL;



	rdom = pi->dom_info + domain;

	if (rdom->async_reset)

		flags |= ASYNCHRONOUS_RESET;

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

+3 −0
Original line number Diff line number Diff line
@@ -594,6 +594,9 @@ int amdgpu_ras_error_query(struct amdgpu_device *adev, 
	if (!obj)

		return -EINVAL;



	if (!info || info->head.block == AMDGPU_RAS_BLOCK_COUNT)

		return -EINVAL;



	switch (info->head.block) {

	case AMDGPU_RAS_BLOCK__UMC:

		if (adev->umc.funcs->query_ras_error_count)