From: "Arnd Bergmann" <arnd@arndb•de>
To: "Stephen Rothwell" <sfr@canb•auug.org.au>,
"David S . Miller" <davem@davemloft•net>
Cc: Netdev <netdev@vger•kernel.org>,
"David Howells" <dhowells@redhat•com>,
"Linus Walleij" <linus.walleij@linaro•org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
linux-next <linux-next@vger•kernel.org>,
"Paolo Abeni" <pabeni@redhat•com>
Subject: Re: linux-next: manual merge of the net-next tree with the asm-generic tree
Date: Fri, 09 Jun 2023 08:31:19 +0200 [thread overview]
Message-ID: <7f77f31e-90ff-44ad-9646-9876f11eed13@app.fastmail.com> (raw)
In-Reply-To: <20230609104037.56648990@canb.auug.org.au>
On Fri, Jun 9, 2023, at 02:40, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> fs/netfs/iterator.c
>
> between commit:
>
> ee5971613da3 ("netfs: Pass a pointer to virt_to_page()")
>
> from the asm-generic tree and commit:
>
> f5f82cd18732 ("Move netfs_extract_iter_to_sg() to lib/scatterlist.c")
>
> from the net-next tree.
>
> I fixed it up (I used the file from the former and applied the patch
> 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.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Fri, 9 Jun 2023 10:35:56 +1000
> Subject: [PATCH] fix up for "Move netfs_extract_iter_to_sg() to
> lib/scatterlist.c"
>
> interacting with "netfs: Pass a pointer to virt_to_page()"
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> lib/scatterlist.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/scatterlist.c b/lib/scatterlist.c
> index e97d7060329e..e86231a44c3d 100644
> --- a/lib/scatterlist.c
> +++ b/lib/scatterlist.c
> @@ -1237,7 +1237,7 @@ static ssize_t extract_kvec_to_sg(struct iov_iter *iter,
> if (is_vmalloc_or_module_addr((void *)kaddr))
> page = vmalloc_to_page((void *)kaddr);
> else
> - page = virt_to_page(kaddr);
> + page = virt_to_page((void *)kaddr);
>
> sg_set_page(sg, page, len, off);
> sgtable->nents++;
The fix is correct, but I think this should just get applied
in net-next directly, on top of the f5f82cd18732 commit, it
will have no effect there but avoid the conflict.
Arnd
next prev parent reply other threads:[~2023-06-09 6:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-09 0:40 linux-next: manual merge of the net-next tree with the asm-generic tree Stephen Rothwell
2023-06-09 1:43 ` Stephen Rothwell
2023-06-09 6:31 ` Arnd Bergmann [this message]
2023-06-27 23:37 ` Stephen Rothwell
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=7f77f31e-90ff-44ad-9646-9876f11eed13@app.fastmail.com \
--to=arnd@arndb$(echo .)de \
--cc=davem@davemloft$(echo .)net \
--cc=dhowells@redhat$(echo .)com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/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