Slashdot Mirror


Torvalds Gets Tough on Kernel Contributors

ChocLinux writes "Linus Torvalds is cracking down on developers that add last-minute changes to the kernel during the two-week merge window. He says: 'If people miss the merge window or start abusing it with hurried last-minute things that just cause problems for -rc1, I'll just refuse to merge, and laugh in their faces derisively when they whine plaintively at me, and tell them there's going to be a new opening soon enough.'"

50 of 246 comments (clear)

  1. Good by bblazer · · Score: 4, Interesting

    While I think that his language is a bit inflammatory, I think that it is something that needs to be done. All the last minute changes must make things very difficult to manage.

    --
    My .bashrc can beat up your .bashrc!
    1. Re:Good by garcia · · Score: 2, Informative

      While I think that his language is a bit inflammatory, I think that it is something that needs to be done.

      Well, I guess he can't win huh? It's difficult being in his position. He wants the work to get done and he wants to make people happy. I guess him saying, "People always complain that I'm being too soft. Not so this time," is the result of all the grief he puts up with.

      Just let it go as long as the patches still come in ;)

    2. Re:Good by slavemowgli · · Score: 3, Interesting

      It sure makes you wonder what the two-week window is actually good for, though. I mean... the whole thing was done in order to make sure that there'd be a time for submitting new stuff, and a time for shaking out bugs, and so that people would be able to tell the two apart.

      So, why the fuss about last-minute merges now? If they're still in the two-week window, they should be fine; if they're not, well, then they're too late and won't get merged, but that was already clear anyway. And stuff that's not up to par quality-wise yet will (should) not be merged at all, anyway - it's not as if the code quality requirements were lowered for the two-week merge window.

      What Linus seems to be doing is to effectively reduce the two-week window to a "something-less-than-two-weeks" window where noone knows exactly how much the difference is, but it does not get rid of the underlying problem: there still is a deadline, and people will still submit lots of stuff just before the deadline's there. It doesn't matter whether it's two weeks or 13 days or whatever.

      The whole *point* of the "merge for two weeks, then stop merging and focus on bug fixes" was to be able live with this, so to speak. If you can't fight them, make them join you; if you can't prevent people from submitting stuff in the last minute, make sure that there's enough time *after* the last minute so that last-minute merges won't hurt you. If Linus finds it necessary to crack down on last-minute merges now - which, as I said above, is not really possible in practice (the only way to do it would be to not merge anything at all anymore, but that's obviously not a practical solution) - because there are too many, that just shows that patch pressure is too high already; further increasing it won't help. Rather, you have to look at *why* patch pressure is so high, and do something about that. For example, why not extend the two-week window to three or four weeks? It might mean that new kernel versions appear less often, but in these days of git and distributed development where tree changes are so easy to push/pull and where every distributor uses their own, heavily-patched version of the kernel, anyway, why does it matter so much? Linus has always taken a stance that quality is more important than meeting arbitrary deadlines, I think.

      Or maybe I'm misunderstanding what he actually wanted to say - I did RTFA, but zdnet is not exactly what I'd call a high-quality source for kernel development news. Caveat lector...

      --
      quidquid latine dictum sit altum videtur.
    3. Re:Good by ozmanjusri · · Score: 5, Insightful

      but why does he have to be a little bitch about it?

      Linus frequently expresses himself using a type of wry humour which is quite alien to US audiences. It's not bitchy, it just doesn't translate well.

      --
      "I've got more toys than Teruhisa Kitahara."
    4. Re:Good by Aadain2001 · · Score: 4, Insightful

      There is a BIG difference between bug fixes and merges, and adding new features. I haven't RTFA, but based on the summary it seems like Linus wants to keep those two weeks dedicated to fixing bugs, merging changes, etc, not adding in new features that were not even coded until that two week window. That is what all the weeks leading up to the merge window is for. Once those two weeks hit, the focus should be 100% on making sure everything works, works together, and is stable. I say, good for Linus! Sometimes the only way to make people listen is to be tough with them.

      --
      Space for rent, inquire within
    5. Re:Good by Anonymous Coward · · Score: 4, Funny

      Yeah, if I had written software that then got taken by major coporations to make a fortune and I never saw a dime, I'd be pretty dedicated to the sauce too.

    6. Re:Good by Anonymous Coward · · Score: 4, Insightful

      It sure makes you wonder what the two-week window is actually good for, though. I mean... the whole thing was done in order to make sure that there'd be a time for submitting new stuff, and a time for shaking out bugs, and so that people would be able to tell the two apart.


      RTFA or not, you've apparently never been part of a large, ongoing software project that was any good. You DO NOT submit "new stuff" during the merge window! That's what the previous 50 weeks in the year were for.

      Two weeks is a manageably aggressive timeframe during which to reconcile compatibility issues across a moderately large codebase. The acceptance of entirely new code during this window potentially starts the reconciliation process all over again at square one. Usually it would be less than that, but if you accept one new submission, you almost have to accept them all. So it could still become a never-ending process, indistinguishable from the preceeding development cycle which the merge window is supposed to define.

      Therefore, if you're going to have a cutoff date at all, you've really got to be strict about it or the merge becomes a nightmare.

      If you really do have something new and important which absolutely does need to get into the release, then the cutoff date would have been selected to accomodate your new code.

      It's not as if there's no dialogue...

    7. Re:Good by fataugie · · Score: 2, Funny

      HIs language is commensurate with the amount of pissing and moaning that goes on.

      When I worked as a cook, we were responsible for cleaning the kitchen during the shift (the place never closed). We'd be carrying buckets of hot grease or water and people would be drawn to walking in front of you it seemed. So, we took up yelling a warning when we were about to carry out hot stuff:

      "HOT STUFF...MAKE WAY OR I'LL BURN YOU AND LAUGH"

      It worked perfectly. And for those who didn't beleive, they found out the hard way.

      --

      WTF? Over?

    8. Re:Good by rhizome · · Score: 5, Funny

      when these types of quotes get posted on sites like ZDNet, this only contributes to the fact that people think Linux is poorly maintained and has a low software quality...

      Yeah, he should act more like Steve Ballmer.

      --
      When I was a kid, we only had one Darth.
    9. Re:Good by iabervon · · Score: 3, Informative

      In general, the maintainers want to avoid having to deal with a lot of stuff in a short time period, which means encouraging people to submit things at different times or have people not expecting a quick response. Linus is also partially making the point that if some feature gets excluded from a cycle, 6 weeks just isn't all that long to wait for it to get in the next cycle.

      The first thing that came up is that Andrew Morton doesn't know which of the things in the testing tree are going in this cycle, because people haven't said anything in the middle of the window. So the first problem would be solved if everybody said at the beginning of the window that they're intending to submit something, but not quite yet.

      The real issue, it turns out, is that James Bottomley (the SCSI maintainer) is in an untenable position. He's supposed to get patches from developers, integrate them, and submit them to Linus. But the developers waited for 2.6.14 to come out before they rebased their patches on it, and then took most of the window rebasing the patches, leaving James not enough time to determine for sure if all of these patches actually work correctly together before the window closes.

      Furthermore, Linus would like to get infrastructure changes in before driver changes, so that it's easier to debug. It's hard to figure out what's wrong if you get both an infrastructure change that shouldn't affect anything in the driver, but might due to a bug and a driver change that should affect the driver behavior. It's a lot nicer if you can say whether the infrastructure change had any effect at all on what the driver does, and know right away which part to debug. But that depends on getting things included in a particular order.

      I suspect that part of the problem is that the new release cycle is new, and contributors are not yet convinced that they can rebase their patches against 2.6.14-rc3 and have them apply cleanly to 2.6.14, and it will not be such an issue once people have gotten used to it.

    10. Re:Good by Anonymous Coward · · Score: 2, Funny

      >>>Linus frequently expresses himself using a type of wry humour which is quite alien to US audiences. It's not bitchy, it just doesn't translate well.

      remember this one???? hehehe ok, now someone thats not ac can post the same reference and take credit for the reference as usual....

      Linux 2.0.36 patch - patch-2.0.36.gz (15-Nov-98)

                From: Linus Torvalds
                Subject: Linux-2.0.36..

                Is out there.

                I won't claim any false credit for this: all the 2.0.x work was
                done by Alan Cox as the maintainer, and the 2.0.36 that is out
                there is exactly the same as Alan's "pre-22" version that he
                asked people to check out. He just asked me to "sprinkle some
                holy penguin-pee on it" to bless it and make it official. This I
                have done (*).

                2.0.36 is a lot of updates, mostly to various drivers. ISDN,
                various SCSI drivers and network cards have been updated quite
                heavily. ISDN to the degree that you need to make sure you have
                the most recent tools in order to play well with it.

                Have fun,

                            Linus

                (*) This, btw, is not something I would suggest you do in your
                living room. Getting a penguin to pee on demand is _messy_. We're
                talking yellow spots on the walls, on the ceiling, yea verily
                even behind the fridge.

                However. I would also advice against doing this outside - it may
                be a lot easier to clean up, but you're likely to get reported
                and arrested for public lewdness. Never mind that you had a
                perfectly good explanation for it all.

                Here are the Release Notes from Alan Cox (who put together the 2.0.36
      release for Linus):

    11. Re:Good by flibuste · · Score: 2, Insightful

      Yes, but you cannot laugh in the face of people who voluntarily help for absolutely no money.

      There is a line between managing someone and mocking him. Roughly 100% of the time, mockery leads to nothing productive. And mocking your people is not being "tougher", it's being an incompetent manager.

    12. Re:Good by 4of12 · · Score: 4, Insightful
      It's difficult being in his position.

      This announcement is good management practice though.

      The public declaration of harsh measures means people won't be so hurt by rejection of their MyLifesBlood patches to the kernel - it's not personal anymore, just policy:)

      Much of Linux success can be attributed to Linus ability to balance personalities and technologies. And, believe me, there are some Piece of Work personalities that happen to be tied together in single person packages with rare intellects and feverish workaholicism. Many technical managers are doing great if they can just not too badly piss off the prima donnas responsible for the great ideas and the hard work.

      --
      "Provided by the management for your protection."
    13. Re:Good by SilverspurG · · Score: 2, Funny
      There's a big difference between the behavior of an alpha male in the wilderness (where inflicting death is an acceptable form of asserting dominance) and the behavior of an alpha male in human society governed by etiquette.

      Linus has learned this difference. Apparently you haven't.
      A true alpha male would assert dominance in every way and absorb the impact
      That's not the way it works in the business world. Every alpha male that has acted the way you suggest in the business world eventually ends up with their balls stuffed in their mouth. Either you learn when to hold your tongue, learn when to act civil, and learn when and where it's acceptable to overtly assert dominance, or you learn what your nuts taste like.
      --
      fast as fast can be. you'll never catch me.
  2. Also said... by Grendel+Drago · · Score: 5, Funny

    Torvalds later added, "I am legion. All shall kiss my smoldering hoof."

    --
    Laws do not persuade just because they threaten. --Seneca
    1. Re:Also said... by OneSmartFellow · · Score: 2, Informative

      Promethea: Volume 1 "Bringing Down The Temple", Sept 2000 by Alan Moore

  3. Get Tough! by vaderhelmet · · Score: 4, Insightful

    This sort of thing happens in the corporate environment (at least where stability is valued over new features). I don't see why we shouldn't have some of the same process in OSS. I think this is a bold, yet helpful move by Linus and I congratulate him on taking a stand!

  4. Obligatory Futurama by Anonymous Coward · · Score: 5, Funny

    Prof. Farnsworth: This will not stand! I'll take you on, you air balling bozos!
    Bubblegum: You old man? Ha! Sweet Clive, laugh derisively at him.
    Sweet Clive: Ahaha, ahaha, aahahaha.

  5. Whaaa?!? by Moby+Cock · · Score: 5, Funny

    Linus has a new title:

    Not-So-Benevolent (But Exceedingly Pragmatic) Dictator for Life?

    1. Re:Whaaa?!? by dfn5 · · Score: 4, Funny
      Linus has a new title:

      Not-So-Benevolent (But Exceedingly Pragmatic) Dictator for Life?

      I, for one, welcome our new Linux Kernel Overlord.

      --
      -- Thou hast strayed far from the path of the Avatar.
  6. In other news... by Call+Me+Black+Cloud · · Score: 5, Funny


    Steve Ballmer referred to him as an "amateur" and offered to tutor him in the art of anger.

    1. Re:In other news... by Anonymous Coward · · Score: 5, Funny

      This is where the collaborative open-source model is doomed to fail vs the proprietary model: it is simply impossible to throw a chair on the Internet. With this handicap, Mr. Torvalds will never be able to match Mr. Ballmer's leadership abilities.

    2. Re:In other news... by ArsenneLupin · · Score: 4, Funny
      Steve Ballmer referred to him as an "amateur" and offered to tutor him in the art of anger.

      Indeed, being the chairman of a world-wide OS development team is not a trivial task!

  7. Re:And Linus complains about Slashdot.... by imsabbel · · Score: 4, Insightful

    So you are arguing that Linus shoudlt claim slashdot is all about making unqualified comments and circle jerking them up to +5 insightful,
    by making a unqualified comment about linux kernel management and getting modded up for it...

    --
    HI O WISE PRINCE. WHT TOOK U SO DAM LONG?
  8. Why not? by IANAAC · · Score: 3, Insightful
    ... he shouldn't complain about Slashdot ...

    Why not? He was stating an opinion, nothing more.

    Controlling a process and stating an opinion are two entirely different things.'

  9. Much ado about nothing by WindBourne · · Score: 5, Insightful

    This is simply a manager telling others off that they can not miss deadlines. It happens all the time in any business. Difference is, that Linux development is in the open.

    --
    I prefer the "u" in honour as it seems to be missing these days.
    1. Re:Much ado about nothing by syphax · · Score: 2, Insightful

      Telling people that they have to meet their deadlines does not make you an asshole. It's *how* you tell them that differentiates the assholes from the (rare) good managers.

      the 'and laugh in their faces derisively' comment is just an indication that Linus thinks this is important. I don't know Linus, and I think I only know one person who ever might Linus, but I know from reading enough articles what his personality and sense of humor are like. Threatening to laugh derisively at someone is a little different from throwing a chair in anger...

      --
      Simple Unexpected Concrete Credible Emotional Stories
    2. Re:Much ado about nothing by WindBourne · · Score: 2, Insightful
      but when a business does this, it's bad?

      Excuse me, but who is saying that it is bad in business? I flat out said that it goes on all the time. When I worked on HP-UX, we had about 5 of us who did not check in our work continually. When merges occured, it caused issues and managers would get pissed. And yes, they would sound off just like Linus did. I never felt that it was "bad", as they were justified.

      In fact, where do you see anybody saying that a business doing it is bad? Your statement has the same logic of "You still beating your wife?"

      --
      I prefer the "u" in honour as it seems to be missing these days.
  10. Re:Enough time? by Anonymous Coward · · Score: 2, Insightful

    two weeks sounds like too little time

    You don't have to make the code in two weeks, you just have to submit it within that time frame, or wait untill next if you are not ready yet. So you can for example start coding now, and post the code after 10 years, but inside the 2 week time frame (assuming this policy is still used then, and your code still works with the current kernel at that time).

  11. Re:And Linus complains about Slashdot.... by Slashcrap · · Score: 5, Insightful

    If Linus talks down to other developers that contribute to Linux in such a primitive way, he shouldn't complain about Slashdot, as he did here: http://lkml.org/lkml/2005/8/20/95. Quote:

            Gaah. I don't tend to bother about slashdot, because quite frankly, the whole _point_ of slashdot is to have this big public wanking session with people getting together and making their own "insightful" comment on any random topic, whether they know anything about it or not.


    Congratulations! We have a winner! The 3rd Annual Slashdot unintentional irony award goes to titwurstman!

    He beat all comers this year due to his use of a quote suggesting that people on Slashdot comment on things they know nothing about, to support his Slashdot comment on something he knows nothing about!

    The Slashdot editors have now permanently closed the competition, as it is widely agreed that nobody will ever top this year's winner!

  12. Re:And Linus complains about Slashdot.... by nurhussein · · Score: 5, Funny

    If Linus talks down to other developers that contribute to Linux in such a primitive way, he shouldn't complain about Slashdot, as he did here: http://lkml.org/lkml/2005/8/20/95.

    Well said, fellow slashdot user teewurstmann of id 755953! With that post, you certainly took Linus Torvalds to task for daring to belittle the collective intelligentsia that is SLASHDOT! As a mere senior kernel developer, founder of the Linux kernel project and leader of the mainline kernel development process certainly he needs to be shown his place by our community of insightful commentators. From mom's basement I stab at thee!

  13. Re:And Linus complains about Slashdot.... by Qbertino · · Score: 4, Informative

    Well isn't that cute. Nice try at a piece of Troll FUD.
    And you "wisely" drop the following sentence from what your quoting.

    Here's the quote in context:

    >>>
    Gaah. I don't tend to bother about slashdot, because quite frankly, the
    whole _point_ of slashdot is to have this big public wanking session with
    people getting together and making their own "insightful" comment on any
    random topic, whether they know anything about it or not.

    [ And don't get me wrong - I follow slashdot too, exactly because it's fun
        to see people argue. I'm not complaining ;]

    And I don't tend to worry about the Inquirer and the Register, because
    both of them are all about being rough and saying things in ways that
    might not be acceptable in other places, and that's what makes them fun to
    read. So when they then write something nasty about Linux (or me), hey, it
    goes with the territory.

    So much for Linus complaining about slashdot.
    You trolling Sucker. :-)

    --
    We suffer more in our imagination than in reality. - Seneca
  14. Re:If my boss by germ!nation · · Score: 2, Insightful

    "If my boss used this tone with me, I would quit the job."

    If you were chucking code into a major public release candidate 2 weeks before launch, I'm sure your quitting window would be rather short as you would be fired before too long.

    No one involved is a child; suck it up, do some push-ups if required, and make sure you do things right next time.

  15. Re:And Linus complains about Slashdot.... by hylander_sb · · Score: 2

    the quote continues:

    [ And don't get me wrong - I follow slashdot too, exactly because it's fun
        to see people argue. I'm not complaining ;]

    He says he's not complaining. Sounds like he's just making a characterization of how discussions go around here...not too far off the mark.

  16. Re:Huh? by Curtman · · Score: 3, Informative

    "Could someone please explain that one to me?"

    It appears to be a reference to a really bad comic book.

  17. More like this? by MECC · · Score: 5, Funny

    Developer: Here's my patch. Sorry its late...
    Linus: The path of the righteous man is beset on all sides by the inequities of the selfish and the tyranny of evil men. Blessed is he, who in the name of charity and good will, shepherds the weak through the valley of darkness, for he is truly his brother's keeper and the finder of lost children. And I will strike down upon thee with great vengeance and furious anger those who would attempt to poison and destroy my brothers. And you will know my name is the Lord when I lay my vengeance upon thee....

    --
    "We are all geniuses when we dream"
    - E.M. Cioran
  18. Well Said! by Lee_in_KC · · Score: 2, Insightful

    " If my boss used this tone with me, I would quit the job."

    Spoken like a true college Sophomore.

  19. "Just for Fun" by McSnickered · · Score: 4, Funny

    In Torvalds' book, "Just for Fun", he laughs in the reader's face derisively as they look at the printed words plaintively.

    Somewhere, there's got to be a "Deep Thought" by Jack Handy about Linus T.

    "Contrary to what most people say, the most dangerous animal in the world is not the lion or the tiger or even the elephant. It's a shark riding on an elephant's back, just trampling and eating everything they see." ~ Jack Handy

    --
    They call me the working man. I guess that's what I am.
  20. I laugh in your general direction by minus9 · · Score: 4, Insightful

    Having just read the thirty or so posts that have been made as I write this, I cannot believe I am the only one who read the "laugh derisively" bit as tongue-in-cheek.

    Do you really imagine Linus will start jumping on planes and seeking out kernel contributers to laugh in their faces. Bloody hell, I know geeks have trouble with anything not strictly literal but sheesh.

    I read it as "Certain people are repeatedly making changes at the last minute and I'd really rather they didn't".

  21. Re:Let us not forget by Zen+Punk · · Score: 2, Insightful

    Go read some of Linus's LKML or Usenet posts. He is conversationally fluent in English. You would have no way to tell he is not from an English-speaking country if you didn't know beforehand.

    --
    Sleep is futile.
  22. He's absolutely right! by Spy+der+Mann · · Score: 4, Insightful

    Think of this: All the reported bugs have been fixed, you're about to make a new release, and a last minute change introduces an awry bug that forces you to make ANOTHER release.

    And what happens if in that "another release" another guy makes ONE MORE last minute change and... well you get the idea.

    I've seen this happen at sourceforge projects, and this is what gives Open Source such a bad reputation - buggy projects. Sure, 999 bugs have been fixed, but 10 major flaws are introduced with the next version. Just search any SF project's bugs for "crash" or "segfault", and you'll get the idea (and these are reports about RELEASES, not cvs). And why does this happen? Because of devs NOT RESPECTING the timings!

    So, please guys, p-l-e-a-s-e, respect the timing! This is Linux we're talking about, not some hobby project.

  23. Re:Enough time? by mwood · · Score: 2, Insightful

    The best thing that could happen to mankind is the stifling of certain new features and improvements. My modal reaction to "upgrades" from certain other software suppliers is, "how do I disable that?"

    Anyway if you miss the window for kernel J.K.L there's always J.K.L+1 coming along. Meanwhile people with a burning desire for your patch can get it from you. It's annoying, but the person you should be annoyed with lives in your mirror.

  24. Re:Huh? by hackwrench · · Score: 2, Informative

    "My name is legion for we are many" is a quote from the Bible Mark 5, vs. 9. and "smoldering hoof" is from one of the mythical forms of Satan and the notion that Hell is hot.

  25. Fork it! by BigPoppaT · · Score: 2, Insightful

    For all you who don't like how Linus is handling this, hey fork the code, start your own development.

    Maybe his phrasing was a bit harsh, but remember that he is not just a developer - he really plays the role of Project Manager here, and sometimes the PM has to send a wakeup call. That's what this sounds like. Not that big a deal.

    Think about all the failed FOSS projects where nobody did this - UserLinux and Hurd spring to mind. (Now for some posts telling me that Hurd isn't a failure, even though it's not production-ready after what, 16 years now?) Makes you kind of glad Linus is managing this thing.

  26. Re:Let us not forget by oneandoneis2 · · Score: 2, Funny

    Go read some of Linus's LKML or Usenet posts. He is conversationally fluent in English. You would have no way to tell he is not from an English-speaking country if you didn't know beforehand.

    You would if you heard him speak - he completely mis-pronounces the word "Linux", for example ;o)

    --
    So.. it has come to this
  27. Soon Linus' conversion will be complete by DarthBallmer · · Score: 2, Funny

    Linus, give in to your hate and anger, feel the power of the Dark Side of the Force.

  28. Re:Take lessons from Steve Balmer by SpinJaunt · · Score: 2, Funny

    Throw Penguins damn it..

    --
    /. is good for you.
  29. Re:And Linus complains about Slashdot.... by Anonymous Coward · · Score: 4, Funny
    So much for Linus complaining about slashdot.
    You trolling Sucker. :-)
    --
    [My english is better than most other people's german, so please point out mistakes politely. Thank you.]
    Sucker is spelt with an "F"
  30. The irony is killing me!!! by dbc · · Score: 3, Funny

    As a manager, I have tried many times to make this same thing stick. This, in a situation where I had influence over promotions, raises, and of course also could put people on written warning and move them out of the company if need be.

    But, Linus has discovered the secret of actually making it happen! Just don't pay people in the first place! Genius!

    This is why Linux is so successfull.

  31. linus has my sympathy by jilles · · Score: 3, Insightful

    I have some experience coordinating releases of a software product. A key thing I have come to realize is that developers don't understand that last minute patches cause more problems than they solve. Inevitably something they regard as important creeps in and that's when you need to just say no. Convince me it's critical (stuff breaks down visibly, data is lost, etc.) or wait until the next release. I've seen this go wrong more than once. Some dork commits something 30 minutes before the release and a week later we're handing out patches for bugs that fix introduced. Unlike OSS, delays are usually hard to negotiate in a commercial setting

    With a product as complex as a kernel you need lots of time to properly test and integrate stuff. A kernel release needs to be stable & reliable. Last minute changes with unkown impact are unacceptable unless they fix something that absolutely needs to be fixed.

    The git scm tool that linus uses actually supports this development style very well. Developers develop and send in patches to a central repository. Linus pulls the important patches and patches his private repository for a few weeks and then locks it down for testing. That's why he can afford to tell developers to wait or adjust to his schedule.

    In this respect he is quite ahead of the clearcase/cvs and svn using masses. These tools do not support this kind of development very well. The mental model of the developers is still that they need to get their stuff in the trunk asap. With git the model is get your patch out, have it tested, optimized and when it is mature and ready Linus will merge it when this fits his release schedule. For complicated changes this process should be slow or otherwise Linus ends up doing the work that should have been done before the merge.

    This model is way better than freeze trunk, tell everybody to not do anything for a few months and then release.

    --

    Jilles