Subject: linux-next: semantic conflict between the drm-misc tree and Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 10 Jun 2025 12:48:09 +1000

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/accel/qaic/qaic_ras.c: In function 'decode_ras_msg':
drivers/accel/qaic/qaic_ras.c:325:17: error: implicit declaration of function 'pci_printk'; did you mean 'pci_intx'? [-Wimplicit-function-declaration]
  325 |                 pci_printk(level, qdev->pdev, "RAS event.\nClass:%s\nDescription:%s %s %s\nError Threshold for this report %d\nSyndrome:\n    0x%llx\n    0x%llx\n    0x%llx\n    0x%llx\n    0x%llx\n    0x%llx\n    0x%llx\n    0x%llx\n",
      |                 ^~~~~~~~~~
      |                 pci_intx

Caused by commit

  c11a50b170e7 ("accel/qaic: Add Reliability, Accessibility, Serviceability (RAS)")

interacting with commit

  1c8a0ed2043c ("PCI: Remove unused pci_printk()")

from Linus' tree (in v6.16-rc1).

As a fix up patch would be a bit of a mess, I have used the drm-misc
tree from next-20250606 for today.

-- 
Cheers,
Stephen Rothwell