lkml.org 
[lkml]   [2009]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: linux-next: manual merge of the net tree with the i2c tree
    From
    Date
    On Mon, 2009-10-26 at 13:37 +1100, Stephen Rothwell wrote:
    > Hi all,
    >
    > Today's linux-next merge of the net tree got a conflict in
    > drivers/net/sfc/sfe4001.c between commit
    > 3f7c0648f727a6d5baf6117653e4001dc877b90b ("i2c: Prevent priority
    > inversion on top of bus lock") from the i2c tree and commit
    > c9597d4f89565b6562bd3026adbe6eac6c317f47 ("sfc: Merge sfe4001.c into
    > falcon_boards.c") from the net tree.
    >
    > I have applied the following merge fixup patch (after removing
    > drivers/net/sfc/sfe4001.c) and can carry it as necessary.
    >
    > --
    > Cheers,
    > Stephen Rothwell sfr@canb.auug.org.au
    >
    > From: Stephen Rothwell <sfr@canb.auug.org.au>
    > Date: Mon, 26 Oct 2009 12:24:55 +1100
    > Subject: [PATCH] net: merge fixup for drivers/net/sfc/falcon_boards.c
    >
    > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Acked-by: Ben Hutchings <bhutchings@solarflare.com>

    Ben.

    --
    Ben Hutchings, Senior Software Engineer, Solarflare Communications
    Not speaking for my employer; that's the marketing department's job.
    They asked us to note that Solarflare product names are trademarked.



    \
     
     \ /
      Last update: 2009-10-26 14:49    [W:0.021 / U:29.876 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site