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>
---
drivers/staging/Kconfig | 3 ---
drivers/staging/Makefile | 3 ---
2 files changed, 6 deletions(-)
--- a/drivers/staging/Kconfig~linux-next-git-rejects
+++ a/drivers/staging/Kconfig
@@ -125,13 +125,10 @@ source "drivers/staging/exfat/Kconfig"
source "drivers/staging/qlge/Kconfig"
-<<<<<<< HEAD
-=======
source "drivers/staging/vboxsf/Kconfig"
source "drivers/staging/hp/Kconfig"
source "drivers/staging/wfx/Kconfig"
->>>>>>> linux-next/akpm-base
endif # STAGING
--- a/drivers/staging/Makefile~linux-next-git-rejects
+++ a/drivers/staging/Makefile
@@ -53,9 +53,6 @@ obj-$(CONFIG_UWB) += uwb/
obj-$(CONFIG_USB_WUSB) += wusbcore/
obj-$(CONFIG_EXFAT_FS) += exfat/
obj-$(CONFIG_QLGE) += qlge/
-<<<<<<< HEAD
-=======
obj-$(CONFIG_VBOXSF_FS) += vboxsf/
obj-$(CONFIG_NET_VENDOR_HP) += hp/
obj-$(CONFIG_WFX) += wfx/
->>>>>>> linux-next/akpm-base
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-vmalloc-fix-regression-caused-by-needless-vmalloc_sync_all-fix.patch
mm.patch
mm-swap-disallow-swapon-on-zoned-block-devices-fix.patch
rss_stat-add-support-to-detect-rss-updates-of-external-mm-fix.patch
mm-pgmap-use-correct-alignment-when-looking-at-first-pfn-from-a-region-checkpatch-fixes.patch
memfd-fix-cow-issue-on-map_private-and-f_seal_future_write-mappings-fix.patch
mm-vmscan-simplify-lruvec_lru_size-fix-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
hugetlb-remove-duplicated-code-checkpatch-fixes.patch
hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix.patch
mm-madvise-replace-with-page_size-in-madvise_inject_error-fix.patch
mm-annotate-refault-stalls-from-swap_readpage-fix.patch
lib-optimize-cpumask_local_spread-v3-fix.patch
usb-kcov-collect-coverage-from-hub_event-fix.patch
linux-next-rejects.patch
diff-sucks.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
bitops-introduce-the-for_each_set_clump8-macro-fix-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
