> Hi all,
Hi Stephen,
>
> 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
Fixed with rebase!
Thanks!
>
> 81df1ad40644 ("exfat: truncate atimes to 2s granularity")
>
> from Linus' tree (or do a backmerge of that commit).
