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

    Today's linux-next merge of the trivial tree got a conflict in
    include/net/tcp.h between commit 2f7de5710a4d394920405febc2a9937c69e16dda
    ("tcp: Stalling connections: Move timeout calculation routine") from the
    net-current tree and commit af901ca181d92aac3a7dc265144a9081a86d8f39
    ("tree-wide: fix assorted typos all over the place") from the trivial

    The former moves the comment that the latter corrects to
    net/ipv4/tcp_timer.c. I just used the net-current version and didn't
    bother fixing it up in its new location.

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