linux-kernel - linux-next: manual merge of the mmc tree with the block 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20220511124236.75288a29@canb.auug.org.au>
Date:   Wed, 11 May 2022 12:42:36 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Ulf Hansson <ulf.hansson@...aro.org>, 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>,
        Vincent Whitchurch <vincent.whitchurch@...s.com>
Subject: linux-next: manual merge of the mmc tree with the block tree

Hi all,

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

  drivers/mmc/core/queue.c

between commit:

  44abff2c0b97 ("block: decouple REQ_OP_SECURE_ERASE from REQ_OP_DISCARD")

from the block tree and commit:

  f7b6fc327327 ("mmc: core: Support zeroout using TRIM for eMMC")

from the mmc 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 drivers/mmc/core/queue.c
index a3d446005571,bbe2ea829ea7..000000000000
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@@ -189,7 -190,9 +189,9 @@@ static void mmc_queue_setup_discard(str
  	if (card->pref_erase > max_discard)
  		q->limits.discard_granularity = SECTOR_SIZE;
  	if (mmc_can_secure_erase_trim(card))
 -		blk_queue_flag_set(QUEUE_FLAG_SECERASE, q);
 +		blk_queue_max_secure_erase_sectors(q, max_discard);
+ 	if (mmc_can_trim(card) && card->erased_byte == 0)
+ 		blk_queue_max_write_zeroes_sectors(q, max_discard);
  }
  
  static unsigned short mmc_get_max_segments(struct mmc_host *host)

Content of type "application/pgp-signature" skipped