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

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

Merge 5.4.183 into android11-5.4-lts 



Changes in 5.4.183
	mac80211_hwsim: report NOACK frames in tx_status
	mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work
	i2c: bcm2835: Avoid clock stretching timeouts
	ASoC: rt5668: do not block workqueue if card is unbound
	ASoC: rt5682: do not block workqueue if card is unbound
	Input: clear BTN_RIGHT/MIDDLE on buttonpads
	cifs: fix double free race when mount fails in cifs_get_root()
	dmaengine: shdma: Fix runtime PM imbalance on error
	i2c: cadence: allow COMPILE_TEST
	i2c: qup: allow COMPILE_TEST
	net: usb: cdc_mbim: avoid altsetting toggling for Telit FN990
	usb: gadget: don't release an existing dev->buf
	usb: gadget: clear related members when goto fail
	ata: pata_hpt37x: fix PCI clock detection
	ALSA: intel_hdmi: Fix reference to PCM buffer address
	ASoC: ops: Shift tested values in snd_soc_put_volsw() by +min
	xfrm: fix MTU regression
	netfilter: fix use-after-free in __nf_register_net_hook()
	xfrm: fix the if_id check in changelink
	xfrm: enforce validity of offload input flags
	netfilter: nf_queue: don't assume sk is full socket
	netfilter: nf_queue: fix possible use-after-free
	batman-adv: Request iflink once in batadv-on-batadv check
	batman-adv: Request iflink once in batadv_get_real_netdevice
	batman-adv: Don't expect inter-netns unique iflink indices
	net: dcb: flush lingering app table entries for unregistered devices
	net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error generated by client
	net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error cause by server
	block: Fix fsync always failed if once failed
	xen/netfront: destroy queues before real_num_tx_queues is zeroed
	sched/topology: Make sched_init_numa() use a set for the deduplicating sort
	sched/topology: Fix sched_domain_topology_level alloc in sched_init_numa()
	ia64: ensure proper NUMA distance and possible map initialization
	mac80211: fix forwarded mesh frames AC & queue selection
	net: stmmac: fix return value of __setup handler
	iavf: Fix missing check for running netdev
	net: sxgbe: fix return value of __setup handler
	net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe()
	ixgbe: xsk: change !netif_carrier_ok() handling in ixgbe_xmit_zc()
	efivars: Respect "block" flag in efivar_entry_set_safe()
	firmware: arm_scmi: Remove space in MODULE_ALIAS name
	ASoC: cs4265: Fix the duplicated control name
	can: gs_usb: change active_channels's type from atomic_t to u8
	arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output
	igc: igc_read_phy_reg_gpy: drop premature return
	ARM: Fix kgdb breakpoint for Thumb2
	ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions
	igc: igc_write_phy_reg_gpy: drop premature return
	ibmvnic: free reset-work-item when flushing
	memfd: fix F_SEAL_WRITE after shmem huge page allocated
	soc: fsl: qe: Check of ioremap return value
	net: chelsio: cxgb3: check the return value of pci_find_capability()
	nl80211: Handle nla_memdup failures in handle_nan_filter
	Input: elan_i2c - move regulator_[en|dis]able() out of elan_[en|dis]able_power()
	Input: elan_i2c - fix regulator enable count imbalance after suspend/resume
	HID: add mapping for KEY_DICTATE
	HID: add mapping for KEY_ALL_APPLICATIONS
	tracing/histogram: Fix sorting on old "cpu" value
	tracing: Fix return value of __setup handlers
	btrfs: fix lost prealloc extents beyond eof after full fsync
	btrfs: qgroup: fix deadlock between rescan worker and remove qgroup
	btrfs: add missing run of delayed items after unlink during log replay
	Revert "xfrm: xfrm_state_mtu should return at least 1280 for ipv6"
	net: dcb: disable softirqs in dcbnl_flush_dev()
	hamradio: fix macro redefine warning
	Linux 5.4.183

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I37011d512091e3ad1398ea2ffff6be08efbc3361
parents 55d2e3e4 e7d1268f

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 182

SUBLEVEL = 183

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/kernel/kgdb.c

+28 −8
Original line number Diff line number Diff line
@@ -154,22 +154,38 @@ static int kgdb_compiled_brk_fn(struct pt_regs *regs, unsigned int instr) 
	return 0;

}



static struct undef_hook kgdb_brkpt_hook = {

static struct undef_hook kgdb_brkpt_arm_hook = {

	.instr_mask		= 0xffffffff,

	.instr_val		= KGDB_BREAKINST,

	.cpsr_mask		= MODE_MASK,

	.cpsr_mask		= PSR_T_BIT | MODE_MASK,

	.cpsr_val		= SVC_MODE,

	.fn			= kgdb_brk_fn

};



static struct undef_hook kgdb_compiled_brkpt_hook = {

static struct undef_hook kgdb_brkpt_thumb_hook = {

