Hi all,

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

  sound/soc/samsung/Kconfig

between commit:

  82e8d723e9e6 ("sound: Fix Kconfig indentation")

from the sound tree and commits:

  03081cc370b9 ("ASoC: samsung: arndale: Add support for WM1811 CODEC")
  dca6408d6f7e ("ASoC: samsung: Rename Arndale card driver")

from the sound-asoc tree.

I fixed it up (this latter commit also does what the sound tree commit
did) 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