29.07.2014 22:53, Yves Blusseau пишет: > Le 29 juil. 2014 à 21:35, Andrew <ni...@seti.kr.ua> a écrit : > >> Fixed. I've cherry-picked significant commits into kernel-3.14, and >> forced next branch to point at current master branch. >> >> For all, you need to do `git reset --hard origin/next` on next branch, >> if it is in your local repo. > > Thanks andrew. > > In the kernel-3.14 branch you remove the commit 0db9f10f of kapeka: > > commit 0db9f10fda5c357e168f9ce06d86447011a5b4af > Author: kapeka <kap...@users.sourceforge.net> > Date: Sat Aug 3 14:53:30 2013 > > copy uuid/uuid.h into staging > > Is this commit needed ? If yes perhaps it can be include in the current > master branch ? > > About other branch, is the kernel34-branch still valid ? > > Regards, > Yves This commit seems to be cherry-picked/manually placed into master branch earlier. In any case, lines that were added by this patch are present into makefile.
------------------------------------------------------------------------------ Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