	.instr_mask		= 0xffff,

	.instr_val		= KGDB_BREAKINST & 0xffff,

	.cpsr_mask		= PSR_T_BIT | MODE_MASK,

	.cpsr_val		= PSR_T_BIT | SVC_MODE,

	.fn			= kgdb_brk_fn

};



static struct undef_hook kgdb_compiled_brkpt_arm_hook = {

	.instr_mask		= 0xffffffff,

	.instr_val		= KGDB_COMPILED_BREAK,

	.cpsr_mask		= MODE_MASK,

	.cpsr_mask		= PSR_T_BIT | MODE_MASK,

	.cpsr_val		= SVC_MODE,

	.fn			= kgdb_compiled_brk_fn

};



static struct undef_hook kgdb_compiled_brkpt_thumb_hook = {

	.instr_mask		= 0xffff,

	.instr_val		= KGDB_COMPILED_BREAK & 0xffff,

	.cpsr_mask		= PSR_T_BIT | MODE_MASK,

	.cpsr_val		= PSR_T_BIT | SVC_MODE,

	.fn			= kgdb_compiled_brk_fn

};



static int __kgdb_notify(struct die_args *args, unsigned long cmd)

{

	struct pt_regs *regs = args->regs;
@@ -210,8 +226,10 @@ int kgdb_arch_init(void) 
	if (ret != 0)

		return ret;



	register_undef_hook(&kgdb_brkpt_hook);

	register_undef_hook(&kgdb_compiled_brkpt_hook);

	register_undef_hook(&kgdb_brkpt_arm_hook);

	register_undef_hook(&kgdb_brkpt_thumb_hook);

	register_undef_hook(&kgdb_compiled_brkpt_arm_hook);

	register_undef_hook(&kgdb_compiled_brkpt_thumb_hook);



	return 0;

}
@@ -224,8 +242,10 @@ int kgdb_arch_init(void) 
 */

void kgdb_arch_exit(void)

{

	unregister_undef_hook(&kgdb_brkpt_hook);

	unregister_undef_hook(&kgdb_compiled_brkpt_hook);

	unregister_undef_hook(&kgdb_brkpt_arm_hook);

	unregister_undef_hook(&kgdb_brkpt_thumb_hook);

	unregister_undef_hook(&kgdb_compiled_brkpt_arm_hook);

	unregister_undef_hook(&kgdb_compiled_brkpt_thumb_hook);

	unregister_die_notifier(&kgdb_notifier);

}

arch/arm/mm/mmu.c

+2 −0
Original line number Diff line number Diff line
@@ -229,12 +229,14 @@ early_param("ecc", early_ecc); 
static int __init early_cachepolicy(char *p)

{

	pr_warn("cachepolicy kernel parameter not supported without cp15\n");

	return 0;

}

early_param("cachepolicy", early_cachepolicy);



static int __init noalign_setup(char *__unused)

{

	pr_warn("noalign kernel parameter not supported without cp15\n");

	return 1;

}

__setup("noalign", noalign_setup);

arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi

+12 −5
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ 


	sound: sound {

		compatible = "rockchip,rk3399-gru-sound";

		rockchip,cpu = <&i2s0 &i2s2>;

		rockchip,cpu = <&i2s0 &spdif>;

	};

};
@@ -432,10 +432,6 @@ ap_i2c_audio: &i2c8 { 
	status = "okay";

};



&i2s2 {

	status = "okay";

};



&io_domains {

	status = "okay";
@@ -532,6 +528,17 @@ ap_i2c_audio: &i2c8 { 
	vqmmc-supply = <&ppvar_sd_card_io>;

};



&spdif {

	status = "okay";



	/*

	 * SPDIF is routed internally to DP; we either don't use these pins, or

	 * mux them to something else.

	 */

	/delete-property/ pinctrl-0;

	/delete-property/ pinctrl-names;

};



&spi1 {

	status = "okay";

arch/ia64/kernel/acpi.c

+5 −2
Original line number Diff line number Diff line
@@ -448,7 +448,8 @@ void __init acpi_numa_fixup(void) 
	if (srat_num_cpus == 0) {

		node_set_online(0);

		node_cpuid[0].phys_id = hard_smp_processor_id();

		return;

		slit_distance(0, 0) = LOCAL_DISTANCE;

		goto out;

	}



	/*
@@ -491,7 +492,7 @@ void __init acpi_numa_fixup(void) 
			for (j = 0; j < MAX_NUMNODES; j++)

				slit_distance(i, j) = i == j ?

					LOCAL_DISTANCE : REMOTE_DISTANCE;

		return;

		goto out;

	}



	memset(numa_slit, -1, sizeof(numa_slit));
@@ -516,6 +517,8 @@ void __init acpi_numa_fixup(void) 
		printk("\n");

	}

#endif

out:

	node_possible_map = node_online_map;

}

#endif				/* CONFIG_ACPI_NUMA */