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
Date: Tue, 10 Oct 2023 10:37:44 +1100 [thread overview]
Message-ID: <20231010103744.2e7085a6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 837 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-10-09 23:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 23:37 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-18 0:33 linux-next: manual merge of the vfs-brauner tree with the ntfs3 tree Stephen Rothwell
2026-01-12 23:04 Stephen Rothwell
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=20231010103744.2e7085a6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=almaz.alexandrovich@paragon-software$(echo .)com \
--cc=brauner@kernel$(echo .)org \
--cc=jlayton@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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