From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Trond Myklebust <trondmy@gmail.com>
Cc: Christian Brauner <brauner@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mike Snitzer <snitzer@kernel.org>,
Trond Myklebust <trond.myklebust@hammerspace.com>
Subject: linux-next: manual merge of the nfs tree with Linus' tree
Date: Fri, 5 Dec 2025 11:19:42 +1100 [thread overview]
Message-ID: <20251205111942.4150b06f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 942 bytes --]
Hi all,
Today's linux-next merge of the nfs tree got a conflict in:
fs/nfs/localio.c
between commits:
94afb627dfc2 ("nfs: use credential guards in nfs_local_call_read()")
bff3c841f7bd ("nfs: use credential guards in nfs_local_call_write()")
1d18101a644e ("Merge tag 'kernel-6.19-rc1.cred' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs")
from Linus' tree and commit:
30a4385509b4 ("nfs/localio: fix regression due to out-of-order __put_cred")
from the nfs tree.
I fixed it up (I just dropped the nfs tree commit) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-12-05 0:19 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-05 0:19 Stephen Rothwell [this message]
2025-12-05 0:34 ` linux-next: manual merge of the nfs tree with Linus' tree Trond Myklebust
2025-12-05 1:11 ` Mike Snitzer
2025-12-05 1:08 ` [6.19 PATCH] nfs/localio: fix regression due to out-of-order __put_cred [was: Re: linux-next: manual merge of the nfs tree with Linus' tree] Mike Snitzer
2025-12-05 10:08 ` Christian Brauner
2025-12-06 0:01 ` Trond Myklebust
2025-12-06 0:32 ` Trond Myklebust
2025-12-06 0:36 ` Mike Snitzer
2025-12-06 1:32 ` Linus Torvalds
2025-12-06 1:55 ` Linus Torvalds
2025-12-06 2:23 ` Mike Snitzer
-- strict thread matches above, loose matches on Subject: below --
2020-12-15 0:24 linux-next: manual merge of the nfs tree with Linus' tree Stephen Rothwell
2020-12-15 0:30 ` Trond Myklebust
2017-05-03 0:07 Stephen Rothwell
2016-05-19 0:40 Stephen Rothwell
2016-05-19 1:18 ` Weston Andros Adamson
2012-05-22 2:10 Stephen Rothwell
2009-04-02 0:41 Stephen Rothwell
2009-04-02 8:56 ` David Howells
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=20251205111942.4150b06f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=brauner@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=snitzer@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=trond.myklebust@hammerspace.com \
--cc=trondmy@gmail.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).