From: Stephen Rothwell <sfr@canb.auug.org.au>
To: 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>
Subject: linux-next: manual merge of the fuse tree with Linus' tree
Date: Thu, 13 Oct 2022 09:59:36 +1100 [thread overview]
Message-ID: <20221013095936.2dedd370@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
Hi all,
Today's linux-next merge of the fuse tree got a conflict in:
include/uapi/linux/fuse.h
between commit:
7d37539037c2 ("fuse: implement ->tmpfile()")
from Linus' tree and commit:
22fb2e02a194 ("fuse: add "expire only" mode to FUSE_NOTIFY_INVAL_ENTRY")
from the fuse 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 include/uapi/linux/fuse.h
index 76ee8f9e024a,1688fdea550f..000000000000
--- a/include/uapi/linux/fuse.h
+++ b/include/uapi/linux/fuse.h
@@@ -196,7 -196,7 +196,8 @@@
* - add FUSE_HAS_INODE_DAX, FUSE_ATTR_DAX
*
* 7.37
+ * - add FUSE_TMPFILE
+ * - add FUSE_EXPIRE_ONLY flag to fuse_notify_inval_entry
*/
#ifndef _LINUX_FUSE_H
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-10-12 23:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-12 22:59 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-05 23:34 linux-next: manual merge of the fuse tree with Linus' tree Stephen Rothwell
2024-03-07 14:16 ` Miklos Szeredi
2024-03-07 21:34 ` Stephen Rothwell
2024-02-25 23:55 Stephen Rothwell
2020-10-12 23:47 Stephen Rothwell
2020-10-13 11:22 ` Max Reitz
2020-02-06 21:54 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=20221013095936.2dedd370@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=mszeredi@redhat.com \
/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).