| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20100806184149.GA23308@kroah.com> Date: Fri, 6 Aug 2010 11:41:49 -0700 From: Greg KH <greg@...ah.com> To: Linus Torvalds <torvalds@...ux-foundation.org> Cc: Andrew Morton <akpm@...ux-foundation.org>, linux-kernel@...r.kernel.org, devel@...verdev.osuosl.org Subject: Re: [GIT PATCH] STAGING merge for .36 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@...ah.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@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists