Stephen Rothwell wrote: > > Hi all, > Hi :-) > Today's linux-next merge of the sound-asoc tree got a conflict in > arch/arm/plat-samsung/include/plat/devs.h between commit > 1b6e8eda6f0e7cd4f28e522a5e77e76f6985af9d ("Merge branch 'next-s5pv310' > into for-next") from the s5p tree and commit > 83e37b8e400ca51cc97946815b3055daacd92fa8 ("ARM: Samsung: Define common > audio-dma device") from the sound-asoc tree. > Oops, sorry for bothering again :-( I will re-merge it in my for-next for avoiding conflict. > I fixed it up (see below) and can carry the fix as necessary. Thanks for your information and Happy New year! Best regards, Kgene. -- Kukjin Kim <kgene.kim@xxxxxxxxxxx>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html