linux-next: manual merge of the sound tree with the pci tree

[Stephen Rothwell]

Hi all,

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

  include/linux/pci_ids.h

between commit:

  0ac448e0d29d ("PCI: Delay after FLR of Solidigm P44 Pro NVMe")

from the pci tree and commit:

  28bd137a3c8e ("ALSA: hda: Add Loongson LS7A HD-Audio support")

from the sound 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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/pci_ids.h
index 0f9cdc6195a1,c0c4ca8e2851..000000000000
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -158,8 -158,9 +158,11 @@@
  
  #define PCI_VENDOR_ID_LOONGSON		0x0014
  
+ #define PCI_DEVICE_ID_LOONGSON_HDA      0x7a07
+ #define PCI_DEVICE_ID_LOONGSON_HDMI     0x7a37
+ 
 +#define PCI_VENDOR_ID_SOLIDIGM		0x025e
 +
  #define PCI_VENDOR_ID_TTTECH		0x0357
  #define PCI_DEVICE_ID_TTTECH_MC322	0x000a

Attachment: pgpRHpJd5ZWvL.pgp
Description: OpenPGP digital signature