The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/infiniband/hw/mlx5/main.c | 17 -----------------
1 file changed, 17 deletions(-)
--- a/drivers/infiniband/hw/mlx5/main.c~linux-next-git-rejects
+++ a/drivers/infiniband/hw/mlx5/main.c
@@ -2218,7 +2218,6 @@ static int add_dm_mmap_entry(struct ib_u
}
static unsigned long mlx5_vma_to_pgoff(struct vm_area_struct *vma)
-<<<<<<< HEAD
{
unsigned long idx;
u8 command;
@@ -2233,22 +2232,6 @@ static int mlx5_ib_mmap_offset(struct ml
struct vm_area_struct *vma,
struct ib_ucontext *ucontext)
{
-=======
-{
- unsigned long idx;
- u8 command;
-
- command = get_command(vma->vm_pgoff);
- idx = get_extended_index(vma->vm_pgoff);
-
- return (command << 16 | idx);
-}
-
-static int mlx5_ib_mmap_offset(struct mlx5_ib_dev *dev,
- struct vm_area_struct *vma,
- struct ib_ucontext *ucontext)
-{
->>>>>>> linux-next/akpm-base
struct mlx5_user_mmap_entry *mentry;
struct rdma_user_mmap_entry *entry;
unsigned long pgoff;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-add-apply_to_existing_pages-helper-fix.patch
mm-add-apply_to_existing_pages-helper-fix-fix.patch
mm-add-apply_to_existing_pages-helper-fix-fix-fix.patch
kasan-use-apply_to_existing_pages-for-releasing-vmalloc-shadow-fix.patch
lib-kconfigdebug-fix-some-messed-up-configurations-checkpatch-fixes.patch
mm-gup-fix-memory-leak-in-__gup_benchmark_ioctl-fix.patch
mm.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
