[lkml]   [2011]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: [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 <> 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?
    > > 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,
    > Linus

    Hi Linus,

    The code changes look good, but it also needs the removal of a NETDEV_1000 dependency in the Kconfig file.

    I sent a patch for these changes yesterday, you can find it here :

    It's practically identical to your fixes, except for the Kconfig change.


    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to
    More majordomo info at
    Please read the FAQ at

     \ /
      Last update: 2011-10-26 16:27    [W:0.023 / U:12.888 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site