[Sorry about the top posting. Outlook is evil.] The problem is there are a number of patches in the Meego kernel that do not apply cleanly to a git tree. Either they are raw diffs, git patches that were generated with "git show" or gitweb, or patches that had the headers stripped off.
If you try to reconstruct a real git tree with history you encounter a number of problems. The above patches that do not apply cleanly is just one. The Alan Cox patchset from 08-24-10 is no longer representative of the patches in the Alan Cox tree because of continual modifications to that patch since that date. The biggest conflict is the eMMC patch pulled from 2.6.37-rc1 that is inserted before the AC patch. The AC patch was modified in a way that does not fit the history cleanly. (That patch should have been added after the AC patchset.) There is also the issue of the cherrypick patch, which is just a big raw diff with no signoffs. History for this cannot be reconstructed because there is no clue as to what patches this blob represents. There is also the issue of the compat-wireless that was hacked into the kernel.spec.in file. For my builds I just create a patch instead. (It was an interesting surprise, to say the least...) I can provide a list of all the patches that do not apply correctly. The reason that we need history is that I have customers requesting a real git tree with actual history. Quilt just does not cut it for that customer and for internal development. -----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of Arjan van de Ven Sent: Friday, December 03, 2010 7:18 AM To: Janne Karhunen Cc: [email protected] Subject: Re: [Meego-kernel] rejects against .35? On 12/3/2010 3:56 AM, Janne Karhunen wrote: > Hi, > > Just me or did someone commit stuff that does not even apply? Log > attached. > sequence_patch --quilt; what's this sequence_patch thing? best approach is to just use plain quilt... the kernel rpm is a quilt series, there's a series file for it in the src.rpm etc etc .... _______________________________________________ MeeGo-kernel mailing list [email protected] http://lists.meego.com/listinfo/meego-kernel _______________________________________________ MeeGo-kernel mailing list [email protected] http://lists.meego.com/listinfo/meego-kernel
