lkml.org 
[lkml]   [2009]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the block tree with Linus' tree
    Hi Jens,

    Today's linux-next merge of the block tree got a conflict in
    fs/fs-writeback.c between commit 01c031945f2755c7afaaf456088543312f2b72ea
    ("cleanup __writeback_single_inode") from Linus' tree and commit
    385b54f15a82a85a505e0f5e8579605f5742c648 ("writeback: move dirty inodes
    from super_block to backing_dev_info") from the block tree (and probably
    others).

    I can't see how to easily fix this up, so I have dropped the block tree
    for today (since it only contained 2.6.32 material, right?).
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2009-06-25 05:17    [W:0.025 / U:0.324 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site