On Fri, Jan 21, 2011 at 12:09:07PM -0800, Vipin Mehta wrote: > On Fri, Jan 21, 2011 at 11:55:09AM -0800, Greg KH wrote: > > On Fri, Jan 21, 2011 at 11:48:40AM -0800, Vipin Mehta wrote: > > > On Fri, Jan 21, 2011 at 11:38:30AM -0800, Greg KH wrote: > > > > On Fri, Jan 21, 2011 at 11:23:18AM -0800, Vipin Mehta wrote: > > > > > The following set of patches fixes the driver's coding style in > > > > > accordance with the Linux kernel coding style. The patches ended > > > > > being huge so putting them up on a shared location where they can > > > > > be retrieved using wget. > > > > > > > > > > http://userweb.kernel.org/~vmehta/ath6kl-cleanup.tar.bz2 > > > > > > > > Interesting, however the very first patch fails to apply :( > > > > > > I generated the patches after rebasing my tree to the > > > remotes/origin/staging-linus in the staging-2.6 tree. I tested it > > > again just a whilw back and the patches do apply. > > > > These patches are NOT for staging-linus as they are not to go to him > > until the .39 merge window is open, right? Please rebase them on the > > staging-next tree. > > > The only difference in ath6kl between the staging-linus and staging-next > is the following patch that was applied yesterday in the staging-linus > branch: > > http://git.kernel.org/?p=linux/kernel/git/gregkh/staging-2.6.git;a=commit;h=64911e4b133ff633563d6dd2b021fa1ca0608992 > > The reason I used staging-linus is because I wanted to apply these > patches on top of the above patch which we will have to do eventually. That's nice, but not how I can do things, sorry. > We will have to go through the pain later which I already went through > yesterday while redoing these patches on top of the above one. Is it > possible for you to apply the commit > 64911e4b133ff633563d6dd2b021fa1ca0608992 > before applying this series? No, I don't want to apply the same patch to 2 different branches. When that patch is in Linus's tree, then I will worry about merging them together, but that's something I do all the time, and not a big deal. I need this series against the proper branch, if I am going to be able to apply them. Otherwise I will gladly just ignore them, which is not what I think you or Joe wants... thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
