Annotation of /trunk/kernel-alx/patches-5.4/0229-5.4.130-all-fixes.patch
Parent Directory | Revision Log
Revision 3637 -
(hide annotations)
(download)
Mon Oct 24 12:40:44 2022 UTC (18 months, 3 weeks ago) by niro
File size: 3540 byte(s)
Mon Oct 24 12:40:44 2022 UTC (18 months, 3 weeks ago) by niro
File size: 3540 byte(s)
-add missing
1 | niro | 3637 | diff --git a/Makefile b/Makefile |
2 | index 802520ad08cca..4256dd594d18c 100644 | ||
3 | --- a/Makefile | ||
4 | +++ b/Makefile | ||
5 | @@ -1,7 +1,7 @@ | ||
6 | # SPDX-License-Identifier: GPL-2.0 | ||
7 | VERSION = 5 | ||
8 | PATCHLEVEL = 4 | ||
9 | -SUBLEVEL = 129 | ||
10 | +SUBLEVEL = 130 | ||
11 | EXTRAVERSION = | ||
12 | NAME = Kleptomaniac Octopus | ||
13 | |||
14 | diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig | ||
15 | index f9263426af030..ae414045a7506 100644 | ||
16 | --- a/drivers/gpio/Kconfig | ||
17 | +++ b/drivers/gpio/Kconfig | ||
18 | @@ -1232,6 +1232,7 @@ config GPIO_TPS68470 | ||
19 | config GPIO_TQMX86 | ||
20 | tristate "TQ-Systems QTMX86 GPIO" | ||
21 | depends on MFD_TQMX86 || COMPILE_TEST | ||
22 | + depends on HAS_IOPORT_MAP | ||
23 | select GPIOLIB_IRQCHIP | ||
24 | help | ||
25 | This driver supports GPIO on the TQMX86 IO controller. | ||
26 | @@ -1299,6 +1300,7 @@ menu "PCI GPIO expanders" | ||
27 | config GPIO_AMD8111 | ||
28 | tristate "AMD 8111 GPIO driver" | ||
29 | depends on X86 || COMPILE_TEST | ||
30 | + depends on HAS_IOPORT_MAP | ||
31 | help | ||
32 | The AMD 8111 south bridge contains 32 GPIO pins which can be used. | ||
33 | |||
34 | diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c | ||
35 | index f8015e0318d71..f7603be569fc9 100644 | ||
36 | --- a/drivers/gpu/drm/nouveau/nouveau_bo.c | ||
37 | +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c | ||
38 | @@ -542,7 +542,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo) | ||
39 | struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm; | ||
40 | int i; | ||
41 | |||
42 | - if (!ttm_dma) | ||
43 | + if (!ttm_dma || !ttm_dma->dma_address) | ||
44 | return; | ||
45 | |||
46 | /* Don't waste time looping if the object is coherent */ | ||
47 | @@ -562,7 +562,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo) | ||
48 | struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm; | ||
49 | int i; | ||
50 | |||
51 | - if (!ttm_dma) | ||
52 | + if (!ttm_dma || !ttm_dma->dma_address) | ||
53 | return; | ||
54 | |||
55 | /* Don't waste time looping if the object is coherent */ | ||
56 | diff --git a/drivers/infiniband/hw/mlx5/flow.c b/drivers/infiniband/hw/mlx5/flow.c | ||
57 | index b198ff10cde96..fddefb29efd76 100644 | ||
58 | --- a/drivers/infiniband/hw/mlx5/flow.c | ||
59 | +++ b/drivers/infiniband/hw/mlx5/flow.c | ||
60 | @@ -13,6 +13,7 @@ | ||
61 | #include <rdma/ib_umem.h> | ||
62 | #include <linux/mlx5/driver.h> | ||
63 | #include <linux/mlx5/fs.h> | ||
64 | +#include <linux/mlx5/eswitch.h> | ||
65 | #include "mlx5_ib.h" | ||
66 | |||
67 | #define UVERBS_MODULE_NAME mlx5_ib | ||
68 | @@ -316,6 +317,13 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_MATCHER_CREATE)( | ||
69 | if (err) | ||
70 | goto end; | ||
71 | |||
72 | + if (obj->ns_type == MLX5_FLOW_NAMESPACE_FDB && | ||
73 | + mlx5_eswitch_mode(dev->mdev->priv.eswitch) != | ||
74 | + MLX5_ESWITCH_OFFLOADS) { | ||
75 | + err = -EINVAL; | ||
76 | + goto end; | ||
77 | + } | ||
78 | + | ||
79 | uobj->object = obj; | ||
80 | obj->mdev = dev->mdev; | ||
81 | atomic_set(&obj->usecnt, 0); | ||
82 | diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c | ||
83 | index 70a28f6fb1d0d..2332b245b182d 100644 | ||
84 | --- a/drivers/scsi/sr.c | ||
85 | +++ b/drivers/scsi/sr.c | ||
86 | @@ -218,6 +218,8 @@ static unsigned int sr_get_events(struct scsi_device *sdev) | ||
87 | return DISK_EVENT_EJECT_REQUEST; | ||
88 | else if (med->media_event_code == 2) | ||
89 | return DISK_EVENT_MEDIA_CHANGE; | ||
90 | + else if (med->media_event_code == 3) | ||
91 | + return DISK_EVENT_EJECT_REQUEST; | ||
92 | return 0; | ||
93 | } | ||
94 | |||
95 | diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c | ||
96 | index aa874d84e413e..f0c908241966a 100644 | ||
97 | --- a/security/integrity/platform_certs/load_uefi.c | ||
98 | +++ b/security/integrity/platform_certs/load_uefi.c | ||
99 | @@ -11,11 +11,6 @@ | ||
100 | #include "../integrity.h" | ||
101 | #include "keyring_handler.h" | ||
102 | |||
103 | -static efi_guid_t efi_cert_x509_guid __initdata = EFI_CERT_X509_GUID; | ||
104 | -static efi_guid_t efi_cert_x509_sha256_guid __initdata = | ||
105 | - EFI_CERT_X509_SHA256_GUID; | ||
106 | -static efi_guid_t efi_cert_sha256_guid __initdata = EFI_CERT_SHA256_GUID; | ||
107 | - | ||
108 | /* | ||
109 | * Look to see if a UEFI variable called MokIgnoreDB exists and return true if | ||
110 | * it does. |