From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Theodore Ts'o <tytso@mit.edu>,
Eric Biggers <ebiggers@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>,
Damien Le Moal <Damien.LeMoal@wdc.com>
Subject: Re: linux-next: manual merge of the block tree with the fscrypt tree
Date: Thu, 23 Jul 2020 11:03:00 +1000 [thread overview]
Message-ID: <20200723110300.0d7f5d98@canb.auug.org.au> (raw)
In-Reply-To: <20200709130254.65d3f234@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1289 bytes --]
Hi all,
On Thu, 9 Jul 2020 13:02:54 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the block tree got a conflict in:
>
> fs/buffer.c
>
> between commit:
>
> 4f74d15fe408 ("ext4: add inline encryption support")
>
> from the fscrypt tree and commit:
>
> ed9b3196d2b2 ("fs: remove a weird comment in submit_bh_wbc")
>
> from the block tree.
>
>
> diff --cc fs/buffer.c
> index dc5e05b47646,2725ebbcfdc2..000000000000
> --- a/fs/buffer.c
> +++ b/fs/buffer.c
> @@@ -3039,14 -3040,7 +3039,10 @@@ static int submit_bh_wbc(int op, int op
> if (test_set_buffer_req(bh) && (op == REQ_OP_WRITE))
> clear_buffer_write_io_error(bh);
>
> - /*
> - * from here on down, it's all bio -- do the initial mapping,
> - * submit_bio -> generic_make_request may further map this bio around
> - */
> bio = bio_alloc(GFP_NOIO, 1);
> +
> + fscrypt_set_bio_crypt_ctx_bh(bio, bh, GFP_NOIO);
> +
> bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);
> bio_set_dev(bio, bh->b_bdev);
> bio->bi_write_hint = write_hint;
This is now also a conflict between the zonefs tree and the fscrypt
tree (since the zonefs tree has merged part of the block tree).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-07-23 1:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 3:02 linux-next: manual merge of the block tree with the fscrypt tree Stephen Rothwell
2020-07-23 1:03 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-21 16:47 broonie
2022-02-21 16:45 broonie
2022-02-14 1:11 Stephen Rothwell
2022-02-14 7:15 ` Christoph Hellwig
2022-02-14 19:26 ` Eric Biggers
2019-01-16 2:25 Stephen Rothwell
2019-01-16 2:55 ` Jens Axboe
2019-01-16 3:13 ` Ming Lei
2019-01-16 3:17 ` Jens Axboe
2019-01-16 7:39 ` Ming Lei
2019-01-16 14:27 ` Jens Axboe
2019-01-18 2:45 ` Ming Lei
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=20200723110300.0d7f5d98@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Damien.LeMoal@wdc.com \
--cc=axboe@kernel.dk \
--cc=ebiggers@kernel.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).