Hi Dan, thanks for taking a look at this. You're always very thorough. I'll look into the git command you mentioned, but I need to provide some info, too: On Tue, Aug 23, 2011 at 11:00:25AM +0300, Dan Carpenter wrote: > On Tue, Aug 23, 2011 at 01:53:40PM +0800, Ali Bahar wrote: > > Realtek's latest is v2.6.6. > > Mostly, a few types and definitions have been updated in these files. > > A few functional changes, too. > > > > Same thing. This patch is a mess of random changes with no > explanation. I understand that the reasons might have been forgotten There is not a single thing that's been forgotten here. Everything's logged. One has to, with this many changes! > at this time, but do what you can at least. You need to realize that there were 165 files which showed changes! And I have no commit history for Realtek's changes, and so no known delta for each commit. Individualizing the nature of the changes would have necessitated disentangling a spaghetti of 165 files -- and ensuring that each coherent commit went thru compilation-and-test by itself! Patch 5 gives you an idea of most of what has been shoved into their tarball -- and then there were the Android etc changes! Considering that this was a 3-way merge, there was one overwhelming criterion at the outset: to ensure that the compilation does not crap out. In order to reduce the mess of compiling the lot, I planned to do commits (and so compilations) according to the extent of the changes in each file. This worked for 2 or so commits, but the rest were too entangled. Now I expect that, as you suggested, there is a git tool or two to clean up the patches even more than they have already been cleaned. Suffice to say that getting the rebase and the commit-squashing right was paramount. I will look into the git command you mentioned, after all the feedback comes thru. Thanks again, ali > > regards, > dan carpenter > > _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
