brain-hackers_pepepper-mirror
/
linux-brain
mirror of https://github.com/brain-hackers/linux-brain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Linux 5.4.130 

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAmDlnnAACgkQ3qZv95d3
 LNxq3Q/5AaAtg+YK2+b1bBV/sLq9rmLt/TlxxB4jpDklD+F9ioCqr7AR9/OCX6KG
 Q9+PUS/gEixC542IjzF/EPlKNjvTmNhIP9V9tWJo7XYyqP0TkZ7VSNhreWv+N51Y
 SMRoA/T37Fmhy6IMeAp1EvdAEpqlIntjdifJBLnt56fv3cCCy6I1sHenUG8H9iSf
 oRwGLsfBadEtihP4h+sqcLbMTHVhMBxyn0rKTa+Qt+sCRjVHgMzWs/XMQO3Ou/bZ
 Zy6BwWkYFXpc78E6HIk5mBj6JBmx4YdFNNjQG2ld6TCNq7P5DrjWQAchVUrSgLyO
 dz2ntpdBS/9GukByIaD9HbTICuUrf8f5mCpK730IcEOxb3rqVWCIrpJQXhrrYWfi
 3xjzxHzu2DH6ZNedHdH59N5il4WpOMAsasBEIRYZTLK2oEkRLah6k2HDS9LSgZ4M
 wcnmdEeA7vKlYyaYGhkFPePKVoVdFW8yTxGsN6f2kyKR7DjW7zRcFT5/9GH5Hu+n
 0jfUbCsIN+VSP7NFPYW5VywwUiVz1uVTdFK0XKpKzKrLTaWztQ+R5cQDatYu/jpq
 Chq7VTWdZIRsTe2tHetA7SMh32NRbESx9bxXz+OjvAbc7QlOss37YAztBusH0Uup
 /nBeRZw7z5N5jn8g2tl+mV/pTE+DrH86cDeAba4SqHztG2Y3H0g=
 =Uo47
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEdQaENiSDAlGTDEbB7G51OISzHs0FAmD25dUACgkQ7G51OISz
 Hs1qnQ//cw/fFOWdhhypsaZeYs4YTIhOQznGoq2dgU7koujNAt00ZY15g+hCtLei
 kYJJXi9zL2j5M2K5zhGPymooMudFTzQtkBrqov39EjpEEO8e2rFW+vbaf8Y5/sVL
 PPHY6O3vZ/sjhitQA0XjSNlWrA81jzunzDjTgErxRKCfTFEjw0RkAs7bdFMeKGCD
 1LGuoqUFxBYc+YeFwoVN/A9x9cudI0sTXdmC6FhzCy1yiZK1gD94oweq85WaN2Bx
 GGxOg3opkgdDn8iZE4WPL9F6P4Po5+WfTDznpSVOIANFjKk1pMFqjG6oamv6FQlI
 uGe6pHXMv4ECuazMoZa6mkGsOf593vwBLTT4Bmaeo8fZ07+z3/l5bg53B/4pRJKs
 L4RT3e12EHA9ZtdTDogCnao/zdO86J8lo3WjcFPkziahEFEKwG8xywPgvU/SFbyU
 JN6aazf8iQTPMM5KYUX8k71CVB+8i+ySchjsSIR/Q1owZe1k6Q4HSTAZd8Mf9R6l
 /whgebKnO5Y/LcA5ssfWqEUaXRmNJboF+iPhBlJCArzUOVc2OuXIh8971RK930bR
 myFDXDEh2xNfb5mXdwMulJggQxvoh9u1sx4CNw9hCtz0w297+x7POKtsA9/sq3m6
 Z2Lnmz8Y2gF97U8GYlpmvHYshlCvCRIlt9Vn7JfARr/2o5vLLRk=
 =9eSo
 -----END PGP SIGNATURE-----

Merge tag 'v5.4.130' into 5.4-2.3.x-imx

