lkml.org 
[lkml]   [2012]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the akpm tree with the slave-dma tree
    Hi Andrew,

    Today's linux-next merge of the akpm tree got a conflict in
    drivers/dma/dmaengine.c between commit 634332502366 ("dmaengine: Cleanup
    logging messages") from the slave-dma tree and commit
    "drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma
    channel message" from the akpm tree.

    Just context changes. I fixed it up (see below) and can carry the fix as
    necessary.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    diff --cc drivers/dma/dmaengine.c
    index 3491654,6c87d67..0000000
    --- a/drivers/dma/dmaengine.c
    +++ b/drivers/dma/dmaengine.c
    @@@ -582,8 -578,8 +582,8 @@@ void dmaengine_get(void
    list_del_rcu(&device->global_node);
    break;
    } else if (err)
    - pr_err("%s: failed to get %s: (%d)\n",
    + pr_debug("%s: failed to get %s: (%d)\n",
    - __func__, dma_chan_name(chan), err);
    + __func__, dma_chan_name(chan), err);
    }
    }

    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-07-22 09:01    [W:0.021 / U:29.544 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site