AnsweredAssumed Answered

merging with a mainline-based tree

Question asked by lyakh on Nov 15, 2011
Latest reply on Nov 18, 2011 by sonic

Hi all


I need to merge the blackfin Linux kernel git tree with a "standard" kernel tree, cloned from the Linus' tree and containing some extra commits in it. This would be a normal git exercise, if the blackfin kernel tree was also based on a mainline tree. Unfortunately, this is not the case, which makes such a merge practically impossible.


My question: is there somewhere a git tree available, based on the mainline but with all the blackfin-specific additions, that are also present in your main development tree ? Or can I at least somehow get a diff from the nearest Linux mainline version to your tree HEAD (the trunk branch will be ok, I think)?


Many thanks and regards