Conflicting commits changing VPD sysfs attribute to static

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Conflicting commits changing VPD sysfs attribute to static
From: Heiner Kallweit <hkallweit1@xxxxxxxxx>
Date: Wed, 28 Apr 2021 08:31:28 +0200
Cc: "linux-pci@xxxxxxxxxxxxxxx" <linux-pci@xxxxxxxxxxxxxxx>, Krzysztof Wilczyński <kw@xxxxxxxxx>
User-agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0

85725825c10a ("PCI/sysfs: Convert "vpd" to static attribute") duplicates
what 1e3b0fb5e4d1 ("PCI/VPD: Convert sysfs file to static attribute") did
already. So this will conflict once you merge pci/sysfs.

Follow-Ups:
- Re: Conflicting commits changing VPD sysfs attribute to static
  - From: Bjorn Helgaas

Prev by Date: RE: [PATCH] PCI: pciehp: Ignore Link Down/Up caused by DPC
Next by Date: Re: [PATCH v2 2/2] pci: Support "removable" attribute for PCI devices
Previous by thread: [PATCH v1 0/4] PCI: brcmstb: Add panic handler and shutdown func
Next by thread: Re: Conflicting commits changing VPD sysfs attribute to static
Index(es):
- Date
- Thread

[Index of Archives] [DMA Engine] [Linux Coverity] [Linux USB] [Video for Linux] [Linux Audio Users] [Yosemite News] [Linux Kernel] [Linux SCSI] [Greybus]

Powered by Linux