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

    Today's linux-next merge of the trivial tree got a conflict in
    drivers/net/sfc/falcon.c between commit
    127e6e10ad17585c48cba8e1dcf30d98b90ee583 ("sfc: Fix bugs in RX queue
    flushing") from the net tree and commit
    4e5cf22a6f45b6489f84de03d3a1dfa60cc4b4e4 ("tree-wide: fix assorted typos
    all over the place") from the trivial tree.

    The former removed the comment that the latter was fixing.
    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2009-11-30 03:55    [W:0.019 / U:66.436 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site