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

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

Merge 5.4.32 into android-5.4-stable 



Changes in 5.4.32
	net: phy: realtek: fix handling of RTL8105e-integrated PHY
	cxgb4: fix MPS index overwrite when setting MAC address
	ipv6: don't auto-add link-local address to lag ports
	net: dsa: bcm_sf2: Do not register slave MDIO bus with OF
	net: dsa: bcm_sf2: Ensure correct sub-node is parsed
	net: dsa: mt7530: fix null pointer dereferencing in port5 setup
	net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers
	net_sched: add a temporary refcnt for struct tcindex_data
	net_sched: fix a missing refcnt in tcindex_init()
	net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting
	slcan: Don't transmit uninitialized stack data in padding
	tun: Don't put_page() for all negative return values from XDP program
	mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE
	r8169: change back SG and TSO to be disabled by default
	s390: prevent leaking kernel address in BEAR
	random: always use batched entropy for get_random_u{32,64}
	usb: dwc3: gadget: Wrap around when skip TRBs
	uapi: rename ext2_swab() to swab() and share globally in swab.h
	slub: improve bit diffusion for freelist ptr obfuscation
	tools/accounting/getdelays.c: fix netlink attribute length
	hwrng: imx-rngc - fix an error path
	ACPI: PM: Add acpi_[un]register_wakeup_handler()
	platform/x86: intel_int0002_vgpio: Use acpi_register_wakeup_handler()
	ASoC: jz4740-i2s: Fix divider written at incorrect offset in register
	IB/hfi1: Call kobject_put() when kobject_init_and_add() fails
	IB/hfi1: Fix memory leaks in sysfs registration and unregistration
	IB/mlx5: Replace tunnel mpls capability bits for tunnel_offloads
	ARM: imx: Enable ARM_ERRATA_814220 for i.MX6UL and i.MX7D
	ARM: imx: only select ARM_ERRATA_814220 for ARMv7-A
	ceph: remove the extra slashes in the server path
	ceph: canonicalize server path in place
	include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap
	RDMA/ucma: Put a lock around every call to the rdma_cm layer
	RDMA/cma: Teach lockdep about the order of rtnl and lock
	RDMA/siw: Fix passive connection establishment
	Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl
	RDMA/cm: Update num_paths in cma_resolve_iboe_route error flow
	blk-mq: Keep set->nr_hw_queues and set->map[].nr_queues in sync
	fbcon: fix null-ptr-deref in fbcon_switch
	drm/i915: Fix ref->mutex deadlock in i915_active_wait()
	iommu/vt-d: Allow devices with RMRRs to use identity domain
	Linux 5.4.32

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I520b282d0cdebf3f80293c014d5cd6e88d956d55
parents 9489b78a bc844d58

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 31

SUBLEVEL = 32

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/mach-imx/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -520,6 +520,7 @@ config SOC_IMX6UL 
	bool "i.MX6 UltraLite support"

	select PINCTRL_IMX6UL

	select SOC_IMX6

	select ARM_ERRATA_814220



	help

	  This enables support for Freescale i.MX6 UltraLite processor.
@@ -556,6 +557,7 @@ config SOC_IMX7D 
	select PINCTRL_IMX7D

	select SOC_IMX7D_CA7 if ARCH_MULTI_V7

	select SOC_IMX7D_CM4 if ARM_SINGLE_ARMV7M

	select ARM_ERRATA_814220 if ARCH_MULTI_V7

	help

		This enables support for Freescale i.MX7 Dual processor.

arch/s390/include/asm/lowcore.h

+3 −1
Original line number Diff line number Diff line
@@ -141,7 +141,9 @@ struct lowcore { 


	/* br %r1 trampoline */

	__u16	br_r1_trampoline;		/* 0x0400 */

	__u8	pad_0x0402[0x0e00-0x0402];	/* 0x0402 */

	__u32	return_lpswe;			/* 0x0402 */

	__u32	return_mcck_lpswe;		/* 0x0406 */

	__u8	pad_0x040a[0x0e00-0x040a];	/* 0x040a */



	/*

	 * 0xe00 contains the address of the IPL Parameter Information

arch/s390/include/asm/processor.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ typedef struct thread_struct thread_struct; 
#define INIT_THREAD {							\

	.ksp = sizeof(init_stack) + (unsigned long) &init_stack,	\

	.fpu.regs = (void *) init_task.thread.fpu.fprs,			\

	.last_break = 1,						\

}



/*

arch/s390/include/asm/setup.h

+7 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/bits.h>

#include <uapi/asm/setup.h>

#include <linux/build_bug.h>



#define EP_OFFSET		0x10008

#define EP_STRING		"S390EP"
@@ -157,6 +158,12 @@ static inline unsigned long kaslr_offset(void) 
	return __kaslr_offset;

}



static inline u32 gen_lpswe(unsigned long addr)

{

	BUILD_BUG_ON(addr > 0xfff);

	return 0xb2b20000 | addr;

}



#else /* __ASSEMBLY__ */



#define IPL_DEVICE	(IPL_DEVICE_OFFSET)