2020-04-24 01:45:53

by Stephen Rothwell

[permalink] [raw]
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

Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2020-04-24 05:00:05

by Namjae Jeon

[permalink] [raw]
Subject: RE: linux-next: manual merge of the exfat tree with Linus' tree

> 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).