STAGING merge for .36
in [Kernel]
|
Prev: [08/38] arp_notify: allow drivers to explicitly request a notification event.
Next: [27/38] cfg80211: ignore spurious deauth
From: Greg KH on 6 Aug 2010 14:50 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(a)kroah.com> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Linus Torvalds on 6 Aug 2010 15:00 On Thu, Aug 5, 2010 at 2:33 PM, Greg KH <greg(a)kroah.com> 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. I pulled it, because the shortlog matched, and it was all in staging (except for that one x86 mshyperv line), but I just wonder.. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stefan Richter on 6 Aug 2010 19:10
Greg KH wrote: > 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. /If/ that other tree is not a true descendant of origin, then git diff -M --stat --summary origin...HEAD ^^^ shows something else than the .. variant. Somebody who pulls HEAD into a tree that contains origin sees a diffstat from git pull like with from the ... variant of git diff --stat, I think. -- Stefan Richter -=====-==-=- =--- --=== http://arcgraph.de/sr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |