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

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

Merge 5.4.6 into android-5.4 



Changes in 5.4.6
	USB: Fix incorrect DMA allocations for local memory pool drivers
	mmc: block: Make card_busy_detect() a bit more generic
	mmc: block: Add CMD13 polling for MMC IOCTLS with R1B response
	mmc: core: Drop check for mmc_card_is_removable() in mmc_rescan()
	mmc: core: Re-work HW reset for SDIO cards
	PCI/switchtec: Read all 64 bits of part_event_bitmap
	PCI/PM: Always return devices to D0 when thawing
	PCI: pciehp: Avoid returning prematurely from sysfs requests
	PCI: Fix Intel ACS quirk UPDCR register address
	PCI/MSI: Fix incorrect MSI-X masking on resume
	PCI: Do not use bus number zero from EA capability
	PCI: rcar: Fix missing MACCTLR register setting in initialization sequence
	PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3
	PM / QoS: Redefine FREQ_QOS_MAX_DEFAULT_VALUE to S32_MAX
	block: fix "check bi_size overflow before merge"
	xtensa: use MEMBLOCK_ALLOC_ANYWHERE for KASAN shadow map
	gfs2: Multi-block allocations in gfs2_page_mkwrite
	gfs2: fix glock reference problem in gfs2_trans_remove_revoke
	xtensa: fix TLB sanity checker
	xtensa: fix syscall_set_return_value
	rpmsg: glink: Set tail pointer to 0 at end of FIFO
	rpmsg: glink: Fix reuse intents memory leak issue
	rpmsg: glink: Fix use after free in open_ack TIMEOUT case
	rpmsg: glink: Put an extra reference during cleanup
	rpmsg: glink: Fix rpmsg_register_device err handling
	rpmsg: glink: Don't send pending rx_done during remove
	rpmsg: glink: Free pending deferred work on remove
	cifs: smbd: Return -EAGAIN when transport is reconnecting
	cifs: smbd: Only queue work for error recovery on memory registration
	cifs: smbd: Add messages on RDMA session destroy and reconnection
	cifs: smbd: Return -EINVAL when the number of iovs exceeds SMBDIRECT_MAX_SGE
	cifs: smbd: Return -ECONNABORTED when trasnport is not in connected state
	cifs: Don't display RDMA transport on reconnect
	CIFS: Respect O_SYNC and O_DIRECT flags during reconnect
	CIFS: Close open handle after interrupted close
	CIFS: Do not miss cancelled OPEN responses
	CIFS: Fix NULL pointer dereference in mid callback
	cifs: Fix retrieval of DFS referrals in cifs_mount()
	ARM: dts: s3c64xx: Fix init order of clock providers
	ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume()
	vfio/pci: call irq_bypass_unregister_producer() before freeing irq
	dma-buf: Fix memory leak in sync_file_merge()
	drm/panfrost: Fix a race in panfrost_ioctl_madvise()
	drm/panfrost: Fix a BO leak in panfrost_ioctl_mmap_bo()
	drm/panfrost: Fix a race in panfrost_gem_free_object()
	drm/mgag200: Extract device type from flags
	drm/mgag200: Store flags from PCI driver data in device structure
	drm/mgag200: Add workaround for HW that does not support 'startadd'
	drm/mgag200: Flag all G200 SE A machines as broken wrt <startadd>
	drm: meson: venc: cvbs: fix CVBS mode matching
	dm mpath: remove harmful bio-based optimization
	dm btree: increase rebalance threshold in __rebalance2()
	dm clone metadata: Track exact changes per transaction
	dm clone metadata: Use a two phase commit
	dm clone: Flush destination device before committing metadata
	dm thin metadata: Add support for a pre-commit callback
	dm thin: Flush data device before committing metadata
	scsi: ufs: Disable autohibern8 feature in Cadence UFS
	scsi: iscsi: Fix a potential deadlock in the timeout handler
	scsi: qla2xxx: Ignore NULL pointer in tcm_qla2xxx_free_mcmd
	scsi: qla2xxx: Initialize free_work before flushing it
	scsi: qla2xxx: Added support for MPI and PEP regions for ISP28XX
	scsi: qla2xxx: Change discovery state before PLOGI
	scsi: qla2xxx: Correctly retrieve and interpret active flash region
	scsi: qla2xxx: Fix incorrect SFUB length used for Secure Flash Update MB Cmd
	drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN
	drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom
	drm/nouveau/kms/nv50-: Limit MST BPC to 8
	drm/i915/fbc: Disable fbc by default on all glk+
	drm/radeon: fix r1xx/r2xx register checker for POT textures
	drm/dp_mst: Correct the bug in drm_dp_update_payload_part1()
	drm/amd/display: re-enable wait in pipelock, but add timeout
	drm/amd/display: add default clocks if not able to fetch them
	drm/amdgpu: initialize vm_inv_eng0_sem for gfxhub and mmhub
	drm/amdgpu: invalidate mmhub semaphore workaround in gmc9/gmc10
	drm/amdgpu/gfx10: explicitly wait for cp idle after halt/unhalt
	drm/amdgpu/gfx10: re-init clear state buffer after gpu reset
	drm/i915/gvt: Fix cmd length check for MI_ATOMIC
	drm/amdgpu: avoid using invalidate semaphore for picasso
	drm/amdgpu: add invalidate semaphore limit for SRIOV and picasso in gmc9
	ALSA: hda: Fix regression by strip mask fix
	Linux 5.4.6

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ieb34254e2c00cee10d0012aaaf8fef323280c04f
parents 16742096 957a16c3

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 5

SUBLEVEL = 6

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/boot/dts/s3c6410-mini6410.dts

+4 −0
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ 
	};

};



&clocks {

	clocks = <&fin_pll>;

};



&sdhci0 {

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

arch/arm/boot/dts/s3c6410-smdk6410.dts

+4 −0
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ 
	};

};



&clocks {

	clocks = <&fin_pll>;

};



&sdhci0 {

	pinctrl-names = "default";

	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;

arch/arm/mach-tegra/reset-handler.S

+3 −3
Original line number Diff line number Diff line
@@ -44,16 +44,16 @@ ENTRY(tegra_resume) 
	cmp	r6, #TEGRA20

	beq	1f				@ Yes

	/* Clear the flow controller flags for this CPU. */

	cpu_to_csr_reg r1, r0

	cpu_to_csr_reg r3, r0

	mov32	r2, TEGRA_FLOW_CTRL_BASE

	ldr	r1, [r2, r1]

	ldr	r1, [r2, r3]

	/* Clear event & intr flag */

	orr	r1, r1, \

		#FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG

	movw	r0, #0x3FFD	@ enable, cluster_switch, immed, bitmaps

				@ & ext flags for CPU power mgnt

	bic	r1, r1, r0

	str	r1, [r2]

	str	r1, [r2, r3]

1:



	mov32	r9, 0xc09

arch/xtensa/include/asm/syscall.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static inline void syscall_set_return_value(struct task_struct *task, 
					    struct pt_regs *regs,

					    int error, long val)

{

	regs->areg[0] = (long) error ? error : val;

	regs->areg[2] = (long) error ? error : val;

}



#define SYSCALL_MAX_ARGS 6