lkml.org 
[lkml]   [2021]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the block tree with Linus' tree
    On Fri, Nov 26, 2021 at 10:38:57AM +1100, Stephen Rothwell wrote:
    > Hi all,
    >
    > Today's linux-next merge of the block tree got a conflict in:
    >
    > block/bdev.c
    >
    > between commit:
    >
    > efcf5932230b ("block: avoid to touch unloaded module instance when opening bdev")
    >
    > from Linus' tree and commit:
    >
    > a1525fbf1d76 ("block: remove the GENHD_FL_HIDDEN check in blkdev_get_no_open")
    >

    The merge looks good, thanks.

    \
     
     \ /
      Last update: 2021-11-26 06:33    [W:2.360 / U:0.780 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site