Jassi Brar wrote:
On Fri, Oct 22, 2010 at 11:08 PM, Kukjin Kim kgene.kim@samsung.com wrote:
Patches 11 through 16 apply to Kgene's tree, rest apply to Mark Brown's.
Hmm...
I faced with following build error after applying above 6 patches into my tree. It means can't make clean tree with only arch/arm patches?... NO...just need to update arch/arm/plat-samsung/include/plat/audio.h of your 10/24 patch. Please separate 10/24...there is no reason that to change plat/audio.h belong to 10/24(Add common I2S driver)
I had initially planned to send codes via relevant trees. So, the plat/audio.h update(along with arch/ audio ) was legit to be part of I2S ASoC drivers update. The change could be atomic if sent via ASoC tree.
I can segregate the changes, if you are going prepare a branch for Mark to exchange inter-dependent patches. Will do.
Thanks. I will make 'for-broonie' which includes ARCH_S5P64X0 and GPIO updates for your patches.
The incorrect symbol name and missing semicolon is totally my mistake. I sent the last but one version of patches by mistake. Will update soon.
No prob. ;-)
Mark, I am hesitant to resend 24 patches to ALSA ML with only 1 patch divided into two, but perhaps I have no other option ?
Mark,
As I said, will make 'for-broonie' and merge it into my tree for -next so that you can merge its merge commit. Then...you will not meet any conflict in your tree due to Jassi's arch/arm stuff changes.
Maybe it will be done tomorrow morning(KST)... If any concerns or opinions, please let me know.
Thanks.
Best regards, Kgene. -- Kukjin Kim kgene.kim@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.