From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Howells <dhowells@redhat•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Pavel Begunkov <asml.silence@gmail•com>,
Jens Axboe <axboe@kernel•dk>
Subject: Re: linux-next: manual merge of the keys tree with Linus' tree
Date: Tue, 12 May 2020 18:38:02 +1000 [thread overview]
Message-ID: <20200512183802.1899b1ec@canb.auug.org.au> (raw)
In-Reply-To: <20200511145915.3bef0c16@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2598 bytes --]
Hi all,
On Mon, 11 May 2020 14:59:15 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the keys tree got a conflict in:
>
> fs/splice.c
>
> between commit:
>
> 90da2e3f25c8 ("splice: move f_mode checks to do_{splice,tee}()")
>
> from Linus' tree and commit:
>
> 549d46d3827d ("pipe: Add general notification queue support")
>
> from the keys 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 fs/splice.c
> index fd0a1e7e5959,6e6ea30c72b4..000000000000
> --- a/fs/splice.c
> +++ b/fs/splice.c
> @@@ -1118,12 -1118,8 +1118,12 @@@ long do_splice(struct file *in, loff_t
> loff_t offset;
> long ret;
>
> + if (unlikely(!(in->f_mode & FMODE_READ) ||
> + !(out->f_mode & FMODE_WRITE)))
> + return -EBADF;
> +
> - ipipe = get_pipe_info(in);
> - opipe = get_pipe_info(out);
> + ipipe = get_pipe_info(in, true);
> + opipe = get_pipe_info(out, true);
>
> if (ipipe && opipe) {
> if (off_in || off_out)
> @@@ -1757,14 -1766,10 +1757,17 @@@ static int link_pipe(struct pipe_inode_
> static long do_tee(struct file *in, struct file *out, size_t len,
> unsigned int flags)
> {
> - struct pipe_inode_info *ipipe = get_pipe_info(in);
> - struct pipe_inode_info *opipe = get_pipe_info(out);
> - struct pipe_inode_info *ipipe = get_pipe_info(in, true);
> - struct pipe_inode_info *opipe = get_pipe_info(out, true);
> ++ struct pipe_inode_info *ipipe;
> ++ struct pipe_inode_info *opipe;
> int ret = -EINVAL;
>
> + if (unlikely(!(in->f_mode & FMODE_READ) ||
> + !(out->f_mode & FMODE_WRITE)))
> + return -EBADF;
> +
> ++ ipipe = get_pipe_info(in, true);
> ++ opipe = get_pipe_info(out, true);
> ++
> /*
> * Duplicate the contents of ipipe to opipe without actually
> 90da2e3f25c8 ("splice: move f_mode checks to do_{splice,tee}()")* copying the data.
This is now a conflict between commit
90da2e3f25c8 ("splice: move f_mode checks to do_{splice,tee}()")
from Linus' tree and commit
317f078cce34 ("pipe: Add general notification queue support")
from the notifications tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-05-12 8:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 4:59 linux-next: manual merge of the keys tree with Linus' tree Stephen Rothwell
2020-05-12 8:38 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-02-19 23:43 Stephen Rothwell
2020-02-09 22:34 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=20200512183802.1899b1ec@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=asml.silence@gmail$(echo .)com \
--cc=axboe@kernel$(echo .)dk \
--cc=dhowells@redhat$(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