linux-kernel - Re: [GIT PULL] Ceph updates for 6.7-rc1

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-prev] [day] [month] [year] [list]

Message-ID: <CAHk-=wgZmHfx1UFOkYpwBZk7gf7hGQKeFgevYzOH269Qw0d5Ew@mail.gmail.com>
Date:   Fri, 10 Nov 2023 10:00:29 -0800
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Ilya Dryomov <idryomov@...il.com>
Cc:     ceph-devel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] Ceph updates for 6.7-rc1

On Thu, 9 Nov 2023 at 09:41, Ilya Dryomov <idryomov@...il.com> 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