From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>
Cc: Greg KH <greg@kroah•com>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Christoph Hellwig <hch@lst•de>, Gao Xiang <gaoxiang25@huawei•com>
Subject: Re: linux-next: manual merge of the staging tree with the block tree
Date: Wed, 8 May 2019 13:44:13 +1000 [thread overview]
Message-ID: <20190508134413.26a13d00@canb.auug.org.au> (raw)
In-Reply-To: <20190501170528.2d86d133@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2691 bytes --]
Hi all,
On Wed, 1 May 2019 17:05:28 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the staging tree got conflicts in:
>
> drivers/staging/erofs/data.c
> drivers/staging/erofs/unzip_vle.c
>
> between commit:
>
> 2b070cfe582b ("block: remove the i argument to bio_for_each_segment_all")
>
> from the block tree and commit:
>
> 14a56ec65bab ("staging: erofs: support IO read error injection")
>
> from the staging 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/staging/erofs/data.c
> index 9f04d7466c55,c64ec76643d4..000000000000
> --- a/drivers/staging/erofs/data.c
> +++ b/drivers/staging/erofs/data.c
> @@@ -17,11 -17,18 +17,17 @@@
>
> static inline void read_endio(struct bio *bio)
> {
> + struct super_block *const sb = bio->bi_private;
> - int i;
> struct bio_vec *bvec;
> - const blk_status_t err = bio->bi_status;
> + blk_status_t err = bio->bi_status;
> struct bvec_iter_all iter_all;
>
> + if (time_to_inject(EROFS_SB(sb), FAULT_READ_IO)) {
> + erofs_show_injection_info(FAULT_READ_IO);
> + err = BLK_STS_IOERR;
> + }
> +
> - bio_for_each_segment_all(bvec, bio, i, iter_all) {
> + bio_for_each_segment_all(bvec, bio, iter_all) {
> struct page *page = bvec->bv_page;
>
> /* page is already locked */
> diff --cc drivers/staging/erofs/unzip_vle.c
> index 59b9f37d5c00,a2e03c932102..000000000000
> --- a/drivers/staging/erofs/unzip_vle.c
> +++ b/drivers/staging/erofs/unzip_vle.c
> @@@ -843,14 -844,13 +844,12 @@@ static void z_erofs_vle_unzip_kickoff(v
>
> static inline void z_erofs_vle_read_endio(struct bio *bio)
> {
> - const blk_status_t err = bio->bi_status;
> + struct erofs_sb_info *sbi = NULL;
> + blk_status_t err = bio->bi_status;
> - unsigned int i;
> struct bio_vec *bvec;
> - #ifdef EROFS_FS_HAS_MANAGED_CACHE
> - struct address_space *mc = NULL;
> - #endif
> struct bvec_iter_all iter_all;
>
> - bio_for_each_segment_all(bvec, bio, i, iter_all) {
> + bio_for_each_segment_all(bvec, bio, iter_all) {
> struct page *page = bvec->bv_page;
> bool cachemngd = false;
>
This conflict is now between the block tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-05-08 3:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-01 7:05 linux-next: manual merge of the staging tree with the block tree Stephen Rothwell
2019-05-01 8:09 ` Gao Xiang
2019-05-08 3:44 ` Stephen Rothwell [this message]
2019-05-08 6:02 ` Gao Xiang
-- strict thread matches above, loose matches on Subject: below --
2016-06-14 5:07 Stephen Rothwell
2016-07-25 6:32 ` Stephen Rothwell
2013-11-05 5:09 Stephen Rothwell
2013-11-05 5:20 ` Greg KH
2013-11-05 9:49 ` Christoph Hellwig
2013-11-05 13:08 ` Greg KH
2011-10-04 6:14 Stephen Rothwell
2011-10-04 15:25 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190508134413.26a13d00@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=gaoxiang25@huawei$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox