On Wed 02-11-16 12:18:10, Hillf Danton wrote: > On Wednesday, November 02, 2016 6:36 AM Jan Kara wrote: > > diff --git a/include/linux/mm.h b/include/linux/mm.h > > index 8e8b76d11bb4..2a4ebe3c67c6 100644 > > --- a/include/linux/mm.h > > +++ b/include/linux/mm.h > > @@ -297,8 +297,6 @@ struct vm_fault { > > gfp_t gfp_mask; /* gfp mask to be used for allocations */ > > pgoff_t pgoff; /* Logical page offset based on vma */ > > unsigned long address; /* Faulting virtual address */ > > - void __user *virtual_address; /* Faulting virtual address masked by > > - * PAGE_MASK */ > > pmd_t *pmd; /* Pointer to pmd entry matching > > * the 'address' > > */ > We have a pmd field currently? > > In [PATCH 01/20] mm: Change type of vmf->virtual_address we see > [1] __user * gone, > [2] no field of address added > and doubt stray merge occurred. > > btw, s:01/20:01/21: in subject line? Sorry, I had old version of the series in the directory so things got messed up. I'll resend the series. Thanks for having a look. Honza -- Jan Kara <jack@xxxxxxxx> SUSE Labs, CR -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html