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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250610124809.1e1ff0cd@canb.auug.org.au>
Date: Tue, 10 Jun 2025 12:48:09 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Simona Vetter <simona.vetter@...ll.ch>
Cc: Jeff Hugo <jeff.hugo@....qualcomm.com>, Bjorn Helgaas
 <bhelgaas@...gle.com>, Ilpo Järvinen
 <ilpo.jarvinen@...ux.intel.com>, Krzysztof Wilczyński
 <kwilczynski@...nel.org>, Intel Graphics <intel-gfx@...ts.freedesktop.org>,
 DRI <dri-devel@...ts.freedesktop.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: semantic conflict  between  the drm-misc tree and
 Linus' tree

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

Content of type "application/pgp-signature" skipped