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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20211126103857.50628410@canb.auug.org.au>
Date:   Fri, 26 Nov 2021 10:38:57 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jens Axboe <axboe@...nel.dk>
Cc:     Christoph Hellwig <hch@....de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Ming Lei <ming.lei@...hat.com>
Subject: linux-next: manual merge of the block tree with Linus' tree

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")

from the block 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 block/bdev.c
index b1d087e5e205,ae063041f291..000000000000
--- a/block/bdev.c
+++ b/block/bdev.c
@@@ -753,10 -753,10 +753,6 @@@ struct block_device *blkdev_get_no_open
  
  	if (!bdev)
  		return NULL;
- 	if ((bdev->bd_disk->flags & GENHD_FL_HIDDEN)) {
 -	if (!try_module_get(bdev->bd_disk->fops->owner)) {
--		put_device(&bdev->bd_device);
--		return NULL;
--	}
  
  	return bdev;
  }

Content of type "application/pgp-signature" skipped