lkml.org 
[lkml]   [2012]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the usb tree with the vfs tree
    Hi Greg,

    Today's linux-next merge of the usb tree got a conflict in
    drivers/usb/core/inode.c between commit eaf5fb5977e0 ("switch usbfs to
    use of simple_{unlink,rmdir}") from the tree and commit fb28d58b72aa
    ("USB: remove CONFIG_USB_DEVICEFS") from the usb tree.

    The latter removes the file modified by the former, so I just removed the
    file.
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-05-01 07:41    [W:0.021 / U:0.040 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site