From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 4 Aug 2022 16:46:51 +0000 (-0500)
Subject: Merge branch 'pci/ctrl/vmd'
X-Git-Tag: baikal/mips/sdk6.1~5130^2~4
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=3deeba945ec8553323b0b103e72d336d3b13e365;p=kernel.git

Merge branch 'pci/ctrl/vmd'

- Use devm_kasprintf() instead of simple kasprintf() (Subramanian Mohan)

- Add [8086:7D0B] and [8086:AD0B] devices to VMD driver (Francisco Munoz)

* pci/ctrl/vmd:
  PCI: vmd: Add DID 8086:7D0B and 8086:AD0B for Intel MTL SKUs
  PCI: vmd: Use devm_kasprintf() instead of simple kasprintf()
---

3deeba945ec8553323b0b103e72d336d3b13e365