On Fri, Aug 06, 2010 at 11:27:02AM -0700, Linus Torvalds wrote: > On Thu, Aug 5, 2010 at 2:33 PM, Greg KH <greg@xxxxxxxxx> wrote: > > Here's the big staging tree merge for the .36 kernel. > > > > 812 files changed, 106306 insertions(+), 33784 deletions(-) > > Hmm. How did you generate that diff? It's not what I get. I get > > 812 files changed, 107586 insertions(+), 35064 deletions(-) > > which is sufficiently different that it makes me worry about what's going on. Very odd. I did: git diff -M --stat --summary origin..HEAD That's what I've been doing for a while now, and it has been working for the other trees. This one was a bit different in that I did have to pull from a different tree for one of the drivers, but that merged together nicely from what the end result looked like. Should I do something else for my pull summaries? > I pulled it, because the shortlog matched, and it was all in staging > (except for that one x86 mshyperv line), but I just wonder.. That's good, but I wonder as well. thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
