Re: [GIT PATCH] big staging merge for 3.2
From: Linus Torvalds
Date: Wed Oct 26 2011 - 10:00:13 EST
On Wed, Oct 26, 2011 at 2:07 PM, Greg KH <greg@xxxxxxxxx> 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
> 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?
> All patches have been in the -next releases for a while now.
So I got several conflicts with the networking tree. Most of them were
trivial (eg driver removal conflicting with somebody trying to fix up
the now dead driver), but I really hope somebody looks at the
resulting drivers/staging/et131x/et131x.c file.
That driver wasn't removed, it was consolidated as one big file, and
so the fixes to the original files needed to be resolved. I tried to
do that correctly, but there's the skb_frag_dma_map() change and the
removal of .ndo_set_multicast_list, and while I think I did it right,
I really want somebody who knows that code to double check me.
Appropriate people to do that added to the cc,
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/