[lkml]   [2011]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the akpm tree with the block tree
    On 10/25/2011 04:07 AM, Stephen Rothwell wrote:
    > Hi James,
    > Today's linux-next merge of the akpm tree got a conflict in
    > drivers/block/cciss.c between commit ab5dbebe33e0 ("cciss: add small
    > delay when using PCI Power Management to reset for kump") from the block
    > tree and commit c9e69629e873 ("cciss: add half second delay to PCI PM
    > reset code") from the akpm tree.
    > These are essentially the same patch, so I dropped the akpm tree one.
    That was my fault. I made multiple submissions. One because I had the
    wrong code base and the patch had an offset. Then another because I
    didn't hear from anyone.

    -- mikem

     \ /
      Last update: 2011-10-25 20:31    [W:0.026 / U:11.712 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site