lkml.org 
[lkml]   [2017]   [Feb]   [2]   [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 block tree
    Hi Andrew,

    Today's linux-next merge of the akpm tree got a conflict in:

    fs/block_dev.c

    between commit:

    b1d2dc5659b4 ("block: Make blk_get_backing_dev_info() safe without open bdev")

    from the block tree and patch:

    "fs: add i_blocksize()"

    from the akpm tree.

    I fixed it up (see below) and can carry the fix as necessary. This
    is now fixed as far as linux-next is concerned, but any non trivial
    conflicts should be mentioned to your upstream maintainer when your tree
    is submitted for merging. You may also want to consider cooperating
    with the maintainer of the conflicting tree to minimise any particularly
    complex conflicts.

    --
    Cheers,
    Stephen Rothwell

    diff --cc fs/block_dev.c
    index 73031ec54a7b,921e868e84de..000000000000
    --- a/fs/block_dev.c
    +++ b/fs/block_dev.c
    @@@ -988,8 -971,7 +988,8 @@@ struct block_device *bdget(dev_t dev
    bdev->bd_contains = NULL;
    bdev->bd_super = NULL;
    bdev->bd_inode = inode;
    + bdev->bd_bdi = &noop_backing_dev_info;
    - bdev->bd_block_size = (1 << inode->i_blkbits);
    + bdev->bd_block_size = i_blocksize(inode);
    bdev->bd_part_count = 0;
    bdev->bd_invalidated = 0;
    inode->i_mode = S_IFBLK;

    \
     
     \ /
      Last update: 2017-02-03 05:54    [W:2.393 / U:1.312 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site