Re: linux-next: Tree for May 2 [WARNING: at fs/dcache.c]

[Sergey Senozhatsky]

On (05/02/16 22:07), Stephen Rothwell wrote:
[..]
> > The issue is that 2 macros have the same value:
> > 
> > #define DCACHE_OP_REAL                  0x08000000
> > 
> > #define DCACHE_PAR_LOOKUP               0x08000000 /* being looked up
> > (with parent locked shared) */
> > 
> > Verified with switching one to 0x10000000 and the warning went away.
> 
> This comes from a bad automatic merge resolution between commit
> 
>   d101a125954e ("fs: add file_dentry()")
> 
> from Linus' tree (introduced before v4.5-rc3) and commit
> 
>   340450a54573 ("beginning of transition to parallel lookups - marking in-lookup dentries")
> 
> from the vfs tree.
> 
> I will fix this up in tomorrow's tree (unless Al beats me to it).

good find, Mateusz.
thanks to both of you.

	-ss