On Tue, Feb 15, 2011 at 05:24, real mz wrote: > i compared the commit log and found there is over 100 patchs since > last update to 2.6.36.2, so patch it one by one is too hard. > so i suggest to give a whole update to the latest cifs, and my clean > up will be useless if you update linux kernel. > what is your opinion?
i need to be able to clearly differentiate between commits you simply pulled from upstream and changes you made yourself (as well as your changes being split up into logical pieces). so if you wanted to take the 100 upstream commits and merge them into one commit for our tree, that's fine. simply list that information in your commit message. if you dont want to list every git commit id, then listing the inclusive range is OK -- mention the first one you imported by its git commit id, and then note that you imported every commit between that and another git commit id. but you cannot merge upstream commits with your commits into one svn commit. -mike _______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
