linux-kernel - linux-next: manual merge of the md 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20170613143301.0c4a80f9@canb.auug.org.au>
Date:   Tue, 13 Jun 2017 14:33:01 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Shaohua Li <shli@...nel.org>, Jens Axboe <axboe@...nel.dk>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Christoph Hellwig <hch@....de>,
        Guoqing Jiang <gqjiang@...e.com>
Subject: linux-next: manual merge of the md tree with the block tree

Hi Shaohua,

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

  drivers/md/raid5.c

between commit:

  4e4cbee93d56 ("block: switch bios to blk_status_t")

from the block tree and commit:

  66a8066d55fd ("md: simplify code with bio_io_error")

from the md tree.

I fixed it up (the latter removed code updated by the former) 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