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/clk/bcm/Kconfig | 4 ----
include/uapi/linux/virtio_ids.h | 3 ---
2 files changed, 7 deletions(-)
--- a/drivers/clk/bcm/Kconfig~linux-next-git-rejects
+++ a/drivers/clk/bcm/Kconfig
@@ -1,8 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
-<<<<<<< HEAD
-=======
-
->>>>>>> linux-next/akpm-base
config CLK_BCM2835
bool "Broadcom BCM2835 clock support"
depends on ARCH_BCM2835 || ARCH_BRCMSTB || COMPILE_TEST
--- a/include/uapi/linux/virtio_ids.h~linux-next-git-rejects
+++ a/include/uapi/linux/virtio_ids.h
@@ -44,9 +44,6 @@
#define VIRTIO_ID_VSOCK 19 /* virtio vsock transport */
#define VIRTIO_ID_CRYPTO 20 /* virtio crypto */
#define VIRTIO_ID_IOMMU 23 /* virtio IOMMU */
-<<<<<<< HEAD
-=======
#define VIRTIO_ID_PMEM 27 /* virtio pmem */
->>>>>>> linux-next/akpm-base
#endif /* _LINUX_VIRTIO_IDS_H */
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
mm-thp-make-transhuge_vma_suitable-available-for-anonymous-thp-fix.patch
resource-fix-locking-in-find_next_iomem_res-fix.patch
diff-sucks.patch
mm-section-numbers-use-the-type-unsigned-long-fix.patch
mm-sparsemem-cleanup-section-number-data-types-fix.patch
proc-sysctl-add-shared-variables-for-range-check-fix-2-fix.patch
proc-sysctl-add-shared-variables-for-range-check-fix-4.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
