From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miklos Szeredi <miklos@szeredi•hu>
Cc: Joanne Koong <joannelkoong@gmail•com>,
Joel Granados <joel.granados@kernel•org>,
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, 30 Jan 2025 09:32:52 +1100 [thread overview]
Message-ID: <20250130093252.78a892bd@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1434 bytes --]
Hi all,
Today's linux-next merge of the fuse tree got a conflict in:
fs/fuse/sysctl.c
between commit:
1751f872cc97 ("treewide: const qualify ctl_tables where applicable")
from Linus' tree and commit:
9afd7336f3ac ("fuse: add default_request_timeout and max_request_timeout sysctls")
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 fs/fuse/sysctl.c
index 63fb1e5bee30,3d542ef9d889..000000000000
--- a/fs/fuse/sysctl.c
+++ b/fs/fuse/sysctl.c
@@@ -13,7 -13,13 +13,13 @@@ static struct ctl_table_header *fuse_ta
/* Bound by fuse_init_out max_pages, which is a u16 */
static unsigned int sysctl_fuse_max_pages_limit = 65535;
+ /*
+ * fuse_init_out request timeouts are u16.
+ * This goes up to ~18 hours, which is plenty for a timeout.
+ */
+ static unsigned int sysctl_fuse_req_timeout_limit = 65535;
+
-static struct ctl_table fuse_sysctl_table[] = {
+static const struct ctl_table fuse_sysctl_table[] = {
{
.procname = "max_pages_limit",
.data = &fuse_max_pages_limit,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-01-29 22:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-29 22:32 Stephen Rothwell [this message]
2025-02-05 8:59 ` linux-next: manual merge of the fuse tree with Linus' tree Joel Granados
-- strict thread matches above, loose matches on Subject: below --
2024-03-05 23:34 Stephen Rothwell
2024-03-07 14:16 ` Miklos Szeredi
2024-03-07 21:34 ` Stephen Rothwell
2024-02-25 23:55 Stephen Rothwell
2022-10-12 22:59 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=20250130093252.78a892bd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=joannelkoong@gmail$(echo .)com \
--cc=joel.granados@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=mszeredi@redhat$(echo .)com \
/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