* linux-next: manual merge of the overlayfs tree with Linus' tree
@ 2016-12-18 23:25 Stephen Rothwell
2016-12-19 9:06 ` Miklos Szeredi
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2016-12-18 23:25 UTC (permalink / raw)
To: Miklos Szeredi; +Cc: linux-next, linux-kernel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the overlayfs tree with Linus' tree
2016-12-18 23:25 linux-next: manual merge of the overlayfs tree with Linus' tree Stephen Rothwell
@ 2016-12-19 9:06 ` Miklos Szeredi
0 siblings, 0 replies; 3+ messages in thread
From: Miklos Szeredi @ 2016-12-19 9:06 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
On Mon, Dec 19, 2016 at 12:25 AM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> 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.
Hi Stephen,
Sorry, fixed now.
Thanks,
Miklos
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the overlayfs tree with Linus' tree
@ 2018-06-04 0:31 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2018-06-04 0:31 UTC (permalink / raw)
To: Miklos Szeredi
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Al Viro
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
Hi Miklos,
Today's linux-next merge of the overlayfs tree got a conflict in:
fs/open.c
between commit:
af04fadcaa93 ("Revert "fs: fold open_check_o_direct into do_dentry_open"")
from Linus' tree and commit:
e0e3f7de6435 ("vfs: simplify dentry_open()")
from the overlayfs tree.
I have no idea how to fix this up ... so I just used the overlayfs
version for now. I assume that this will need more work before being
merged into Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-04 0:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-18 23:25 linux-next: manual merge of the overlayfs tree with Linus' tree Stephen Rothwell
2016-12-19 9:06 ` Miklos Szeredi
-- strict thread matches above, loose matches on Subject: below --
2018-06-04 0:31 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox