lkml.org 
[lkml]   [2008]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: Announce: Linux-next (Or Andrew's dream :-))
    From
    From: Linus Torvalds <torvalds@linux-foundation.org>
    Date: Tue, 12 Feb 2008 10:26:53 -0800 (PST)

    > We absolutely MUST NOT have the mindset that "cross-subsystem conflicts
    > happen all the time".

    Perhaps not, but self-conflicts are the bigger issue for the
    networking.

    If I (or Jeff or John) push a bug fix to you outside of the merge
    window, that blows the entire development tree because at 1500+
    changesets I can guarentee you there will be a merge conflict
    somewhere.

    Near the end of 2.6.24 every bug fix I merged to you created a
    conflict with my net-2.6.25 tree. Every time I rebased there
    were on the order of 10 to 20 patches with merge conflicts to
    resolve.



    \
     
     \ /
      Last update: 2008-02-13 01:33    [W:2.670 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site