On Fri, Jun 15, 2018 at 4:41 AM, Stephen Rothwell wrote:
> Hi all,
>
> This is now a conflict between the overlayfs tree and Linus' tree. (I
> restarted my merging after I noticed that Linus merged more stuff.)
Right, I had mentioned this in my pull request message to Linus. Until
yesterday, I
On Fri, Jun 15, 2018 at 4:41 AM, Stephen Rothwell wrote:
> Hi all,
>
> This is now a conflict between the overlayfs tree and Linus' tree. (I
> restarted my merging after I noticed that Linus merged more stuff.)
Right, I had mentioned this in my pull request message to Linus. Until
yesterday, I
Hi all,
This is now a conflict between the overlayfs tree and Linus' tree. (I
restarted my merging after I noticed that Linus merged more stuff.)
On Fri, 15 Jun 2018 10:43:24 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the y2038 tree got conflicts in:
>
> fs/inode.c
>
Hi all,
This is now a conflict between the overlayfs tree and Linus' tree. (I
restarted my merging after I noticed that Linus merged more stuff.)
On Fri, 15 Jun 2018 10:43:24 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the y2038 tree got conflicts in:
>
> fs/inode.c
>
Hi Arnd,
Today's linux-next merge of the y2038 tree got conflicts in:
fs/inode.c
fs/overlayfs/inode.c
fs/overlayfs/overlayfs.h
between various commits from the overlayfs tree and commits:
8efd6894ff08 ("fs: add timespec64_truncate()")
95582b008388 ("vfs: change inode times to use
Hi Arnd,
Today's linux-next merge of the y2038 tree got conflicts in:
fs/inode.c
fs/overlayfs/inode.c
fs/overlayfs/overlayfs.h
between various commits from the overlayfs tree and commits:
8efd6894ff08 ("fs: add timespec64_truncate()")
95582b008388 ("vfs: change inode times to use
6 matches
Mail list logo
