linux-kernel - Re: [GIT PATCH] big staging merge for 3.2

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 26 Oct 2011 23:06:41 +0200
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@...uxdriverproject.org,
	Mark Einon <mark.einon@...il.com>,
	Jiri Pirko <jpirko@...hat.com>,
	"David S. Miller" <davem@...emloft.net>,
	Ian Campbell <ian.campbell@...rix.com>
Subject: Re: [GIT PATCH] big staging merge for 3.2

On Wed, Oct 26, 2011 at 03:59:40PM +0200, Linus Torvalds wrote:
> On Wed, Oct 26, 2011 at 2:07 PM, Greg KH <greg@...ah.com> wrote:
> >
> > Here is the big staging merge for 3.2
> >
> > Note, I ended up merging this with your 3.1 release to resolve a merge
> > issue with one of the comedi drivers to fix a build issue.  If you want
> > me to redo the tree without this merge, I'll be glad to do so and let
> > you do it :)
> 
> I don't hate merges that make sense, and that one looks fine. You
> picked a logical merge point, and you wrote a merge message that
> explains it. No problem.
> 
> > There's a lot of patches in here, and the overall diff is quite
> > impressive:
> >  834 files changed, 103718 insertions(+), 230262 deletions(-)
> 
> Hmm... I only get
> 
>  725 files changed, 103936 insertions(+), 180480 deletions(-)
> 
> Which is still good, but nothing like your numbers. Where did you find
> the extra 50k lines?

I don't know, I took it straight from git.

I did a:
	git diff -M --stat --summary master..HEAD

And in that tree master was v3.1 and HEAD was 43a3beb6da994549ec28a9f31727b997a025f958
so if you do:
	git diff -M --stat --summary v3.1..43a3beb6da994549ec28a9f31727b997a025f958

in your tree, I also get the above diffstat:

$ git diff -M --stat --summary v3.1..43a3beb6da994549ec28a9f31727b997a025f958 | grep insert
 834 files changed, 103718 insertions(+), 230262 deletions(-)

Did I do that wrong?  There are a lot of renames, is my default value
for git different than what you might have on your box?  Or am I diffing
the wrong thing here?

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/