lkml.org 
[lkml]   [2009]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the device-mapper tree with Linus' tree
    Hi Alasdair,

    Today's linux-next merge of the device-mapper tree got a conflict in
    drivers/md/dm-log-userspace-transfer.c between commit
    18366b05a00349c1606269ba7422bf9b3a357ff2 ("connector/dm: Fixed a
    compilation warning") from Linus' tree and commit
    584ac98acfc033dfda338641e736b0100fd31909
    ("dm-log-fix-cn_ulog_callback-declaration") from the device-mapper tree.

    The former commit (already in Linus' tree) supersedes the latter, so I
    used the former.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2009-10-05 05:49    [W:3.887 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site