diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 14:24:22 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 14:28:44 +0100 |
| commit | 618b00d8d20a4793984f802454c74af8593e898a (patch) | |
| tree | f4c6db9b3ba837d52aa2042e098ffb183fbba747 /include/linux/pci_ids.h | |
| parent | 41fdd6f436e303d317aa10161d4c073558c828c2 (diff) | |
| parent | 72320ecf86001e657f4537cad0f2bf5a6be0fa7e (diff) | |
Merge commit v5.15.138+reverts into fslc-5.15-2.2.x-imx
Revert the following commits in stable before merging, the sources have
been heavely modified by NXP.
d4c8bf5635c4b rpmsg: Fix possible refcount leak in rpmsg_register_device_override()
a82e0fda8a2f8 rpmsg: glink: Release driver_override
bfd4a664ddfbe rpmsg: Fix calling device_lock() on non-initialized device
2e76b4f6218c4 rpmsg: Fix kfree() of static memory on setting driver_override
5c0da71871d3a rpmsg: Constify local variable in field store macro
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Conflicts:
drivers/misc/pci_endpoint_test.c
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 2db202eeafcc..7d8b93acf414 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -556,6 +556,7 @@ #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493 #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443 +#define PCI_DEVICE_ID_AMD_VANGOGH_USB 0x163a #define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653 #define PCI_DEVICE_ID_AMD_19H_M40H_DF_F3 0x167c #define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d |