From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>, Miklos Szeredi <miklos@szeredi•hu>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Miklos Szeredi <mszeredi@redhat•com>,
Sargun Dhillon <sargun@sargun•me>
Subject: linux-next: manual merge of the vfs tree with the overlayfs tree
Date: Mon, 12 Apr 2021 12:03:13 +1000 [thread overview]
Message-ID: <20210412120313.20efd984@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1208 bytes --]
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/overlayfs/file.c
between commit:
d46b7cd68336 ("ovl: plumb through flush method")
from the overlayfs tree and commit:
ae7db6c8bc98 ("ovl: remove unneeded ioctls")
from the vfs 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/overlayfs/file.c
index 6e454a294046,9bd4167cc7fb..000000000000
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@@ -716,11 -590,6 +610,7 @@@ const struct file_operations ovl_file_o
.mmap = ovl_mmap,
.fallocate = ovl_fallocate,
.fadvise = ovl_fadvise,
- .unlocked_ioctl = ovl_ioctl,
+ .flush = ovl_flush,
- #ifdef CONFIG_COMPAT
- .compat_ioctl = ovl_compat_ioctl,
- #endif
.splice_read = generic_file_splice_read,
.splice_write = iter_file_splice_write,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-04-12 2:03 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 2:03 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-07-10 0:22 linux-next: manual merge of the vfs tree with the overlayfs tree Stephen Rothwell
2018-07-10 0:17 Stephen Rothwell
2018-07-10 15:04 ` Al Viro
2018-07-11 2:11 ` Al Viro
2018-06-19 1:21 Stephen Rothwell
2018-06-19 8:40 ` David Howells
2018-06-19 13:38 ` Miklos Szeredi
2018-06-19 1:10 Stephen Rothwell
2018-05-29 1:30 Stephen Rothwell
2018-06-05 0:19 ` Stephen Rothwell
2018-06-18 3:43 ` Stephen Rothwell
2018-01-25 3:31 Stephen Rothwell
2018-01-25 3:39 ` Stephen Rothwell
2018-01-31 23:25 ` Stephen Rothwell
2017-11-08 23:18 Stephen Rothwell
2016-12-11 23:13 Stephen Rothwell
2016-12-11 23:08 Stephen Rothwell
2016-10-10 0:20 Stephen Rothwell
2016-07-25 0:24 Stephen Rothwell
2016-07-25 0:30 ` Al Viro
2016-07-25 8:09 ` Miklos Szeredi
2016-05-10 23:20 Stephen Rothwell
2016-05-02 0:59 Stephen Rothwell
2016-05-02 1:08 ` Al Viro
2016-05-02 1:23 ` Al Viro
2016-05-02 8:30 ` Miklos Szeredi
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=20210412120313.20efd984@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=mszeredi@redhat$(echo .)com \
--cc=sargun@sargun$(echo .)me \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/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