Re: [GIT PATCH] big staging merge for 3.2

[Linus Torvalds]

On Wed, Oct 26, 2011 at 11:06 PM, Greg KH <greg@xxxxxxxxx> wrote:
>>
>> 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?

No, what apparently happened is that some of the removals had already
come in through the networking tree (ath6kl in particular). So I had
merged that earlier - and git merged it all fine - and thus to me the
staging tree didn't remove as much as it did for you ;)

See commit 9ac4025d8088 (yours) and af2bf4b4ee58 (network tree)..

And yeah, that driver was about 50k lines.

           Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/