Linux 5.4.130

Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
This commit is contained in:
Andrey Zhizhikin 2021-07-20 15:03:46 +00:00
parent 909767eaf4 8b24c7edc2
commit 3050bcad92
6 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
VERSION = 5 VERSION = 5
PATCHLEVEL = 4 PATCHLEVEL = 4
SUBLEVEL = 129 SUBLEVEL = 130
EXTRAVERSION = EXTRAVERSION =
NAME = Kleptomaniac Octopus NAME = Kleptomaniac Octopus

2
drivers/gpio/Kconfig
View File

@ -1252,6 +1252,7 @@ config GPIO_TPS68470
config GPIO_TQMX86 config GPIO_TQMX86
tristate "TQ-Systems QTMX86 GPIO" tristate "TQ-Systems QTMX86 GPIO"
depends on MFD_TQMX86 || COMPILE_TEST depends on MFD_TQMX86 || COMPILE_TEST
depends on HAS_IOPORT_MAP
select GPIOLIB_IRQCHIP select GPIOLIB_IRQCHIP
help help
This driver supports GPIO on the TQMX86 IO controller. This driver supports GPIO on the TQMX86 IO controller.
@ -1319,6 +1320,7 @@ menu "PCI GPIO expanders"
config GPIO_AMD8111 config GPIO_AMD8111
tristate "AMD 8111 GPIO driver" tristate "AMD 8111 GPIO driver"
depends on X86 || COMPILE_TEST depends on X86 || COMPILE_TEST
depends on HAS_IOPORT_MAP
help help
The AMD 8111 south bridge contains 32 GPIO pins which can be used. The AMD 8111 south bridge contains 32 GPIO pins which can be used.

4
drivers/gpu/drm/nouveau/nouveau_bo.c
View File

@ -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; struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;
int i; int i;
if (!ttm_dma) if (!ttm_dma || !ttm_dma->dma_address)
return; return;
/* Don't waste time looping if the object is coherent */ /* 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; struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;
int i; int i;
if (!ttm_dma) if (!ttm_dma || !ttm_dma->dma_address)
return; return;
/* Don't waste time looping if the object is coherent */ /* Don't waste time looping if the object is coherent */

8
drivers/infiniband/hw/mlx5/flow.c
View File

@ -13,6 +13,7 @@
#include <rdma/ib_umem.h> #include <rdma/ib_umem.h>
#include <linux/mlx5/driver.h> #include <linux/mlx5/driver.h>
#include <linux/mlx5/fs.h> #include <linux/mlx5/fs.h>
#include <linux/mlx5/eswitch.h>
#include "mlx5_ib.h" #include "mlx5_ib.h"
#define UVERBS_MODULE_NAME mlx5_ib #define UVERBS_MODULE_NAME mlx5_ib
@ -316,6 +317,13 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_MATCHER_CREATE)(
if (err) if (err)
goto end; 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; uobj->object = obj;
obj->mdev = dev->mdev; obj->mdev = dev->mdev;
atomic_set(&obj->usecnt, 0); atomic_set(&obj->usecnt, 0);

2
drivers/scsi/sr.c
View File

@ -218,6 +218,8 @@ static unsigned int sr_get_events(struct scsi_device *sdev)
return DISK_EVENT_EJECT_REQUEST; return DISK_EVENT_EJECT_REQUEST;
else if (med->media_event_code == 2) else if (med->media_event_code == 2)
return DISK_EVENT_MEDIA_CHANGE; return DISK_EVENT_MEDIA_CHANGE;
else if (med->media_event_code == 3)
return DISK_EVENT_EJECT_REQUEST;
return 0; return 0;
} }

5
security/integrity/platform_certs/load_uefi.c
View File

@ -11,11 +11,6 @@
#include "../integrity.h" #include "../integrity.h"
#include "keyring_handler.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 * Look to see if a UEFI variable called MokIgnoreDB exists and return true if
* it does. * it does.