linux-kernel - linux-next: manual merge of the block tree with the origin 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>] [day] [month] [year] [list]

Date:   Mon, 14 Dec 2020 15:01:23 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jens Axboe <axboe@...nel.dk>
Cc:     Kevin Vigor <kvigor@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Song Liu <songliubraving@...com>
Subject: linux-next: manual merge of the block tree with the origin tree

Hi all,

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

  drivers/md/raid10.c

between commit:

  17c28c2a0687 ("Revert "md/raid10: extend r10bio devs to raid disks"")

from the origin tree and commit:

  93decc563637 ("md/raid10: initialize r10_bio->read_slot before use.")

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 drivers/md/raid10.c
index 3b598a3cb462,a84fa7526a53..000000000000
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@@ -1493,7 -1506,8 +1491,8 @@@ static void __make_request(struct mdde
  	r10_bio->mddev = mddev;
  	r10_bio->sector = bio->bi_iter.bi_sector;
  	r10_bio->state = 0;
+ 	r10_bio->read_slot = -1;
 -	memset(r10_bio->devs, 0, sizeof(r10_bio->devs[0]) * conf->geo.raid_disks);
 +	memset(r10_bio->devs, 0, sizeof(r10_bio->devs[0]) * conf->copies);
  
  	if (bio_data_dir(bio) == READ)
  		raid10_read_request(mddev, bio, r10_bio);

Content of type "application/pgp-signature" skipped