Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1544224 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-12-19 00:30 +0100 |
| Last post | 2016-12-19 10:10 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the overlayfs tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-12-19 00:30 +0100
Re: linux-next: manual merge of the overlayfs tree with Linus' tree Miklos Szeredi <miklos@szeredi.hu> - 2016-12-19 10:10 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-12-19 00:30 +0100 |
| Subject | linux-next: manual merge of the overlayfs tree with Linus' tree |
| Message-ID | <sPT3Y-8nv-35@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Miklos Szeredi <miklos@szeredi.hu> |
|---|---|
| Date | 2016-12-19 10:10 +0100 |
| Message-ID | <sQ27g-5M1-45@gated-at.bofh.it> |
| In reply to | #1544224 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web