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
https://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
https://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/hwtracing/coresight/coresight-etm4x-core.c | 4 ----
init/Kconfig | 4 ----
2 files changed, 8 deletions(-)
--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c~linux-next-git-rejects
+++ a/drivers/hwtracing/coresight/coresight-etm4x-core.c
@@ -1899,11 +1899,7 @@ static void clear_etmdrvdata(void *info)
etmdrvdata[cpu] = NULL;
}
-<<<<<<< HEAD
-static void etm4_remove(struct amba_device *adev)
-=======
static int __exit etm4_remove_dev(struct etmv4_drvdata *drvdata)
->>>>>>> linux-next/akpm-base
{
etm_perf_symlink(drvdata->csdev, false);
/*
--- a/init/Kconfig~linux-next-git-rejects
+++ a/init/Kconfig
@@ -2266,10 +2266,6 @@ config MODULE_ALLOW_MISSING_NAMESPACE_IM
config TRIM_UNUSED_KSYMS
bool "Trim unused exported kernel symbols"
-<<<<<<< HEAD
- depends on BROKEN
-=======
->>>>>>> linux-next/akpm-base
help
The kernel and some modules make many symbols available for
other modules to use via EXPORT_SYMBOL() and variants. Depending
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm.patch
mm-memcg-slab-pre-allocate-obj_cgroups-for-slab-caches-with-slab_account-fix.patch
mm-memcontrol-optimize-per-lruvec-stats-counter-memory-usage-checkpatch-fixes.patch
mm-memcg-add-swapcache-stat-for-memcg-v2-fix.patch
kasan-add-match-all-tag-tests-fix-fix.patch
mm-cma-allocate-cma-areas-bottom-up-fix-3-fix.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
mm-memory_hotplug-prevalidate-the-address-range-being-added-with-platform-fix.patch
bdi-use-might_alloc-fix.patch
kfence-kasan-make-kfence-compatible-with-kasan-fix.patch
lib-stackdepot-add-support-to-disable-stack-depot-fix.patch
seq_file-document-how-per-entry-resources-are-managed-fix.patch
initramfs-panic-with-memory-information-fix.patch
linux-next-rejects.patch
fs-ramfs-inodec-update-inode_operationstmpfile.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
