linux-kernel - linux-next: manual merge of the nfs-anna tree with the fscache 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:   Fri, 17 Dec 2021 11:35:07 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Anna Schumaker <Anna.Schumaker@...app.com>,
        Trond Myklebust <trondmy@...il.com>,
        NFS Mailing List <linux-nfs@...r.kernel.org>,
        David Howells <dhowells@...hat.com>
Cc:     Dave Wysochanski <dwysocha@...hat.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the nfs-anna tree with the fscache tree

Hi all,

Today's linux-next merge of the nfs-anna tree got conflicts in:

  fs/nfs/fscache.c
  fs/nfs/fscache.h
  fs/nfs/fscache-index.c

between commit:

  882ff66585ec ("nfs: Convert to new fscache volume/cookie API")

from the fscache tree and commits:

  e89edabcb3d4 ("NFS: Remove remaining usages of NFSDBG_FSCACHE")
  0d20bd7faac9 ("NFS: Cleanup usage of nfs_inode in fscache interface and handle i_size properly")
  4a0574909596 ("NFS: Rename fscache read and write pages functions")
  3b779545aa01 ("NFS: Convert NFS fscache enable/disable dfprintks to tracepoints")
  b9077ca60a13 ("NFS: Replace dfprintks with tracepoints in fscache read and write page functions")
  416de7e7eeb6 ("NFS: Remove remaining dfprintks related to fscache cookies")
  fcb692b98976 ("NFS: Use nfs_i_fscache() consistently within NFS fscache code")

from the nfs-anna tree.

I had no idea how to fix this all up, so I just dropped the nfs-anna
tree for today.   Please get together and coordinate thses changes.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped