== Series Details == Series: mm: add bitmap VMA flag helpers and convert all mmap_prepare to use them URL : https://patchwork.freedesktop.org/series/160306/ State : failure
== Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/160306/revisions/1/mbox/ not applied Applying: mm: rename vma_flag_test/set_atomic() to vma_test/set_atomic_flag() Applying: mm: add mk_vma_flags() bitmap flag macro helper Applying: tools: bitmap: add missing bitmap_[subset(), andnot()] Applying: mm: add basic VMA flag operation helper functions Applying: mm: update hugetlbfs to use VMA flags on mmap_prepare Applying: mm: update secretmem to use VMA flags on mmap_prepare Applying: mm: update shmem_[kernel]_file_*() functions to use vma_flags_t Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_gem.c M drivers/gpu/drm/i915/gem/i915_gem_shmem.c M drivers/gpu/drm/ttm/ttm_tt.c M mm/shmem.c Falling back to patching base and 3-way merge... Auto-merging mm/shmem.c Auto-merging drivers/gpu/drm/ttm/ttm_tt.c Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_shmem.c Auto-merging drivers/gpu/drm/drm_gem.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_gem.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0007 mm: update shmem_[kernel]_file_*() functions to use vma_flags_t When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Build failed, no error log produced
