[lkml]   [2008]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: Tree for April 9
    On Thu, 10 Apr 2008 08:52:27 +0200 Ingo Molnar <> wrote:
    > what type of conflict do you have there? If it's a new entry then you
    > might be able to fix it by moving the new entry elsewhere in the file.
    > Or if i introduced a new entry close to an existing entry you modify
    > then i could move my new entry elsewhere.

    Commit 523a65f1a7a339e528ca6d6d808516fe195fde03 ("firewire: fw-ohci: add
    option for remote debugging") in the ieee1394 tree adds a new entry just
    where the sched tree adds

    source kernel/trace/Kconfig

    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2008-04-10 09:47    [W:0.018 / U:1.096 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site