linux-kernel - linux-next: manual merge of the nfs tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20251205111942.4150b06f@canb.auug.org.au>
Date: Fri, 5 Dec 2025 11:19:42 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Trond Myklebust <trondmy@...il.com>
Cc: Christian Brauner <brauner@...nel.org>, Linus Torvalds
 <torvalds@...ux-foundation.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Mike Snitzer <snitzer@...nel.org>, Trond
 Myklebust <trond.myklebust@...merspace.com>
Subject: linux-next: manual merge of the nfs tree with Linus' tree

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

Content of type "application/pgp-signature" skipped