Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/memory.c
between commit:
327e9fd48972 ("mm: Split huge pages on write-notify or COW")
from the drm tree and commit:
de0b1f32cbeb ("userfaultfd: wp: hook userfault handler to write protection
fault")
from
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/huge_mm.h
between commit:
9a9731b18c9b ("mm: Add vmf_insert_pfn_xxx_prot() for huge page-table entries")
from the drm tree and commit:
7b6b88969e9d ("mm: merge parameters for
Hi all,
On Tue, 9 Jul 2019 10:06:45 +1000 Stephen Rothwell
wrote:
>
> On Mon, 24 Jun 2019 21:06:59 +1000 Stephen Rothwell
> wrote:
> >
> > On Mon, 24 Jun 2019 20:49:08 +1000 Stephen Rothwell
> > wrote:
> > >
> > > Today's linux-next merge of the akpm-current tree got a conflict in:
> > >
Hi all,
On Mon, 24 Jun 2019 21:06:59 +1000 Stephen Rothwell
wrote:
>
> On Mon, 24 Jun 2019 20:49:08 +1000 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > mm/memory.c
> >
> > between commit:
> >
> > 29875a52915e ("mm: Add an
Hi all,
On Mon, 24 Jun 2019 20:49:08 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> mm/memory.c
>
> between commit:
>
> 29875a52915e ("mm: Add an apply_to_pfn_range interface")
>
> from the drm tree and commit:
>
>
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/memory.c
between commit:
29875a52915e ("mm: Add an apply_to_pfn_range interface")
from the drm tree and commit:
e972cea08fb3 ("mm/pgtable: drop pgtable_t variable from pte_fn_t functions")
from the
Hi Andrew,
Today's linux-next merge of the akpm-current tree got conflicts in:
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
between commits:
b72cf4fca2bb ("drm/amdgpu: move taking mmap_sem into get_user_pages v2")
ca666a3c298f ("drm/amdgpu: stop using
