5.6-stable patches

added patches:
	pci-add-zhaoxin-vendor-id.patch

diff --git a/queue-5.6/pci-add-zhaoxin-vendor-id.patch b/queue-5.6/pci-add-zhaoxin-vendor-id.patch
new file mode 100644 (file)
index 0000000..04cf61e
--- /dev/null
+++ b/queue-5.6/pci-add-zhaoxin-vendor-id.patch
@@ -0,0 +1,31 @@
+From 3375590623e4a132b19a8740512f4deb95728933 Mon Sep 17 00:00:00 2001
+From: Raymond Pang <RaymondPang-oc@zhaoxin.com>
+Date: Fri, 27 Mar 2020 17:11:46 +0800
+Subject: PCI: Add Zhaoxin Vendor ID
+
+From: Raymond Pang <RaymondPang-oc@zhaoxin.com>
+
+commit 3375590623e4a132b19a8740512f4deb95728933 upstream.
+
+Add Zhaoxin Vendor ID to pci_ids.h
+
+Link: https://lore.kernel.org/r/20200327091148.5190-2-RaymondPang-oc@zhaoxin.com
+Signed-off-by: Raymond Pang <RaymondPang-oc@zhaoxin.com>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/pci_ids.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -2583,6 +2583,8 @@
+ 
+ #define PCI_VENDOR_ID_AMAZON          0x1d0f
+ 
++#define PCI_VENDOR_ID_ZHAOXIN         0x1d17
++
+ #define PCI_VENDOR_ID_HYGON           0x1d94
+ 
+ #define PCI_VENDOR_ID_HXT             0x1dbf

diff --git a/queue-5.6/series b/queue-5.6/series
index 15b0344521f2cab11aadbc79b059c2d1284a9a8b..4fdfc22f29b95911a2f29dcc9333f30bc6661a57 100644 (file)
--- a/queue-5.6/series
+++ b/queue-5.6/series
@@ -41,6 +41,7 @@ svcrdma-fix-leak-of-svc_rdma_recv_ctxt-objects.patch
 net-mlx5e-don-t-trigger-irq-multiple-times-on-xsk-wakeup-to-avoid-wq-overruns.patch
 net-mlx5e-get-the-latest-values-from-counters-in-switchdev-mode.patch
 pci-avoid-asmedia-xhci-usb-pme-from-d0-defect.patch
+pci-add-zhaoxin-vendor-id.patch
 pci-add-acs-quirk-for-zhaoxin-multi-function-devices.patch
 pci-add-acs-quirk-for-zhaoxin-root-downstream-ports.patch
 pci-move-apex-edge-tpu-class-quirk-to-fix-bar-assignment.patch