mm-commits.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [merged] kasan-remove-duplicate-definition-of-the-macro-kasan_free_page.patch removed from -mm tree
@ 2015-06-29 20:49 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2015-06-29 20:49 UTC (permalink / raw)
  To: long.wanglong, a.ryabinin, mm-commits


The patch titled
     Subject: kasan: remove duplicate definition of the macro KASAN_FREE_PAGE
has been removed from the -mm tree.  Its filename was
     kasan-remove-duplicate-definition-of-the-macro-kasan_free_page.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Wang Long <long.wanglong@huawei.com>
Subject: kasan: remove duplicate definition of the macro KASAN_FREE_PAGE

Remove duplicate definition of the macro KASAN_FREE_PAGE in
mm/kasan/kasan.h

Signed-off-by: Wang Long <long.wanglong@huawei.com>
Acked-by: Andrey Ryabinin <a.ryabinin@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/kasan/kasan.h |    1 -
 1 file changed, 1 deletion(-)

diff -puN mm/kasan/kasan.h~kasan-remove-duplicate-definition-of-the-macro-kasan_free_page mm/kasan/kasan.h
--- a/mm/kasan/kasan.h~kasan-remove-duplicate-definition-of-the-macro-kasan_free_page
+++ a/mm/kasan/kasan.h
@@ -7,7 +7,6 @@
 #define KASAN_SHADOW_MASK       (KASAN_SHADOW_SCALE_SIZE - 1)
 
 #define KASAN_FREE_PAGE         0xFF  /* page was freed */
-#define KASAN_FREE_PAGE         0xFF  /* page was freed */
 #define KASAN_PAGE_REDZONE      0xFE  /* redzone for kmalloc_large allocations */
 #define KASAN_KMALLOC_REDZONE   0xFC  /* redzone inside slub object */
 #define KASAN_KMALLOC_FREE      0xFB  /* object was freed (kmem_cache_free/kfree) */
_

Patches currently in -mm which might be from long.wanglong@huawei.com are

origin.patch


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-06-29 20:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-29 20:49 [merged] kasan-remove-duplicate-definition-of-the-macro-kasan_free_page.patch removed from -mm tree akpm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).