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

[Stephen Rothwell]

Hi all,

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

  sound/soc/codecs/Kconfig

between commit:

  82e8d723e9e6 ("sound: Fix Kconfig indentation")

from the sound tree and commit:

  36da67630d31 ("ASoC: Add DA7213 audio codec as selectable option")

from the sound-asoc tree.

I fixed it up (I just used the latter version which also fixed the
indentation) 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

Attachment: pgpWEmfq54amL.pgp
Description: OpenPGP digital signature