This is the 5.4.281 stable release

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmaksiQACgkQONu9yGCS
 aT6WTw//aaGRbEkRWNuJKZ4vLTl8W4jRW2iWoSchPoXVJ1/xzOj5GGxGN3QVL0cC
 5z0VslncxsfqCuHNIUlMG1nHhtG+P3T0w6vHe4IX/X8FJzpYsQsaTx42jGZedGkZ
 dV4ksCtJ6VWR/zeApf4jBbFDisxy2FelAvHoOFiXdgXznyVbeglCHxu9gCArM+qA
 08Y0iEIK29WTvmMDfvekTi1OrBQSm8p9QsD/pXUH3D7Y863rm+K8Gv3B4Po4l8mH
 RPyi+B/FX+j7Gk6RWfw2tJ9Y+7bOLt6Pt9Zc8ImKdjXSUxfphznfsuOY8gO09WnN
 izqibrudoMmD/VQDR3VosTy0X9d32Jd1iGovwBID+4D+Sg8mqOQ97x1+f9nfcw5/
 D1tgRanO7L7wVFIjgvbOq6j5u3Bp/J2CNQJUfRcPa95+TJUU0AWPf3NGb56kQQlF
 L1JW0rMizSOzsROiki0JBH80nxwCukVk5SBetN/OoyusyRlkYqBrlSKaB+Nz/7Q9
 rJ/23X9fvbp2cMjRULIXZjBwPsg7U6ZcimS88ZLsH88/4oBqgEUGSBQPuEA4Ix9C
 uvNQPum0y2hTFYYI/mGRt5kWcPqqJWmMNNf/u/1HCzYXpc3nKQUedKyKuXRi3lYh
 i7pc9IPG5ey9jnB+bSImq/ykjzP51rxV1/NsQ21HakaaY+rgiY4=
 =j/gs
 -----END PGP SIGNATURE-----

Merge 5.4.281 into android11-5.4-lts

Changes in 5.4.281
	gcc-plugins: Rename last_stmt() for GCC 14+
	filelock: Remove locks reliably when fcntl/close race is detected
	scsi: qedf: Set qed_slowpath_params to zero before use
	ACPI: EC: Abort address space access upon error
	ACPI: EC: Avoid returning AE_OK on errors in address space handler
	wifi: mac80211: mesh: init nonpeer_pm to active by default in mesh sdata
	wifi: mac80211: fix UBSAN noise in ieee80211_prep_hw_scan()
	Input: silead - Always support 10 fingers
	ila: block BH in ila_output()
	kconfig: gconf: give a proper initial state to the Save button
	kconfig: remove wrong expr_trans_bool()
	fs/file: fix the check in find_next_fd()
	mei: demote client disconnect warning on suspend to debug
	wifi: cfg80211: wext: add extra SIOCSIWSCAN data check
	KVM: PPC: Book3S HV: Prevent UAF in kvm_spapr_tce_attach_iommu_group()
	ALSA: hda/realtek: Add more codec ID to no shutup pins list
	mips: fix compat_sys_lseek syscall
	Input: elantech - fix touchpad state on resume for Lenovo N24
	bytcr_rt5640 : inverse jack detect for Archos 101 cesium
	ASoC: ti: davinci-mcasp: Set min period size using FIFO config
	ASoC: ti: omap-hdmi: Fix too long driver name
	can: kvaser_usb: fix return value for hif_usb_send_regout
	s390/sclp: Fix sclp_init() cleanup on failure
	ALSA: dmaengine_pcm: terminate dmaengine before synchronize
	net: usb: qmi_wwan: add Telit FN912 compositions
	net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()
	powerpc/pseries: Whitelist dtl slub object for copying to userspace
	powerpc/eeh: avoid possible crash when edev->pdev changes
	scsi: libsas: Fix exp-attached device scan after probe failure scanned in again after probe failed
	Bluetooth: hci_core: cancel all works upon hci_unregister_dev()
	fs: better handle deep ancestor chains in is_subdir()
	spi: imx: Don't expect DMA for i.MX{25,35,50,51,53} cspi devices
	selftests/vDSO: fix clang build errors and warnings
	hfsplus: fix uninit-value in copy_name
	ARM: 9324/1: fix get_user() broken with veneer
	ACPI: processor_idle: Fix invalid comparison with insertion sort for latency
	drm/amdgpu: Fix signedness bug in sdma_v4_0_process_trap_irq()
	net: relax socket state check at accept time.
	ocfs2: add bounds checking to ocfs2_check_dir_entry()
	jfs: don't walk off the end of ealist
	ALSA: hda/realtek: Enable headset mic on Positivo SU C1400
	filelock: Fix fcntl/close race recovery compat path
	tun: add missing verification for short frame
	tap: add missing verification for short frame
	Linux 5.4.281

Change-Id: If3e8a4591ecbbace6792fd595d60744b4364668c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2024-07-31 16:27:42 +00:00
commit c043beb2bd
45 changed files with 289 additions and 177 deletions

View file

@ -977,4 +977,8 @@ static inline void debug_gimple_stmt(const_gimple s)
#define SET_DECL_MODE(decl, mode) DECL_MODE(decl) = (mode)
#endif
#if BUILDING_GCC_VERSION >= 14000
#define last_stmt(x) last_nondebug_stmt(x)
#endif
#endif

View file

@ -397,35 +397,6 @@ static struct expr *expr_eliminate_yn(struct expr *e)
return e;
}
/*
* bool FOO!=n => FOO
*/
struct expr *expr_trans_bool(struct expr *e)
{
if (!e)
return NULL;
switch (e->type) {
case E_AND:
case E_OR:
case E_NOT:
e->left.expr = expr_trans_bool(e->left.expr);
e->right.expr = expr_trans_bool(e->right.expr);
break;
case E_UNEQUAL:
// FOO!=n -> FOO
if (e->left.sym->type == S_TRISTATE) {
if (e->right.sym == &symbol_no) {
e->type = E_SYMBOL;
e->right.sym = NULL;
}
}
break;
default:
;
}
return e;
}
/*
* e1 || e2 -> ?
*/

View file

@ -302,7 +302,6 @@ struct expr *expr_copy(const struct expr *org);
void expr_free(struct expr *e);
void expr_eliminate_eq(struct expr **ep1, struct expr **ep2);
tristate expr_calc_value(struct expr *e);
struct expr *expr_trans_bool(struct expr *e);
struct expr *expr_eliminate_dups(struct expr *e);
struct expr *expr_transform(struct expr *e);
int expr_contains_symbol(struct expr *dep, struct symbol *sym);

View file

@ -1483,7 +1483,6 @@ int main(int ac, char *av[])
conf_parse(name);
fixup_rootmenu(&rootmenu);
conf_read(NULL);
/* Load the interface and connect signals */
init_main_window(glade_file);
@ -1491,6 +1490,8 @@ int main(int ac, char *av[])
init_left_tree();
init_right_tree();
conf_read(NULL);
switch (view_mode) {
case SINGLE_VIEW:
display_tree_part();

View file

@ -387,8 +387,6 @@ void menu_finalize(struct menu *parent)
dep = expr_transform(dep);
dep = expr_alloc_and(expr_copy(basedep), dep);
dep = expr_eliminate_dups(dep);
if (menu->sym && menu->sym->type != S_TRISTATE)
dep = expr_trans_bool(dep);
prop->visible.expr = dep;
/*