From: David S. Miller Date: Tue, 31 Mar 2020 03:10:34 +0000 (-0700) Subject: Merge branch 'stmmac-Add-additional-EHL-PCI-info-and-PCI-ID' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1a795da798759471cfdc994f5efe998f915f1fd8;p=linux.git Merge branch 'stmmac-Add-additional-EHL-PCI-info-and-PCI-ID' Voon Weifeng says: ==================== stmmac: Add additional EHL PCI info and PCI ID Thanks Jose Miguel Abreu for the feedback. Summary of v2 patches: 1/3: As suggested to keep the stmmac_pci.c file simple. So created a new file dwmac-intel.c and moved all the Intel specific PCI device out of stmmac_pci.c. 2/3: Added Intel(R) Programmable Services Engine (Intel(R) PSE) MAC PCI ID and PCI info 3/3: Added EHL 2.5Gbps PCI ID and info Changes from v1: -Added a patch to move all Intel specific PCI device from stmmac_pci.c to a new file named dwmac-intel.c. -Combine v1 patch 1/3 and 2/3 into single patch. ==================== Signed-off-by: David S. Miller --- 1a795da798759471cfdc994f5efe998f915f1fd8