[linux-next] LinuxNextTracking branch, master, updated. next-20190401

batman at open-mesh.org batman at open-mesh.org
Tue Apr 2 00:17:42 CEST 2019


The following commit has been merged in the master branch:
commit 42cdd521487f6509f52096fa08590f275073e81b
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Mar 3 18:02:58 2019 +0100

    batman-adv: ABI: Mark sysfs files as deprecated
    
    The sysfs files are replaced by the batadv generic netlink family. The old
    sysfs configuration interface was frowned upon by other kernel developers.
    But the files cannot be removed immediately because userspace tools might
    still depend on it. Instead schedule for its removal in 2021.
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/Documentation/ABI/testing/sysfs-class-net-batman-adv b/Documentation/ABI/obsolete/sysfs-class-net-batman-adv
similarity index 92%
rename from Documentation/ABI/testing/sysfs-class-net-batman-adv
rename to Documentation/ABI/obsolete/sysfs-class-net-batman-adv
index 898106849e27..5bdbc8d40256 100644
--- a/Documentation/ABI/testing/sysfs-class-net-batman-adv
+++ b/Documentation/ABI/obsolete/sysfs-class-net-batman-adv
@@ -1,3 +1,5 @@
+This ABI is deprecated and will be removed after 2021. It is
+replaced with the batadv generic netlink family.
 
 What:           /sys/class/net/<iface>/batman-adv/elp_interval
 Date:           Feb 2014
diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/Documentation/ABI/obsolete/sysfs-class-net-mesh
similarity index 97%
rename from Documentation/ABI/testing/sysfs-class-net-mesh
rename to Documentation/ABI/obsolete/sysfs-class-net-mesh
index c2b956d44a95..04c1a2932507 100644
--- a/Documentation/ABI/testing/sysfs-class-net-mesh
+++ b/Documentation/ABI/obsolete/sysfs-class-net-mesh
@@ -1,3 +1,5 @@
+This ABI is deprecated and will be removed after 2021. It is
+replaced with the batadv generic netlink family.
 
 What:           /sys/class/net/<mesh_iface>/mesh/aggregated_ogms
 Date:           May 2010
diff --git a/MAINTAINERS b/MAINTAINERS
index f8ff9ae52c21..fce2919582fb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2795,8 +2795,8 @@ L:	b.a.t.m.a.n at lists.open-mesh.org (moderated for non-subscribers)
 W:	https://www.open-mesh.org/
 Q:	https://patchwork.open-mesh.org/project/batman/list/
 S:	Maintained
-F:	Documentation/ABI/testing/sysfs-class-net-batman-adv
-F:	Documentation/ABI/testing/sysfs-class-net-mesh
+F:	Documentation/ABI/obsolete/sysfs-class-net-batman-adv
+F:	Documentation/ABI/obsolete/sysfs-class-net-mesh
 F:	Documentation/networking/batman-adv.rst
 F:	include/uapi/linux/batadv_packet.h
 F:	include/uapi/linux/batman_adv.h

-- 
LinuxNextTracking


More information about the linux-merge mailing list