From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>, Miklos Szeredi <miklos@szeredi.hu>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the vfs tree with the overlayfs tree
Date: Mon, 12 Dec 2016 10:08:51 +1100 [thread overview]
Message-ID: <20161212100851.41831d05@canb.auug.org.au> (raw)
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/overlayfs/dir.c
between commits:
659f95a46dd0 ("ovl: add ovl_dentry_is_whiteout()")
ee2e4303d554 ("ovl: opaque cleanup")
f7cd4e7b2743 ("ovl: clean up kstat usage")
from the overlayfs tree and commit:
718324db4435 ("overlayfs: stop abusing kstat")
from the vfs tree.
It looks like commits f7cd4e7b2743 and 718324db4435 are essentially the
smae change (with some white space differences).
I fixed it up (I just took bits from each of teh above) and can carry
the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.
Miklos, that overlayfs tree commit f7cd4e7b2743 has no Signed-off-by
from Al as its Author :-(
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-12-11 23:08 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-11 23:08 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-04-12 2:03 linux-next: manual merge of the vfs tree with the overlayfs tree Stephen Rothwell
2018-07-10 0:22 Stephen Rothwell
2018-07-10 0:17 Stephen Rothwell
2018-07-10 15:04 ` Al Viro
2018-07-11 2:11 ` Al Viro
2018-06-19 1:21 Stephen Rothwell
2018-06-19 8:40 ` David Howells
2018-06-19 13:38 ` Miklos Szeredi
2018-06-19 1:10 Stephen Rothwell
2018-05-29 1:30 Stephen Rothwell
2018-06-05 0:19 ` Stephen Rothwell
2018-06-18 3:43 ` Stephen Rothwell
2018-01-25 3:31 Stephen Rothwell
2018-01-25 3:39 ` Stephen Rothwell
2018-01-31 23:25 ` Stephen Rothwell
2017-11-08 23:18 Stephen Rothwell
2016-12-11 23:13 Stephen Rothwell
2016-10-10 0:20 Stephen Rothwell
2016-07-25 0:24 Stephen Rothwell
2016-07-25 0:30 ` Al Viro
2016-07-25 8:09 ` Miklos Szeredi
2016-05-10 23:20 Stephen Rothwell
2016-05-02 0:59 Stephen Rothwell
2016-05-02 1:08 ` Al Viro
2016-05-02 1:23 ` Al Viro
2016-05-02 8:30 ` Miklos Szeredi
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=20161212100851.41831d05@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=viro@ZenIV.linux.org.uk \
/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).