Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:5.4 commit in: /
Date: Wed, 07 Jul 2021 13:14:00
Message-Id: 1625663621.3f55297e81ec138d4f07ea6417d3a869e93f1923.mpagano@gentoo
1 commit: 3f55297e81ec138d4f07ea6417d3a869e93f1923
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 7 13:13:41 2021 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 7 13:13:41 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=3f55297e
7
8 Linux patch 5.4.130
9
10 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
11
12 0000_README | 4 ++
13 1129_linux-5.4.130.patch | 110 +++++++++++++++++++++++++++++++++++++++++++++++
14 2 files changed, 114 insertions(+)
15
16 diff --git a/0000_README b/0000_README
17 index bedf8ea..016d1fd 100644
18 --- a/0000_README
19 +++ b/0000_README
20 @@ -559,6 +559,10 @@ Patch: 1128_linux-5.4.129.patch
21 From: http://www.kernel.org
22 Desc: Linux 5.4.129
23
24 +Patch: 1129_linux-5.4.130.patch
25 +From: http://www.kernel.org
26 +Desc: Linux 5.4.130
27 +
28 Patch: 1500_XATTR_USER_PREFIX.patch
29 From: https://bugs.gentoo.org/show_bug.cgi?id=470644
30 Desc: Support for namespace user.pax.* on tmpfs.
31
32 diff --git a/1129_linux-5.4.130.patch b/1129_linux-5.4.130.patch
33 new file mode 100644
34 index 0000000..e874e17
35 --- /dev/null
36 +++ b/1129_linux-5.4.130.patch
37 @@ -0,0 +1,110 @@
38 +diff --git a/Makefile b/Makefile
39 +index 802520ad08cca..4256dd594d18c 100644
40 +--- a/Makefile
41 ++++ b/Makefile
42 +@@ -1,7 +1,7 @@
43 + # SPDX-License-Identifier: GPL-2.0
44 + VERSION = 5
45 + PATCHLEVEL = 4
46 +-SUBLEVEL = 129
47 ++SUBLEVEL = 130
48 + EXTRAVERSION =
49 + NAME = Kleptomaniac Octopus
50 +
51 +diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
52 +index f9263426af030..ae414045a7506 100644
53 +--- a/drivers/gpio/Kconfig
54 ++++ b/drivers/gpio/Kconfig
55 +@@ -1232,6 +1232,7 @@ config GPIO_TPS68470
56 + config GPIO_TQMX86
57 + tristate "TQ-Systems QTMX86 GPIO"
58 + depends on MFD_TQMX86 || COMPILE_TEST
59 ++ depends on HAS_IOPORT_MAP
60 + select GPIOLIB_IRQCHIP
61 + help
62 + This driver supports GPIO on the TQMX86 IO controller.
63 +@@ -1299,6 +1300,7 @@ menu "PCI GPIO expanders"
64 + config GPIO_AMD8111
65 + tristate "AMD 8111 GPIO driver"
66 + depends on X86 || COMPILE_TEST
67 ++ depends on HAS_IOPORT_MAP
68 + help
69 + The AMD 8111 south bridge contains 32 GPIO pins which can be used.
70 +
71 +diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
72 +index f8015e0318d71..f7603be569fc9 100644
73 +--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
74 ++++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
75 +@@ -542,7 +542,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo)
76 + struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;
77 + int i;
78 +
79 +- if (!ttm_dma)
80 ++ if (!ttm_dma || !ttm_dma->dma_address)
81 + return;
82 +
83 + /* Don't waste time looping if the object is coherent */
84 +@@ -562,7 +562,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo)
85 + struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;
86 + int i;
87 +
88 +- if (!ttm_dma)
89 ++ if (!ttm_dma || !ttm_dma->dma_address)
90 + return;
91 +
92 + /* Don't waste time looping if the object is coherent */
93 +diff --git a/drivers/infiniband/hw/mlx5/flow.c b/drivers/infiniband/hw/mlx5/flow.c
94 +index b198ff10cde96..fddefb29efd76 100644
95 +--- a/drivers/infiniband/hw/mlx5/flow.c
96 ++++ b/drivers/infiniband/hw/mlx5/flow.c
97 +@@ -13,6 +13,7 @@
98 + #include <rdma/ib_umem.h>
99 + #include <linux/mlx5/driver.h>
100 + #include <linux/mlx5/fs.h>
101 ++#include <linux/mlx5/eswitch.h>
102 + #include "mlx5_ib.h"
103 +
104 + #define UVERBS_MODULE_NAME mlx5_ib
105 +@@ -316,6 +317,13 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_MATCHER_CREATE)(
106 + if (err)
107 + goto end;
108 +
109 ++ if (obj->ns_type == MLX5_FLOW_NAMESPACE_FDB &&
110 ++ mlx5_eswitch_mode(dev->mdev->priv.eswitch) !=
111 ++ MLX5_ESWITCH_OFFLOADS) {
112 ++ err = -EINVAL;
113 ++ goto end;
114 ++ }
115 ++
116 + uobj->object = obj;
117 + obj->mdev = dev->mdev;
118 + atomic_set(&obj->usecnt, 0);
119 +diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
120 +index 70a28f6fb1d0d..2332b245b182d 100644
121 +--- a/drivers/scsi/sr.c
122 ++++ b/drivers/scsi/sr.c
123 +@@ -218,6 +218,8 @@ static unsigned int sr_get_events(struct scsi_device *sdev)
124 + return DISK_EVENT_EJECT_REQUEST;
125 + else if (med->media_event_code == 2)
126 + return DISK_EVENT_MEDIA_CHANGE;
127 ++ else if (med->media_event_code == 3)
128 ++ return DISK_EVENT_EJECT_REQUEST;
129 + return 0;
130 + }
131 +
132 +diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c
133 +index aa874d84e413e..f0c908241966a 100644
134 +--- a/security/integrity/platform_certs/load_uefi.c
135 ++++ b/security/integrity/platform_certs/load_uefi.c
136 +@@ -11,11 +11,6 @@
137 + #include "../integrity.h"
138 + #include "keyring_handler.h"
139 +
140 +-static efi_guid_t efi_cert_x509_guid __initdata = EFI_CERT_X509_GUID;
141 +-static efi_guid_t efi_cert_x509_sha256_guid __initdata =
142 +- EFI_CERT_X509_SHA256_GUID;
143 +-static efi_guid_t efi_cert_sha256_guid __initdata = EFI_CERT_SHA256_GUID;
144 +-
145 + /*
146 + * Look to see if a UEFI variable called MokIgnoreDB exists and return true if
147 + * it does.