Re: linux-next: manual merge of the block tree with Linus' tree

[Christoph Hellwig]

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.