Merge 5.4.130 into android11-5.4-lts

Changes in 5.4.130
	x86/efi: remove unused variables
	scsi: sr: Return appropriate error code when disk is ejected
	drm/nouveau: fix dma_address check for CPU/GPU sync
	gpio: AMD8111 and TQMX86 require HAS_IOPORT_MAP
	RDMA/mlx5: Block FDB rules when not in switchdev mode
	Linux 5.4.130

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I81aa4b6d954afeda3fe6971a5611547db6b9fb7a