Messages in this thread | | | Date | Mon, 19 Dec 2016 10:25:55 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the overlayfs tree with Linus' tree |
| |
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
| |