4.14-stable patches

added patches:
	pci-add-wrappers-for-dev_printk.patch

diff --git a/queue-4.14/pci-add-wrappers-for-dev_printk.patch b/queue-4.14/pci-add-wrappers-for-dev_printk.patch
new file mode 100644 (file)
index 0000000..4f1c1fb
--- /dev/null
+++ b/queue-4.14/pci-add-wrappers-for-dev_printk.patch
@@ -0,0 +1,42 @@
+From 7506dc7989933235e6fc23f3d0516bdbf0f7d1a8 Mon Sep 17 00:00:00 2001
+From: Frederick Lawler <fred@fredlawl.com>
+Date: Thu, 18 Jan 2018 12:55:24 -0600
+Subject: PCI: Add wrappers for dev_printk()
+
+From: Frederick Lawler <fred@fredlawl.com>
+
+commit 7506dc7989933235e6fc23f3d0516bdbf0f7d1a8 upstream.
+
+Add PCI-specific dev_printk() wrappers and use them to simplify the code
+slightly.  No functional change intended.
+
+Signed-off-by: Frederick Lawler <fred@fredlawl.com>
+[bhelgaas: squash into one patch]
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+[only take the pci.h portion of this patch, to make backporting stuff
+easier over time - gregkh]
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/pci.h |   12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -2292,4 +2292,16 @@ static inline bool pci_is_thunderbolt_at
+ /* provide the legacy pci_dma_* API */
+ #include <linux/pci-dma-compat.h>
+ 
++#define pci_printk(level, pdev, fmt, arg...) \
++      dev_printk(level, &(pdev)->dev, fmt, ##arg)
++
++#define pci_emerg(pdev, fmt, arg...)  dev_emerg(&(pdev)->dev, fmt, ##arg)
++#define pci_alert(pdev, fmt, arg...)  dev_alert(&(pdev)->dev, fmt, ##arg)
++#define pci_crit(pdev, fmt, arg...)   dev_crit(&(pdev)->dev, fmt, ##arg)
++#define pci_err(pdev, fmt, arg...)    dev_err(&(pdev)->dev, fmt, ##arg)
++#define pci_warn(pdev, fmt, arg...)   dev_warn(&(pdev)->dev, fmt, ##arg)
++#define pci_notice(pdev, fmt, arg...) dev_notice(&(pdev)->dev, fmt, ##arg)
++#define pci_info(pdev, fmt, arg...)   dev_info(&(pdev)->dev, fmt, ##arg)
++#define pci_dbg(pdev, fmt, arg...)    dev_dbg(&(pdev)->dev, fmt, ##arg)
++
+ #endif /* LINUX_PCI_H */

diff --git a/queue-4.14/series b/queue-4.14/series
index c925faa0880f4a58382dc8df4b11f7dba2e1de6a..2888086663fa00a8f649972960b6d5bba57d6a72 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -17,6 +17,7 @@ replace-magic-for-trusting-the-secondary-keyring-with-define.patch
 fix-kexec-forbidding-kernels-signed-with-keys-in-the-secondary-keyring-to-boot.patch
 powerpc-fadump-handle-crash-memory-ranges-array-index-overflow.patch
 powerpc-pseries-fix-endianness-while-restoring-of-r3-in-mce-handler.patch
+pci-add-wrappers-for-dev_printk.patch
 powerpc-powernv-pci-work-around-races-in-pci-bridge-enabling.patch
 cxl-fix-wrong-comparison-in-cxl_adapter_context_get.patch
 ib_srpt-fix-a-use-after-free-in-srpt_close_ch.patch