[lkml]   [2009]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the trivial tree with the net-current tree
    Hi Jiri,

    On Thu, 10 Dec 2009 09:45:27 +0100 (CET) Jiri Kosina <> wrote:
    > Linus has merged trivial tree into his tree tonight, so I am afraid that
    > davem will have to fix the conflict when pulling Linus tree into
    > net-current.

    Yep, or Linus can fix it if he feels inclined.

    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2009-12-10 12:17    [W:0.032 / U:24.460 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site