[lkml]   [2009]   [Nov]   [10]   [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
    Hi Stephen, Ben,

    On Mon, 26 Oct 2009 13:37:57 +1100, Stephen Rothwell wrote:
    > 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.

    I've merged the new API to get and release the i2c_adapter mutex:;a=commit;h=afa08974fe80c198b8650f73ed8ab59135ca10d0

    Ben, you can adjust your own patches to make use of this API instead of
    accessing the i2c_adapter mutex directly. That way, you are no longer
    dependent of implementation changes, and this should solve the conflict.

    Stephen, you can then drop your fixup patch.

    Jean Delvare

     \ /
      Last update: 2009-11-10 12:45    [W:0.023 / U:2.892 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site