On Thu, 9 Nov 2023 at 09:41, Ilya Dryomov <idryomov@xxxxxxxxx> wrote:
>
> There are a few conflicts in fs/ceph/inode.c caused by a clash between
> the conversion to new timestamp accessors in VFS and logging changes in
> CephFS. I have the resolution in for-linus-merged, it's the same as in
> linux-next.
My resolution ended up different, because I just couldn't deal with
the incorrect printouts of times, and changed the bogus occurrences of
"%lld.%ld" to "%lld.%09ld" while doing the other conflict resolutions.
Other than that I think it's just whitespace differences.
Linus
