kernel-5.15-200

* Tue Nov 09 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-200]
- Revert "add pci_hw_vendor_status()" (Justin M. Forbes)
- Input: i8042 - Add quirk for Fujitsu Lifebook T725 (Takashi Iwai)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2021-11-09 10:12:09 -06:00
commit 80b20b7141
No known key found for this signature in database
GPG key ID: B8FA7924A4B1C140
4 changed files with 7 additions and 67 deletions

View file

@ -1,3 +1,6 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/e7dd4e098056b44495d41d06418a11c4442447e0
e7dd4e098056b44495d41d06418a11c4442447e0 Revert "add pci_hw_vendor_status()"
https://gitlab.com/cki-project/kernel-ark/-/commit/69487df85dc22a202aa7276e2c47ea11ec52eb19
69487df85dc22a202aa7276e2c47ea11ec52eb19 Input: i8042 - Add quirk for Fujitsu Lifebook T725

View file

@ -2973,6 +2973,7 @@ fi
#
%changelog
* Tue Nov 09 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-200]
- Revert "add pci_hw_vendor_status()" (Justin M. Forbes)
- Input: i8042 - Add quirk for Fujitsu Lifebook T725 (Takashi Iwai)
* Mon Nov 08 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-0]

View file

@ -27,7 +27,6 @@
drivers/nvme/host/core.c | 22 +++-
drivers/nvme/host/multipath.c | 19 ++--
drivers/nvme/host/nvme.h | 4 +
drivers/pci/pci-driver.c | 29 +++++
drivers/pci/quirks.c | 24 ++++
drivers/scsi/megaraid/megaraid_sas_base.c | 2 +
drivers/usb/core/hub.c | 7 ++
@ -37,7 +36,6 @@
include/linux/efi.h | 22 ++--
include/linux/lsm_hook_defs.h | 2 +
include/linux/lsm_hooks.h | 6 +
include/linux/pci.h | 4 +
include/linux/random.h | 7 ++
include/linux/rmi.h | 1 +
include/linux/security.h | 5 +
@ -48,7 +46,7 @@
security/lockdown/Kconfig | 13 +++
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
50 files changed, 760 insertions(+), 192 deletions(-)
48 files changed, 727 insertions(+), 192 deletions(-)
diff --git a/Makefile b/Makefile
index ffcc7eadc44b..7c94a55d6770 100644
@ -1469,53 +1467,6 @@ index ed79a6c7e804..961dc67d7261 100644
static inline void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl)
{
}
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 2761ab86490d..aa71a0c904f3 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -19,6 +19,7 @@
#include <linux/kexec.h>
#include <linux/of_device.h>
#include <linux/acpi.h>
+#include <linux/kernel.h>
#include <linux/dma-map-ops.h>
#include "pci.h"
#include "pcie/portdrv.h"
@@ -295,6 +296,34 @@ static struct attribute *pci_drv_attrs[] = {
};
ATTRIBUTE_GROUPS(pci_drv);
+/**
+ * pci_hw_vendor_status - Tell if a PCI device is supported by the HW vendor
+ * @ids: array of PCI device id structures to search in
+ * @dev: the PCI device structure to match against
+ *
+ * Used by a driver to check whether this device is in its list of unsupported
+ * devices. Returns the matching pci_device_id structure or %NULL if there is
+ * no match.
+ *
+ * Reserved for Internal Red Hat use only.
+ */
+const struct pci_device_id *pci_hw_vendor_status(
+ const struct pci_device_id *ids,
+ struct pci_dev *dev)
+{
+ char devinfo[64];
+ const struct pci_device_id *ret = pci_match_id(ids, dev);
+
+ if (ret) {
+ snprintf(devinfo, sizeof(devinfo), "%s %s",
+ dev_driver_string(&dev->dev), dev_name(&dev->dev));
+ mark_hardware_deprecated(devinfo);
+ }
+
+ return ret;
+}
+EXPORT_SYMBOL(pci_hw_vendor_status);
+
struct drv_dev_and_id {
struct pci_driver *drv;
struct pci_dev *dev;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 4537d1ea14fd..af30ab6c81e2 100644
--- a/drivers/pci/quirks.c
@ -1764,21 +1715,6 @@ index 5c4c5c0602cb..753b53038690 100644
* Security hooks for perf events
*
* @perf_event_open:
diff --git a/include/linux/pci.h b/include/linux/pci.h
index cd8aa6fce204..35df61824d02 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1470,6 +1470,10 @@ int pci_add_dynid(struct pci_driver *drv,
unsigned long driver_data);
const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
struct pci_dev *dev);
+/* Reserved for Internal Red Hat use only */
+const struct pci_device_id *pci_hw_vendor_status(
+ const struct pci_device_id *ids,
+ struct pci_dev *dev);
int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
int pass);
diff --git a/include/linux/random.h b/include/linux/random.h
index f45b8be3e3c4..7ccdec68b789 100644
--- a/include/linux/random.h

View file

@ -1,4 +1,4 @@
SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294
SHA512 (linux-5.15.1.tar.xz) = 927a475f0cc40ed08c462130d799b0d74a6200d2db50c92940fc0d63c2aac9029ff4276e5bbfecad49953829599c155a96f8ce563d448f9649432e4c3d730b07
SHA512 (kernel-abi-stablelists-5.15.1-200.tar.bz2) = b3fef602d8ee177d7d7b6294cd3aa39c31be5d7bf5f27f4afcdec9a084ba4736fe2604ed9f8e0db069e97715d43b4772605d4dd7d3a91455aaf730f186a18492
SHA512 (kernel-kabi-dw-5.15.1-200.tar.bz2) = 44a2fa1d3c32d4b2464cdd9e76a68537be12be985b1357ef3ae69e5f0aff1fb1c609998331cf82ac7252b453f41841168e4d88955994d1e2a5b418efe4231156
SHA512 (kernel-abi-stablelists-5.15.1-200.tar.bz2) = f7a474c70bab304459569952e12a43f03e0ce9996d9fb1fd6e1dd26d694a2198f80b18e1140cd81be487c46ad9732b96463497006ffaf1682f1c7c5bc82e568f
SHA512 (kernel-kabi-dw-5.15.1-200.tar.bz2) = 8e06c53dd3b27a3980c9cbbfca86b12ddff0961c1534b56dc6bc292752dfa3dca455a5adbce56c559a4470563df868c62dec76d4ff06df474eef2392e22f8917