From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Sterba <dsterba@suse•cz>, David Howells <dhowells@redhat•com>
Cc: David Sterba <dsterba@suse•com>, Ira Weiny <ira.weiny@intel•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the btrfs tree with the fscache tree
Date: Fri, 12 Feb 2021 10:38:10 +1100 [thread overview]
Message-ID: <20210212103810.170b93e8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1321 bytes --]
Hi all,
Today's linux-next merge of the btrfs tree got a conflict in:
lib/iov_iter.c
between commit:
11432a3cc061 ("iov_iter: Add ITER_XARRAY")
from the fscache tree and commit:
325a835476e3 ("iov_iter: Remove memzero_page() in favor of zero_user()")
from the btrfs 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 lib/iov_iter.c
index 24413884b5ca,aa0d03b33a1e..000000000000
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@@ -1048,9 -961,8 +1028,9 @@@ size_t iov_iter_zero(size_t bytes, stru
return pipe_zero(bytes, i);
iterate_and_advance(i, bytes, v,
clear_user(v.iov_base, v.iov_len),
- memzero_page(v.bv_page, v.bv_offset, v.bv_len),
+ zero_user(v.bv_page, v.bv_offset, v.bv_len),
- memset(v.iov_base, 0, v.iov_len)
+ memset(v.iov_base, 0, v.iov_len),
- memzero_page(v.bv_page, v.bv_offset, v.bv_len)
++ zero_user(v.bv_page, v.bv_offset, v.bv_len)
)
return bytes;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-02-11 23:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-11 23:38 Stephen Rothwell [this message]
2021-02-12 1:07 ` linux-next: manual merge of the btrfs tree with the fscache tree Ira Weiny
2021-02-12 3:04 ` Stephen Rothwell
2021-02-17 23:50 ` Ira Weiny
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=20210212103810.170b93e8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=dsterba@suse$(echo .)com \
--cc=dsterba@suse$(echo .)cz \
--cc=ira.weiny@intel$(echo .)com \
--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