From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Namjae Jeon <linkinjeon@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the exfat tree with Linus' tree
Date: Fri, 24 Apr 2020 11:41:09 +1000 [thread overview]
Message-ID: <20200424114109.365a9ae5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-04-24 1:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 1:41 Stephen Rothwell [this message]
[not found] <CGME20200424045546epcas1p29c96627082a25905c9715790b5b2ea82@epcas1p2.samsung.com>
[not found] ` <000001d619f4$9d7fee90$d87fcbb0$@samsung.com>
2020-04-24 4:57 ` linux-next: manual merge of the exfat tree with Linus' tree Namjae Jeon
2023-10-31 0:24 Stephen Rothwell
2023-10-31 0:30 ` Namjae Jeon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200424114109.365a9ae5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linkinjeon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).