linux-kernel - linux-next: manual merge of the exfat tree with Linus' 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: <20200424114109.365a9ae5@canb.auug.org.au>
Date:   Fri, 24 Apr 2020 11:41:09 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Namjae Jeon <linkinjeon@...nel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: manual merge of the exfat tree with Linus' tree

Hi all,

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

  fs/exfat/super.c
  fs/exfat/misc.c
  fs/exfat/exfat_fs.h

Various patches in the exfat tree have been added to Linus' tree overnight
as different commits (an in some cases slightly different patches.
Please rebase the exfat tree on top of commit

  81df1ad40644 ("exfat: truncate atimes to 2s granularity")

from Linus' tree (or do a backmerge of that commit).

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped