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  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Date:   Thu, 14 May 2020 11:02:23 +1000
From:   Stephen Rothwell <>
To:     Bjorn Helgaas <>
Cc:     Linux Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Kai-Heng Feng <>
Subject: linux-next: manual merge of the pci tree with Linus' tree

Hi all,

Today's linux-next merge of the pci tree got a conflict in:


between commit:

  0a8f41023e8a ("PCI: Move Apex Edge TPU class quirk to fix BAR assignment")

from Linus' tree and commit:

  68f5fc4ea9dd ("PCI: Avoid Pericom USB controller OHCI/EHCI PME# defect")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Stephen Rothwell

diff --cc drivers/pci/quirks.c
index ca9ed5774eb1,7b4a98d0f0fd..000000000000
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@@ -5568,9 -5568,15 +5568,22 @@@ static void pci_fixup_no_d0_pme(struct 
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x2142, pci_fixup_no_d0_pme);
 +static void apex_pci_fixup_class(struct pci_dev *pdev)
 +	pdev->class = (PCI_CLASS_SYSTEM_OTHER << 8) | pdev->class;
 +			       PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class);
+ /*
+  * Device [12d8:0x400e] and [12d8:0x400f]
+  * These devices advertise PME# support in all power states but don't
+  * reliably assert it.
+  */
+ static void pci_fixup_no_pme(struct pci_dev *dev)
+ {
+ 	pci_info(dev, "PME# is unreliable, disabling it\n");
+ 	dev->pme_support = 0;
+ }

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists