Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
Date:   Tue, 10 Oct 2023 10:37:44 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christian Brauner <brauner@kernel.org>,
        Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Cc:     Jeff Layton <jlayton@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the vfs-brauner tree with the ntfs3
 tree
Message-ID: <20231010103744.2e7085a6@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/5sAmW5pUwKcL7njVm.uDAA0";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/5sAmW5pUwKcL7njVm.uDAA0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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_c=
time")
  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.

--=20
Cheers,
Stephen Rothwell

--Sig_/5sAmW5pUwKcL7njVm.uDAA0
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUkjsgACgkQAVBC80lX
0Gwxxgf+P+Ww81bHgBFSgoUmiyjvbQCXd/sc/pTkAe/Yfk/wpzCq/RbDnJgId51p
NZasMonRGaLaoWJWDJSgLL9E8HCkGO0OiSZ6mydAv/bqV89//WmPd0HHmkdteNpv
bUEjaABeVLH97VZYl2MsGDa4aU3XfEIErcUKr9e7XRsYderHHvllA+kEHOgx281Y
KfIUNKXlwnof9yJFWyFxlbRcux7LTuOqJPC0vq0OlEASfsR+spMX5l4rQmksz/WW
ZiziK8zOgdb7Ft6ZOlGdNOJ+oODevZlA+WjsSiVn3sAb88v7kyEqh4e9BcQAzCD3
uxcaY7ejMqGg4PO+D9OT1OuprceLNQ==
=1l6h
-----END PGP SIGNATURE-----

--Sig_/5sAmW5pUwKcL7njVm.uDAA0--