* Linux 5.4.130
@ 2021-07-07 12:48 Sasha Levin
2021-07-07 12:48 ` Sasha Levin
0 siblings, 1 reply; 2+ messages in thread
From: Sasha Levin @ 2021-07-07 12:48 UTC (permalink / raw)
To: linux-kernel, stable, akpm, torvalds; +Cc: lwn, jslaby, gregkh
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
I'm announcing the release of the 5.4.130 kernel.
All users of the 5.4 kernel series must upgrade.
The updated 5.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.4.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
Thanks,
Sasha
- ------------
Makefile | 2 +-
drivers/gpio/Kconfig | 2 ++
drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++--
drivers/infiniband/hw/mlx5/flow.c | 8 ++++++++
drivers/scsi/sr.c | 2 ++
security/integrity/platform_certs/load_uefi.c | 5 -----
6 files changed, 15 insertions(+), 8 deletions(-)
Christian König (1):
drm/nouveau: fix dma_address check for CPU/GPU sync
Johannes Berg (1):
gpio: AMD8111 and TQMX86 require HAS_IOPORT_MAP
ManYi Li (1):
scsi: sr: Return appropriate error code when disk is ejected
Mark Bloch (1):
RDMA/mlx5: Block FDB rules when not in switchdev mode
Sasha Levin (1):
Linux 5.4.130
YueHaibing (1):
x86/efi: remove unused variables
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAmDlopkACgkQ3qZv95d3
LNxXEg//cOzICk7j6/qzijKVxiuJC3YBJ99U05fap7EjShpomDrxs9q4yhbOeBAn
Q7GdF8XDa4si/32T0fAojLKLWMvGN6gwjIm1mKFPcSte2lLiO3KnlQubjdo2dwJi
VFtmkMd+Op+77WhzFBpEYRiFisnzg4376eQIp/rzxC64faVkbp8mobtq0KCTIvqv
OT05R1Z/DMR2pl5vI1ho592oVvl4FbWWZJRcTc05RAzdPpOsFqmJZkIua5Q0GQzo
iovxwsVz7cH7RMcXIQ65emuNFIFlB1qfKfA1VR/WPxuj/gmtOJth2mU0+BO5qSYK
9z1mbCUFjEDjgI2dBshNzlKIERoo6tExWiy6BOmuQyf5KTzJLpaLtLXvxygak6GB
FT3rGmcV85ec4wAgHeFgBeEJWyMgmgiNopx0intVkNwhx7Ulsg3aB8vrMwn+QJSN
2kPA/rip8VEignB2wzw0o/0yiAp2tjszcpwTFVIjo7JnfzjDyhzANdslEFu+yjUm
FomT+mXe/yGfoKHl8YqXYaVntu/YGbocd2pGg5337zwFimR88YfVpfAezTmnrg8L
8xI8q7v3b8vcXzxCbLE801tMuU1gKFj9m7/DAWp+F/ak9jV0M7lelnpGF3lr4DDP
3MU6J+Y4faiC2LT6KcRaBkoPXPXVdYjH9yYA+l8jwaAbDK3fFCE=
=60Aw
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Linux 5.4.130
2021-07-07 12:48 Linux 5.4.130 Sasha Levin
@ 2021-07-07 12:48 ` Sasha Levin
0 siblings, 0 replies; 2+ messages in thread
From: Sasha Levin @ 2021-07-07 12:48 UTC (permalink / raw)
To: linux-kernel, stable, akpm, torvalds; +Cc: lwn, jslaby, gregkh
diff --git a/Makefile b/Makefile
index 802520ad08cc..4256dd594d18 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 4
-SUBLEVEL = 129
+SUBLEVEL = 130
EXTRAVERSION =
NAME = Kleptomaniac Octopus
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index f9263426af03..ae414045a750 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -1232,6 +1232,7 @@ config GPIO_TPS68470
config GPIO_TQMX86
tristate "TQ-Systems QTMX86 GPIO"
depends on MFD_TQMX86 || COMPILE_TEST
+ depends on HAS_IOPORT_MAP
select GPIOLIB_IRQCHIP
help
This driver supports GPIO on the TQMX86 IO controller.
@@ -1299,6 +1300,7 @@ menu "PCI GPIO expanders"
config GPIO_AMD8111
tristate "AMD 8111 GPIO driver"
depends on X86 || COMPILE_TEST
+ depends on HAS_IOPORT_MAP
help
The AMD 8111 south bridge contains 32 GPIO pins which can be used.
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index f8015e0318d7..f7603be569fc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -542,7 +542,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo)
struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;
int i;
- if (!ttm_dma)
+ if (!ttm_dma || !ttm_dma->dma_address)
return;
/* Don't waste time looping if the object is coherent */
@@ -562,7 +562,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo)
struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;
int i;
- if (!ttm_dma)
+ if (!ttm_dma || !ttm_dma->dma_address)
return;
/* Don't waste time looping if the object is coherent */
diff --git a/drivers/infiniband/hw/mlx5/flow.c b/drivers/infiniband/hw/mlx5/flow.c
index b198ff10cde9..fddefb29efd7 100644
--- a/drivers/infiniband/hw/mlx5/flow.c
+++ b/drivers/infiniband/hw/mlx5/flow.c
@@ -13,6 +13,7 @@
#include <rdma/ib_umem.h>
#include <linux/mlx5/driver.h>
#include <linux/mlx5/fs.h>
+#include <linux/mlx5/eswitch.h>
#include "mlx5_ib.h"
#define UVERBS_MODULE_NAME mlx5_ib
@@ -316,6 +317,13 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_MATCHER_CREATE)(
if (err)
goto end;
+ if (obj->ns_type == MLX5_FLOW_NAMESPACE_FDB &&
+ mlx5_eswitch_mode(dev->mdev->priv.eswitch) !=
+ MLX5_ESWITCH_OFFLOADS) {
+ err = -EINVAL;
+ goto end;
+ }
+
uobj->object = obj;
obj->mdev = dev->mdev;
atomic_set(&obj->usecnt, 0);
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 70a28f6fb1d0..2332b245b182 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -218,6 +218,8 @@ static unsigned int sr_get_events(struct scsi_device *sdev)
return DISK_EVENT_EJECT_REQUEST;
else if (med->media_event_code == 2)
return DISK_EVENT_MEDIA_CHANGE;
+ else if (med->media_event_code == 3)
+ return DISK_EVENT_EJECT_REQUEST;
return 0;
}
diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c
index aa874d84e413..f0c908241966 100644
--- a/security/integrity/platform_certs/load_uefi.c
+++ b/security/integrity/platform_certs/load_uefi.c
@@ -11,11 +11,6 @@
#include "../integrity.h"
#include "keyring_handler.h"
-static efi_guid_t efi_cert_x509_guid __initdata = EFI_CERT_X509_GUID;
-static efi_guid_t efi_cert_x509_sha256_guid __initdata =
- EFI_CERT_X509_SHA256_GUID;
-static efi_guid_t efi_cert_sha256_guid __initdata = EFI_CERT_SHA256_GUID;
-
/*
* Look to see if a UEFI variable called MokIgnoreDB exists and return true if
* it does.
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-07 12:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-07 12:48 Linux 5.4.130 Sasha Levin
2021-07-07 12:48 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).