linux-next: manual merge of the wireless-next tree with the arm64 tree

[Mark Brown]

Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  include/linux/pci_ids.h

between commit:

  cf65b4d765b5f ("perf/dwc_pcie: Add support for Picoheart vendor devices")

from the arm64 tree and commit:

  888b1934642b7 ("PCI: Move Spacemit vendor and device IDs to linux/pci_ids.h")

from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc include/linux/pci_ids.h
index b0aad3af268b6,d6f26cacc8e35..0000000000000
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -2640,8 -2640,10 +2640,12 @@@
  #define PCI_VENDOR_ID_SUNIX		0x1fd4
  #define PCI_DEVICE_ID_SUNIX_1999	0x1999
  
+ #define PCI_VENDOR_ID_SPACEMIT		0x201f
+ #define PCI_DEVICE_ID_SPACEMIT_K1	0x0001
+ #define PCI_DEVICE_ID_SPACEMIT_K3	0x0002
+ 
 +#define PCI_VENDOR_ID_PICOHEART		0x20fa
 +
  #define PCI_VENDOR_ID_HINT             0x3388
  #define PCI_DEVICE_ID_HINT_VXPROII_IDE 0x8013

Attachment: signature.asc
Description: PGP signature