linux-kernel - linux-next: manual merge of the vfs-brauner tree with the ntfs3 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>] [day] [month] [year] [list]

Message-ID: <20231010103744.2e7085a6@canb.auug.org.au>
Date:   Tue, 10 Oct 2023 10:37:44 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Christian Brauner <brauner@...nel.org>,
        Konstantin Komarov <almaz.alexandrovich@...agon-software.com>
Cc:     Jeff Layton <jlayton@...nel.org>,
        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 vfs-brauner tree with the ntfs3
 tree

Hi all,

Today's linux-next merge of the vfs-brauner tree got conflicts in:

  fs/ntfs3/inode.c
  fs/ntfs3/namei.c

between commits:

  3f2f09f18972 ("fs/ntfs3: Use inode_set_ctime_to_ts instead of inode_set_ctime")
  f684073c09fd ("fs/ntfs3: Refactoring and comments")

from the ntfs3 tree and commit:

  82f8d5fde753 ("ntfs3: convert to new timestamp accessors")

from the vfs-brauner tree.

I fixed it up (I used the latter changes) 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