Le 2 août 2014 à 19:02, Yves Blusseau <bluss...@zetam.org> a écrit :
> Hi all, > > it's seems that commits from maint has not be fully merge into master: > > Performing inexact rename detection: 100% (14352/14352), done. > Auto-merging repo/linux/buildtool.cfg > CONFLICT (content): Merge conflict in repo/linux/buildtool.cfg > CONFLICT (rename/delete): repo/linux/Bering-3.4.101.config-x86_64.patch > deleted in HEAD and renamed in maint. Version maint of > repo/linux/Bering-3.4.101.config-x86_64.patch left in tree. > CONFLICT (rename/delete): repo/linux/Bering-3.4.101.config-i686.patch deleted > in HEAD and renamed in maint. Version maint of > repo/linux/Bering-3.4.101.config-i686.patch left in tree. > CONFLICT (rename/delete): repo/linux/Bering-3.4.101.config-i486.patch deleted > in HEAD and renamed in maint. Version maint of > repo/linux/Bering-3.4.101.config-i486.patch left in tree. > CONFLICT (rename/delete): repo/linux/Bering-3.4.101.config-geode.patch > deleted in HEAD and renamed in maint. Version maint of > repo/linux/Bering-3.4.101.config-geode.patch left in tree. > CONFLICT (rename/rename): Rename > "repo/linux/Bering-3.4.100.config-versatile.patch"->"repo/linux/Bering-3.10.49.config-versatile.patch" > in branch "HEAD" rename > "repo/linux/Bering-3.4.100.config-versatile.patch"->"repo/linux/Bering-3.4.101.config-versatile.patch" > in "maint" > CONFLICT (rename/rename): Rename > "repo/linux/Bering-3.4.100.config"->"repo/linux/Bering-3.10.49.config" in > branch "HEAD" rename > "repo/linux/Bering-3.4.100.config"->"repo/linux/Bering-3.4.101.config" in > "maint" > Recorded preimage for 'repo/linux/buildtool.cfg' > Automatic merge failed; fix conflicts and then commit the result. > > KP it's seems that is you that update the kernel in maint to 3.4.101. So can > you merge the change into master ? I have done the merge. Regards, Yves ------------------------------------------------------------------------------ Want fast and easy access to all the code in your enterprise? Index and search up to 200,000 lines of code with a free copy of Black Duck Code Sight - the same software that powers the world's largest code search on Ohloh, the Black Duck Open Hub! Try it now. http://p.sf.net/sfu/bds _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
