Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   "Namjae Jeon" <namjae.jeon@samsung.com>
To:     "'Stephen Rothwell'" <sfr@canb.auug.org.au>
Cc:     "'Namjae Jeon'" <linkinjeon@kernel.org>,
        "'Linux Next Mailing List'" <linux-next@vger.kernel.org>,
        "'Linux Kernel Mailing List'" <linux-kernel@vger.kernel.org>
In-Reply-To: <000001d619f4$9d7fee90$d87fcbb0$@samsung.com>
Subject: RE: linux-next: manual merge of the exfat tree with Linus' tree
Date:   Fri, 24 Apr 2020 13:57:47 +0900
Message-ID: <000101d619f4$e62c5cf0$b28516d0$@samsung.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Thread-Index: AQFjuEGWdDyIOjJKXJTh27xcMasqNgJJvlsfqVoq0HA=
Content-Language: ko
Content-Type: text/plain; charset="utf-8"
CMS-TYPE: 101P
DLP-Filter: Pass
References: <CGME20200424045546epcas1p29c96627082a25905c9715790b5b2ea82@epcas1p2.samsung.com>
        <000001d619f4$9d7fee90$d87fcbb0$@samsung.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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