The patch titled
Subject: a
has been added to the -mm tree. Its filename is
linux-next-fix-2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-fix-2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-fix-2.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: a
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
tools/testing/nvdimm/test/iomap.c | 12 ------------
1 file changed, 12 deletions(-)
--- a/tools/testing/nvdimm/test/iomap.c~linux-next-fix-2
+++ a/tools/testing/nvdimm/test/iomap.c
@@ -193,18 +193,6 @@ void __iomem *__wrap_ioremap(resource_si
}
EXPORT_SYMBOL(__wrap_ioremap);
-void __iomem *__wrap_ioremap(resource_size_t offset, unsigned long size)
-{
- return __nfit_test_ioremap(offset, size, ioremap);
-}
-EXPORT_SYMBOL(__wrap_ioremap);
-
-void __iomem *__wrap_ioremap_wc(resource_size_t offset, unsigned long size)
-{
- return __nfit_test_ioremap(offset, size, ioremap_wc);
-}
-EXPORT_SYMBOL(__wrap_ioremap_wc);
-
void __wrap_iounmap(volatile void __iomem *addr)
{
struct nfit_test_resource *nfit_res = get_nfit_res((long) addr);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-gup-fix-memory-leak-in-__gup_benchmark_ioctl-fix.patch
mm.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
linux-next-fix.patch
linux-next-fix-2.patch
drivers-block-null_blk_mainc-fix-layout.patch
drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch
proc-convert-everything-to-struct-proc_ops-fix.patch
bitops-more-bits_to_-macros-fix.patch
bitops-more-bits_to_-macros-fix-fix.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
