[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 3029ad91335353a70feb42acd24d580d70ab258b
WARNING: Author mismatch between patch and upstream commit: Backport author: Tomita Moekotomitamoeko@gmail.com Commit author: Jiaqing Zhaojiaqing.zhao@linux.intel.com
Status in newer kernel trees: 6.13.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (exact SHA1) 6.1.y | Not found
Note: The patch differs from the upstream commit: --- 1: 3029ad9133535 ! 1: 32a751d45e995 can: ems_pci: move ASIX AX99100 ids to pci_ids.h @@ ## Metadata ## -Author: Jiaqing Zhao jiaqing.zhao@linux.intel.com +Author: Tomita Moeko tomitamoeko@gmail.com
## Commit message ## - can: ems_pci: move ASIX AX99100 ids to pci_ids.h + PCI: add ASIX AX99100 ids to pci_ids.h + + [ Upstream commit 3029ad91335353a70feb42acd24d580d70ab258b ]
Move PCI Vendor and Device ID of ASIX AX99100 PCIe to Multi I/O Controller to pci_ids.h for its serial and parallel port driver support in subsequent patches.
+ [Moeko: Rename from "can: ems_pci: move ASIX AX99100 ids to pci_ids.h"] + [Moeko: Drop changes in drivers/net/can/sja1000/ems_pci.c] + Signed-off-by: Jiaqing Zhao jiaqing.zhao@linux.intel.com Reviewed-by: Andy Shevchenko andriy.shevchenko@linux.intel.com Acked-by: Bjorn Helgaas bhelgaas@google.com Acked-by: Marc Kleine-Budde mkl@pengutronix.de Link: https://lore.kernel.org/r/20230724083933.3173513-3-jiaqing.zhao@linux.intel.... Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org - - ## drivers/net/can/sja1000/ems_pci.c ## -@@ drivers/net/can/sja1000/ems_pci.c: struct ems_pci_card { - - #define EMS_PCI_BASE_SIZE 4096 /* size of controller area */ - --#ifndef PCI_VENDOR_ID_ASIX --#define PCI_VENDOR_ID_ASIX 0x125b --#define PCI_DEVICE_ID_ASIX_9110 0x9110 --#endif - #define PCI_SUBDEVICE_ID_EMS 0x4010 - - static const struct pci_device_id ems_pci_tbl[] = { -@@ drivers/net/can/sja1000/ems_pci.c: static const struct pci_device_id ems_pci_tbl[] = { - /* CPC-104P v2 */ - {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_PLX, 0x4002}, - /* CPC-PCIe v3 */ -- {PCI_VENDOR_ID_ASIX, PCI_DEVICE_ID_ASIX_9110, 0xa000, PCI_SUBDEVICE_ID_EMS}, -+ {PCI_VENDOR_ID_ASIX, PCI_DEVICE_ID_ASIX_AX99100_LB, 0xa000, PCI_SUBDEVICE_ID_EMS}, - {0,} - }; - MODULE_DEVICE_TABLE(pci, ems_pci_tbl); + Signed-off-by: Tomita Moeko tomitamoeko@gmail.com
## include/linux/pci_ids.h ## @@ ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Failed | | stable/linux-5.15.y | Success | Failed | | stable/linux-5.10.y | Success | Failed | | stable/linux-5.4.y | Success | Failed |
Build Errors: Build error for stable/linux-6.1.y: ssh: connect to host 192.168.1.58 port 22: No route to host
Build error for stable/linux-5.15.y: ssh: connect to host 192.168.1.58 port 22: No route to host
Build error for stable/linux-5.10.y: ssh: connect to host 192.168.1.58 port 22: No route to host
Build error for stable/linux-5.4.y: ssh: connect to host 192.168.1.58 port 22: No route to host