From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miklos Szeredi <miklos@szeredi•hu>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the overlayfs tree with Linus' tree
Date: Mon, 19 Dec 2016 10:25:55 +1100 [thread overview]
Message-ID: <20161219102555.15519eee@canb.auug.org.au> (raw)
Hi Miklos,
Today's linux-next merge of the overlayfs tree got conflicts in:
fs/overlayfs/dir.c
fs/overlayfs/inode.c
I am pretty sure thses conflicts only exist because the overlayfs tree
was rebased before being merged by Linus. I am dropping the oevrlay fs
tree for today. Please clean it up.
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-12-18 23:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-18 23:25 Stephen Rothwell [this message]
2016-12-19 9:06 ` linux-next: manual merge of the overlayfs tree with Linus' tree Miklos Szeredi
-- strict thread matches above, loose matches on Subject: below --
2018-06-04 0:31 Stephen Rothwell
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=20161219102555.15519eee@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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