[folded-merged] dynamic_debug-only-add-header-when-used-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: drbd: include dynamic_debug.h in drb_int.h
has been removed from the -mm tree.  Its filename was
     dynamic_debug-only-add-header-when-used-fix.patch

This patch was dropped because it was folded into dynamic_debug-only-add-header-when-used.patch

------------------------------------------------------
From: Luis de Bethencourt <luisbg@xxxxxxxxxxxxxxx>
Subject: drbd: include dynamic_debug.h in drb_int.h

dynamic_debug.h isn't included via kernel.h anymore.  Since drbd_int.h
needs it to access dynamic_dev_dbg for dynamic_drbd_dbg, include the
header directly.  Remove inclusion of dynamic_debug.h from drbd_actlog.c
since it is already included via drbd_int.h.

Link: http://lkml.kernel.org/r/1468447828-18558-2-git-send-email-luisbg@xxxxxxxxxxxxxxx
Signed-off-by: Luis de Bethencourt <luisbg@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/block/drbd/drbd_actlog.c |    1 -
 drivers/block/drbd/drbd_int.h    |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/block/drbd/drbd_actlog.c~dynamic_debug-only-add-header-when-used-fix drivers/block/drbd/drbd_actlog.c
--- a/drivers/block/drbd/drbd_actlog.c~dynamic_debug-only-add-header-when-used-fix
+++ a/drivers/block/drbd/drbd_actlog.c
@@ -27,7 +27,6 @@
 #include <linux/crc32c.h>
 #include <linux/drbd.h>
 #include <linux/drbd_limits.h>
-#include <linux/dynamic_debug.h>
 #include "drbd_int.h"
 
 
diff -puN drivers/block/drbd/drbd_int.h~dynamic_debug-only-add-header-when-used-fix drivers/block/drbd/drbd_int.h
--- a/drivers/block/drbd/drbd_int.h~dynamic_debug-only-add-header-when-used-fix
+++ a/drivers/block/drbd/drbd_int.h
@@ -41,6 +41,7 @@
 #include <linux/backing-dev.h>
 #include <linux/genhd.h>
 #include <linux/idr.h>
+#include <linux/dynamic_debug.h>
 #include <net/tcp.h>
 #include <linux/lru_cache.h>
 #include <linux/prefetch.h>
_

Patches currently in -mm which might be from luisbg@xxxxxxxxxxxxxxx are

maintainers-befs-add-new-maintainers.patch
dynamic_debug-only-add-header-when-used.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]
  Powered by Linux