The patch titled
Subject: sections: fix section conflicts in net/can
has been removed from the -mm tree. Its filename was
sections-fix-section-conflicts-in-net-can.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Subject: sections: fix section conflicts in net/can
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: Oliver Hartkopp <socketcan@xxxxxxxxxxxx>
Cc: David Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/can/af_can.c | 2 +-
net/can/bcm.c | 2 +-
net/can/gw.c | 2 +-
net/can/raw.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff -puN net/can/af_can.c~sections-fix-section-conflicts-in-net-can net/can/af_can.c
--- a/net/can/af_can.c~sections-fix-section-conflicts-in-net-can
+++ a/net/can/af_can.c
@@ -63,7 +63,7 @@
#include "af_can.h"
-static __initdata const char banner[] = KERN_INFO
+static __initconst const char banner[] = KERN_INFO
"can: controller area network core (" CAN_VERSION_STRING ")\n";
MODULE_DESCRIPTION("Controller Area Network PF_CAN core");
diff -puN net/can/bcm.c~sections-fix-section-conflicts-in-net-can net/can/bcm.c
--- a/net/can/bcm.c~sections-fix-section-conflicts-in-net-can
+++ a/net/can/bcm.c
@@ -77,7 +77,7 @@
(CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))
#define CAN_BCM_VERSION CAN_VERSION
-static __initdata const char banner[] = KERN_INFO
+static __initconst const char banner[] = KERN_INFO
"can: broadcast manager protocol (rev " CAN_BCM_VERSION " t)\n";
MODULE_DESCRIPTION("PF_CAN broadcast manager protocol");
diff -puN net/can/gw.c~sections-fix-section-conflicts-in-net-can net/can/gw.c
--- a/net/can/gw.c~sections-fix-section-conflicts-in-net-can
+++ a/net/can/gw.c
@@ -58,7 +58,7 @@
#include <net/sock.h>
#define CAN_GW_VERSION "20101209"
-static __initdata const char banner[] =
+static __initconst const char banner[] =
KERN_INFO "can: netlink gateway (rev " CAN_GW_VERSION ")\n";
MODULE_DESCRIPTION("PF_CAN netlink gateway");
diff -puN net/can/raw.c~sections-fix-section-conflicts-in-net-can net/can/raw.c
--- a/net/can/raw.c~sections-fix-section-conflicts-in-net-can
+++ a/net/can/raw.c
@@ -55,7 +55,7 @@
#include <net/net_namespace.h>
#define CAN_RAW_VERSION CAN_VERSION
-static __initdata const char banner[] =
+static __initconst const char banner[] =
KERN_INFO "can: raw protocol (rev " CAN_RAW_VERSION ")\n";
MODULE_DESCRIPTION("PF_CAN raw protocol");
_
Patches currently in -mm which might be from ak@xxxxxxxxxxxxxxx are
origin.patch
linux-next.patch
thp-x86-introduce-have_arch_transparent_hugepage.patch
thp-remove-assumptions-on-pgtable_t-type.patch
thp-introduce-pmdp_invalidate.patch
thp-make-madv_hugepage-check-for-mm-def_flags.patch
thp-s390-thp-splitting-backend-for-s390.patch
thp-s390-thp-pagetable-pre-allocation-for-s390.patch
thp-s390-disable-thp-for-kvm-host-on-s390.patch
thp-s390-architecture-backend-for-thp-on-s390.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
