Conflicting commits changing VPD sysfs attribute to static

Linux PCI subsystem development
 help / color / mirror / Atom feed

* Conflicting commits changing VPD sysfs attribute to static
@ 2021-04-28  6:31 Heiner Kallweit
  2021-04-28 20:44 ` Bjorn Helgaas
  0 siblings, 1 reply; 2+ messages in thread
From: Heiner Kallweit @ 2021-04-28  6:31 UTC (permalink / raw)
  To: Bjorn Helgaas; +Cc: linux-pci@vger.kernel.org, Krzysztof Wilczyński

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.

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Conflicting commits changing VPD sysfs attribute to static
  2021-04-28  6:31 Conflicting commits changing VPD sysfs attribute to static Heiner Kallweit
@ 2021-04-28 20:44 ` Bjorn Helgaas
  0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2021-04-28 20:44 UTC (permalink / raw)
  To: Heiner Kallweit
  Cc: Bjorn Helgaas, linux-pci@vger.kernel.org,
	Krzysztof Wilczyński

On Wed, Apr 28, 2021 at 08:31:28AM +0200, Heiner Kallweit wrote:
> 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.

Thanks for the heads-up.  I tried to meld 1e3b0fb5e4d1 and
85725825c10a together and put the result on pci/sysfs along with the
other static attribute changes.  Let me know if you see anything I
messed up.

Bjorn

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-04-28 20:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-28  6:31 Conflicting commits changing VPD sysfs attribute to static Heiner Kallweit
2021-04-28 20:44 ` Bjorn Helgaas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox