lkml.org 
[lkml]   [2010]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: linux-next: manual merge of the net tree with Linus' tree
    From
    From: Stephen Rothwell <sfr@canb.auug.org.au>
    Date: Mon, 1 Mar 2010 14:20:02 +1100

    > Today's linux-next merge of the net tree got a conflict in
    > drivers/firmware/iscsi_ibft.c between commit
    > 00e7825b943f486e80ff1305cd0594d8791870f8 ("drivers/firmware/iscsi_ibft.c:
    > remove NIPQUAD_FMT, use %pI4") from Linus' tree and commit
    > 2c35294853b2e977bdfc9e401b7b6d881fcaa69b ("drivers/firmware/iscsi_ibft.c:
    > use %pM to show MAC address") from the net tree.
    >
    > Just a trivial context change. I fixed it up and can carry the change as
    > necessary.

    Thanks Stephen, I'll fix this up.


    \
     
     \ /
      Last update: 2010-03-01 04:23    [W:0.017 / U:0.600 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site