Merge branch 'pci/trace'

- Add generic RAS tracepoint for hotplug events (Shuai Xue)

- Add RAS tracepoint for link speed changes (Shuai Xue)

* pci/trace:
  Documentation: tracing: Add PCI tracepoint documentation
  PCI: trace: Add RAS tracepoint to monitor link speed changes
  PCI: trace: Add generic RAS tracepoint for hotplug event

diff --cc drivers/pci/Makefile
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/pci.h
Simple merge

diff --cc drivers/pci/pcie/bwctrl.c
Simple merge

diff --cc drivers/pci/probe.c
index 9494e7f6e36fce30abead02740ead477d8e91ec4,392b7dc3d3915d745fe4578bff57bd44f4d1556e..1d4e7e1b0ba1ac58637893f9f43d18f3dfdac065
--- 1/drivers/pci/probe.c
--- 2/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -23,8 -22,12 +23,9 @@@
  #include <linux/irqdomain.h>
  #include <linux/pm_runtime.h>
  #include <linux/bitfield.h>
+ #include <trace/events/pci.h>
  #include "pci.h"
  
 -#define CARDBUS_LATENCY_TIMER 176     /* secondary latency timer */
 -#define CARDBUS_RESERVE_BUSNR 3
 -
  static struct resource busn_resource = {
        .name   = "PCI busn",
        .start  = 0,