The patch titled
Subject: linux-next-git-rejects
has been removed from the -mm tree. Its filename was
linux-next-git-rejects.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
MAINTAINERS | 20 --------------------
1 file changed, 20 deletions(-)
diff -puN MAINTAINERS~linux-next-git-rejects MAINTAINERS
--- a/MAINTAINERS~linux-next-git-rejects
+++ a/MAINTAINERS
@@ -9105,13 +9105,8 @@ W: http://www.mellanox.com
Q: http://patchwork.ozlabs.org/project/netdev/list/
F: drivers/net/ethernet/mellanox/mlx5/core/en_*
-<<<<<<< HEAD
-MELLANOX ETHERNET INNOVA DRIVER
-R: Boris Pismenny <borisp@xxxxxxxxxxxx>
-=======
MELLANOX ETHERNET INNOVA DRIVERS
M: Boris Pismenny <borisp@xxxxxxxxxxxx>
->>>>>>> linux-next/akpm-base
L: netdev@xxxxxxxxxxxxxxx
S: Supported
W: http://www.mellanox.com
@@ -9121,18 +9116,6 @@ F: drivers/net/ethernet/mellanox/mlx5/co
F: drivers/net/ethernet/mellanox/mlx5/core/fpga/*
F: include/linux/mlx5/mlx5_ifc_fpga.h
-<<<<<<< HEAD
-MELLANOX ETHERNET INNOVA IPSEC DRIVER
-R: Boris Pismenny <borisp@xxxxxxxxxxxx>
-L: netdev@xxxxxxxxxxxxxxx
-S: Supported
-W: http://www.mellanox.com
-Q: http://patchwork.ozlabs.org/project/netdev/list/
-F: drivers/net/ethernet/mellanox/mlx5/core/en_ipsec/*
-F: drivers/net/ethernet/mellanox/mlx5/core/ipsec*
-
-=======
->>>>>>> linux-next/akpm-base
MELLANOX ETHERNET SWITCH DRIVERS
M: Jiri Pirko <jiri@xxxxxxxxxxxx>
M: Ido Schimmel <idosch@xxxxxxxxxxxx>
@@ -9937,10 +9920,7 @@ F: net/netfilter/xt_CONNSECMARK.c
F: net/netfilter/xt_SECMARK.c
NETWORKING [TLS]
-<<<<<<< HEAD
-=======
M: Boris Pismenny <borisp@xxxxxxxxxxxx>
->>>>>>> linux-next/akpm-base
M: Aviad Yehezkel <aviadye@xxxxxxxxxxxx>
M: Dave Watson <davejwatson@xxxxxx>
L: netdev@xxxxxxxxxxxxxxx
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-fix-race-between-kmem_cache-destroy-create-and-deactivate-v2-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
zram-introduce-zram-memory-tracking-fix.patch
zram-introduce-zram-memory-tracking-update-fix.patch
zram-introduce-zram-memory-tracking-update-fix-fix.patch
mm-check-for-sigkill-inside-dup_mmap-loop-fix.patch
mm-vmalloc-pass-proper-vm_start-into-debugobjects-fix.patch
mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix.patch
mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix.patch
mm-memcontrolc-add-mem_cgroup_from_task-as-a-local-helper.patch
refactor-part-of-the-oom-report-in-dump_header-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-2.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-fix.patch
proc-simpler-iterations-for-proc-cmdline-fix.patch
kcov-prefault-the-kcov_area-fix.patch
kcov-prefault-the-kcov_area-fix-fix.patch
kcov-prefault-the-kcov_area-fix-fix-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
