From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 6 Feb 2026 23:09:26 +0000 (-0600)
Subject: Merge branch 'pci/trace'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=401b356520f403a6ce8627c1eb74ffd13d38f8d3;p=thirdparty%2Fkernel%2Flinux.git

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
---

401b356520f403a6ce8627c1eb74ffd13d38f8d3
diff --cc drivers/pci/probe.c
index 9494e7f6e36fc,392b7dc3d3915..1d4e7e1b0ba1a
--- a/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,